Remove use of maxKeyCount from SeekCursorsTest

And remove leafMaxKeyCount from TreeNode. Also Som other cleanups in SeekCursorTest
neo4j · Jan 16, 2018 · cbfc8e4 · cbfc8e4
1 parent 43e66e4
commit cbfc8e4
Show file tree

Hide file tree

Showing 4 changed files with 264 additions and 327 deletions.
diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNode.java
@@ -261,8 +261,6 @@ static void writeChild( PageCursor cursor, long child, long stableGeneration, lo
         GenerationSafePointerPair.assertSuccess( write );
     }
 
-    abstract int leafMaxKeyCount();
-
     // HELPERS
 
     abstract boolean reasonableKeyCount( int keyCount );

diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNodeDynamicSize.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNodeDynamicSize.java
@@ -297,12 +297,6 @@ void setChildAt( PageCursor cursor, long child, int pos, long stableGeneration,
         writeChild( cursor, child, stableGeneration, unstableGeneration );
     }
 
-    @Override
-    int leafMaxKeyCount()
-    {
-        throw new UnsupportedOperationException( "Implement me" );
-    }
-
     @Override
     boolean reasonableKeyCount( int keyCount )
     {

diff --git a/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNodeFixedSize.java b/community/index/src/main/java/org/neo4j/index/internal/gbptree/TreeNodeFixedSize.java
@@ -183,12 +183,6 @@ void setChildAt( PageCursor cursor, long child, int pos, long stableGeneration,
         writeChild( cursor, child, stableGeneration, unstableGeneration );
     }
 
-    @Override
-    int leafMaxKeyCount()
-    {
-        return leafMaxKeyCount;
-    }
-
     @Override
     boolean reasonableKeyCount( int keyCount )
     {
@@ -219,6 +213,11 @@ private void insertKeyAt( PageCursor cursor, KEY key, int pos, int keyCount )
         layout.writeKey( cursor, key );
     }
 
+    private int leafMaxKeyCount()
+    {
+        return leafMaxKeyCount;
+    }
+
     private void removeKeyAt( PageCursor cursor, int pos, int keyCount )
     {
         removeSlotAt( cursor, pos, keyCount, keyOffset( 0 ), keySize );