Removes key comparison optimization in SeekCursor

...which didn't quite work in concurrent scenario with id-reuse.
neo4j · Dec 16, 2016 · c5b6095 · c5b6095
1 parent 47a1195
commit c5b6095
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/community/index/src/main/java/org/neo4j/index/gbptree/SeekCursor.java b/community/index/src/main/java/org/neo4j/index/gbptree/SeekCursor.java
@@ -59,7 +59,6 @@ class SeekCursor<KEY,VALUE> implements RawCursor<Hit<KEY,VALUE>,IOException>
     // data structures for the current b-tree node
     private int pos;
     private int keyCount;
-    private boolean currentContainsEnd;
     private boolean reread;
     private boolean resetPosition;
     private long stableGeneration;
@@ -142,9 +141,6 @@ else if ( TreeNode.isNode( newGen ) )
         // We've no come to the first relevant leaf, initialize the state for the coming leaf scan
         this.pos = pos - 1;
         this.keyCount = keyCount;
-        this.currentContainsEnd = layout.compare(
-                bTreeNode.keyAt( cursor, mutableKey, keyCount - 1 ), toExclusive ) >= 0;
-
     }
 
     @Override
@@ -167,8 +163,6 @@ public boolean next() throws IOException
                 if ( reread )
                 {
                     keyCount = bTreeNode.keyCount( cursor );
-                    currentContainsEnd = layout.compare(
-                            bTreeNode.keyAt( cursor, mutableKey, keyCount - 1 ), toExclusive ) >= 0;
 
                     // Keys could have been moved to the left so we need to make sure we are not missing any keys by
                     // moving position back until we find previously returned key
@@ -234,7 +228,7 @@ else if ( TreeNode.isNode( rightSibling ) )
             }
             else
             {
-                if ( !currentContainsEnd || layout.compare( mutableKey, toExclusive ) < 0 )
+                if ( layout.compare( mutableKey, toExclusive ) < 0 )
                 {
                     if ( layout.compare( mutableKey, fromInclusive ) < 0 ||
                          ( !first && layout.compare( prevKey, mutableKey ) >= 0 ) )