Let TxStateIndexChanges perform DESCENDING prefix and range seeks

neo4j · Sep 17, 2018 · 57dea67 · 57dea67
1 parent c1f84e3
commit 57dea67
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 63 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeValueIndexCursor.java
@@ -45,6 +45,15 @@
 
 import static java.util.Arrays.stream;
 import static org.neo4j.collection.PrimitiveLongCollections.mergeToSet;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesForRangeSeek;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesForRangeSeekByPrefix;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesForScan;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesForSeek;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesForSuffixOrContains;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesWithValuesForRangeSeek;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesWithValuesForRangeSeekByPrefix;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesWithValuesForScan;
+import static org.neo4j.kernel.impl.newapi.TxStateIndexChanges.indexUpdatesWithValuesForSuffixOrContains;
 import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID;
 
 final class DefaultNodeValueIndexCursor extends IndexCursor<IndexProgressor>
@@ -258,14 +267,13 @@ private void prefixQuery( IndexDescriptor descriptor, IndexQuery.StringPrefixPre
 
             if ( needsValues )
             {
-                AddedWithValuesAndRemoved changes =
+                AddedWithValuesAndRemoved changes = indexUpdatesWithValuesForRangeSeekByPrefix( txState, descriptor, predicate.prefix(), indexOrder );
-                        TxStateIndexChanges.indexUpdatesWithValuesForRangeSeekByPrefix( txState, descriptor, predicate.prefix() );
                 addedWithValues = changes.added.iterator();
                 removed = removed( txState, changes.removed );
             }
             else
             {
-                AddedAndRemoved changes = TxStateIndexChanges.indexUpdatesForRangeSeekByPrefix( txState, descriptor, predicate.prefix() );
+                AddedAndRemoved changes = indexUpdatesForRangeSeekByPrefix( txState, descriptor, predicate.prefix(), indexOrder );
                 added = changes.added.longIterator();
                 removed = removed( txState, changes.removed );
             }
@@ -286,15 +294,13 @@ private void rangeQuery( IndexDescriptor descriptor, IndexQuery.RangePredicate<?
 
             if ( needsValues )
             {
-                AddedWithValuesAndRemoved changes =
+                AddedWithValuesAndRemoved changes = indexUpdatesWithValuesForRangeSeek( txState, descriptor, predicate, indexOrder );
-                        TxStateIndexChanges.indexUpdatesWithValuesForRangeSeek( txState, descriptor, predicate );
                 addedWithValues = changes.added.iterator();
                 removed = removed( txState, changes.removed );
             }
             else
             {
-                AddedAndRemoved changes =
+                AddedAndRemoved changes = indexUpdatesForRangeSeek( txState, descriptor, predicate, indexOrder );
-                        TxStateIndexChanges.indexUpdatesForRangeSeek( txState, descriptor, predicate );
                 added = changes.added.longIterator();
                 removed = removed( txState, changes.removed );
             }
@@ -309,14 +315,13 @@ private void scanQuery( IndexDescriptor descriptor )
 
             if ( needsValues )
             {
-                AddedWithValuesAndRemoved changes =
+                AddedWithValuesAndRemoved changes = indexUpdatesWithValuesForScan( txState, descriptor, indexOrder );
-                        TxStateIndexChanges.indexUpdatesWithValuesForScan( txState, descriptor, indexOrder );
                 addedWithValues = changes.added.iterator();
                 removed = removed( txState, changes.removed );
             }
             else
             {
-                AddedAndRemoved changes = TxStateIndexChanges.indexUpdatesForScan( txState, descriptor, indexOrder );
+                AddedAndRemoved changes = indexUpdatesForScan( txState, descriptor, indexOrder );
                 added = changes.added.longIterator();
                 removed = removed( txState, changes.removed );
             }
@@ -331,14 +336,13 @@ private void suffixOrContainsQuery( IndexDescriptor descriptor, IndexQuery query
 
             if ( needsValues )
             {
-                AddedWithValuesAndRemoved changes =
+                AddedWithValuesAndRemoved changes = indexUpdatesWithValuesForSuffixOrContains( txState, descriptor, query );
-                        TxStateIndexChanges.indexUpdatesWithValuesForSuffixOrContains( txState, descriptor, query );
                 addedWithValues = changes.added.iterator();
                 removed = removed( txState, changes.removed );
             }
             else
             {
-                AddedAndRemoved changes = TxStateIndexChanges.indexUpdatesForSuffixOrContains( txState, descriptor, query );
+                AddedAndRemoved changes = indexUpdatesForSuffixOrContains( txState, descriptor, query );
                 added = changes.added.longIterator();
                 removed = removed( txState, changes.removed );
             }
@@ -356,7 +360,7 @@ private void seekQuery( IndexDescriptor descriptor, IndexQuery[] query )
         {
             TransactionState txState = read.txState();
 
-            AddedAndRemoved changes = TxStateIndexChanges.indexUpdatesForSeek( txState, descriptor, IndexQuery.asValueTuple( exactPreds ) );
+            AddedAndRemoved changes = indexUpdatesForSeek( txState, descriptor, IndexQuery.asValueTuple( exactPreds ) );
             added = changes.added.longIterator();
             removed = removed( txState, changes.removed );
         }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/TxStateIndexChanges.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/TxStateIndexChanges.java
@@ -58,6 +58,8 @@ class TxStateIndexChanges
             new AddedAndRemoved( LongLists.immutable.empty(), LongSets.immutable.empty() );
     private static final ValueTuple MAX_STRING_TUPLE = ValueTuple.of( Values.MAX_STRING );
 
+    // SCAN
+
     static AddedAndRemoved indexUpdatesForScan( ReadableTransactionState txState, IndexDescriptor descriptor, IndexOrder indexOrder )
     {
         Map<ValueTuple,? extends LongDiffSets> updates =
@@ -109,6 +111,8 @@ static AddedWithValuesAndRemoved indexUpdatesWithValuesForScan( ReadableTransact
         return new AddedWithValuesAndRemoved( indexOrder == IndexOrder.DESCENDING ? added.asReversed() : added, removed );
     }
 
+    // SUFFIX
+
     static AddedAndRemoved indexUpdatesForSuffixOrContains( ReadableTransactionState txState, IndexDescriptor descriptor, IndexQuery query )
     {
         if ( descriptor.schema().getPropertyIds().length != 1 )
@@ -167,6 +171,8 @@ static AddedWithValuesAndRemoved indexUpdatesWithValuesForSuffixOrContains( Read
         return new AddedWithValuesAndRemoved( added, removed );
     }
 
+    // SEEK
+
     static AddedAndRemoved indexUpdatesForSeek( ReadableTransactionState txState, IndexDescriptor descriptor, ValueTuple values )
     {
         UnmodifiableMap<ValueTuple,? extends LongDiffSets> updates = txState.getIndexUpdates( descriptor.schema() );
@@ -179,9 +185,12 @@ static AddedAndRemoved indexUpdatesForSeek( ReadableTransactionState txState, In
         return EMPTY_ADDED_AND_REMOVED;
     }
 
+    // RANGE SEEK
+
     static AddedAndRemoved indexUpdatesForRangeSeek( ReadableTransactionState txState,
                                                      IndexDescriptor descriptor,
-                                                     IndexQuery.RangePredicate<?> predicate )
+                                                     IndexQuery.RangePredicate<?> predicate,
+                                                     IndexOrder indexOrder )
     {
         Value lower = predicate.fromValue();
         Value upper = predicate.toValue();
@@ -241,11 +250,13 @@ static AddedAndRemoved indexUpdatesForRangeSeek( ReadableTransactionState txStat
                 removed.addAll( diffForSpecificValue.getRemoved() );
             }
         }
-        return new AddedAndRemoved( added, removed );
+        return new AddedAndRemoved( indexOrder == IndexOrder.DESCENDING ? added.asReversed() : added, removed );
     }
 
-    static AddedWithValuesAndRemoved indexUpdatesWithValuesForRangeSeek( ReadableTransactionState txState, IndexDescriptor descriptor,
+    static AddedWithValuesAndRemoved indexUpdatesWithValuesForRangeSeek( ReadableTransactionState txState,
-            IndexQuery.RangePredicate<?> predicate )
+                                                                         IndexDescriptor descriptor,
+                                                                         IndexQuery.RangePredicate<?> predicate,
+                                                                         IndexOrder indexOrder )
     {
         Value lower = predicate.fromValue();
         Value upper = predicate.toValue();
@@ -306,10 +317,14 @@ static AddedWithValuesAndRemoved indexUpdatesWithValuesForRangeSeek( ReadableTra
                 removed.addAll( diffForSpecificValue.getRemoved() );
             }
         }
-        return new AddedWithValuesAndRemoved( added, removed );
+        return new AddedWithValuesAndRemoved( indexOrder == IndexOrder.DESCENDING ? added.asReversed() : added, removed );
     }
 
-    static AddedAndRemoved indexUpdatesForRangeSeekByPrefix( ReadableTransactionState txState, IndexDescriptor descriptor, String prefix )
+    // PREFIX
+
+    static AddedAndRemoved indexUpdatesForRangeSeekByPrefix( ReadableTransactionState txState,
+                                                             IndexDescriptor descriptor, String prefix,
+                                                             IndexOrder indexOrder )
     {
         NavigableMap<ValueTuple,? extends LongDiffSets> sortedUpdates = txState.getSortedIndexUpdates( descriptor.schema() );
         if ( sortedUpdates == null )
@@ -335,11 +350,13 @@ static AddedAndRemoved indexUpdatesForRangeSeekByPrefix( ReadableTransactionStat
                 break;
             }
         }
-        return new AddedAndRemoved( added, removed );
+        return new AddedAndRemoved( indexOrder == IndexOrder.DESCENDING ? added.asReversed() : added, removed );
     }
 
-    static AddedWithValuesAndRemoved indexUpdatesWithValuesForRangeSeekByPrefix( ReadableTransactionState txState, IndexDescriptor descriptor,
+    static AddedWithValuesAndRemoved indexUpdatesWithValuesForRangeSeekByPrefix( ReadableTransactionState txState,
-            String prefix )
+                                                                                 IndexDescriptor descriptor,
+                                                                                 String prefix,
+                                                                                 IndexOrder indexOrder )
     {
         NavigableMap<ValueTuple,? extends LongDiffSets> sortedUpdates = txState.getSortedIndexUpdates( descriptor.schema() );
         if ( sortedUpdates == null )
@@ -366,9 +383,11 @@ static AddedWithValuesAndRemoved indexUpdatesWithValuesForRangeSeekByPrefix( Rea
                 break;
             }
         }
-        return new AddedWithValuesAndRemoved( added, removed );
+        return new AddedWithValuesAndRemoved( indexOrder == IndexOrder.DESCENDING ? added.asReversed() : added, removed );
     }
 
+    // HELPERS
+
     public static class AddedAndRemoved
     {
         public final LongIterable added;