From 230ff34128358b8e02b8a79145c044151579180a Mon Sep 17 00:00:00 2001
From: Anton Persson <anton.persson@neotechnology.com>
Date: Thu, 14 Feb 2019 09:35:43 +0100
Subject: [PATCH] Small cleanups, variable name change and remove unused field

---
 .../kernel/impl/index/schema/BlockStorage.java     | 14 +++++++-------
 .../impl/index/schema/IndexUpdateCursor.java       |  5 +----
 .../impl/index/schema/IndexUpdateStorage.java      |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java
index b32372dbaa06a..00bdf2c30d902 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockStorage.java
@@ -231,10 +231,10 @@ private int performSingleMerge( int mergeFactor, BlockReader<KEY,VALUE> reader,
         }
     }
 
-    private void writeBlock( StoreChannel targetChannel, BlockEntryCursor<KEY,VALUE> merger, long blockSize, long entryCount ) throws IOException
+    private void writeBlock( StoreChannel targetChannel, BlockEntryCursor<KEY,VALUE> blockEntryCursor, long blockSize, long entryCount ) throws IOException
     {
         writeHeader( byteBuffer, blockSize, entryCount );
-        long actualDataSize = writeMergedBlock( targetChannel, byteBuffer, layout, merger );
+        long actualDataSize = writeEntries( targetChannel, byteBuffer, layout, blockEntryCursor );
         writeLastEntriesWithPadding( targetChannel, byteBuffer, blockSize - actualDataSize );
     }
 
@@ -244,16 +244,16 @@ private static void writeHeader( ByteBuffer byteBuffer, long blockSize, long ent
         byteBuffer.putLong( entryCount );
     }
 
-    private static <KEY, VALUE> long writeMergedBlock( StoreChannel targetChannel, ByteBuffer byteBuffer, Layout<KEY,VALUE> layout,
-            BlockEntryCursor<KEY,VALUE> merger ) throws IOException
+    private static <KEY, VALUE> long writeEntries( StoreChannel targetChannel, ByteBuffer byteBuffer, Layout<KEY,VALUE> layout,
+            BlockEntryCursor<KEY,VALUE> blockEntryCursor ) throws IOException
     {
         // Loop over block entries
         long actualDataSize = BLOCK_HEADER_SIZE;
         ByteArrayPageCursor pageCursor = new ByteArrayPageCursor( byteBuffer );
-        while ( merger.next() )
+        while ( blockEntryCursor.next() )
         {
-            KEY key = merger.key();
-            VALUE value = merger.value();
+            KEY key = blockEntryCursor.key();
+            VALUE value = blockEntryCursor.value();
             int entrySize = BlockEntry.entrySize( layout, key, value );
             actualDataSize += entrySize;
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateCursor.java
index 7b55364f81207..4f7f0c2d6c1ec 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateCursor.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateCursor.java
@@ -24,7 +24,6 @@
 import org.neo4j.index.internal.gbptree.Layout;
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.kernel.impl.api.index.UpdateMode;
-import org.neo4j.kernel.impl.transaction.log.ReadAheadChannel;
 
 import static org.neo4j.kernel.impl.index.schema.IndexUpdateStorage.STOP_TYPE;
 
@@ -34,7 +33,6 @@
  */
 public class IndexUpdateCursor<KEY, VALUE> implements BlockEntryCursor<KEY,VALUE>
 {
-    private final ReadAheadChannel channel;
     private final PageCursor cursor;
     private final Layout<KEY,VALUE> layout;
 
@@ -44,9 +42,8 @@ public class IndexUpdateCursor<KEY, VALUE> implements BlockEntryCursor<KEY,VALUE
     private KEY key2;
     private VALUE value;
 
-    public IndexUpdateCursor( ReadAheadChannel channel, PageCursor cursor, Layout<KEY,VALUE> layout )
+    IndexUpdateCursor( PageCursor cursor, Layout<KEY,VALUE> layout )
     {
-        this.channel = channel;
         this.cursor = cursor;
         this.layout = layout;
         this.key1 = layout.newKey();
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateStorage.java
index 5a330b45f9a81..b3d22ed956c7d 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateStorage.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/IndexUpdateStorage.java
@@ -100,7 +100,7 @@ public void add( IndexEntryUpdate<?> update ) throws IOException
         IndexUpdateEntry.write( pageCursor, layout, updateMode, key1, key2, value );
     }
 
-    public void doneAdding() throws IOException
+    void doneAdding() throws IOException
     {
         if ( buffer.remaining() < TYPE_SIZE )
         {
@@ -114,7 +114,7 @@ public IndexUpdateCursor<KEY,VALUE> reader() throws IOException
     {
         ReadAheadChannel<StoreChannel> channel = new ReadAheadChannel<>( fs.open( file, OpenMode.READ ) );
         PageCursor pageCursor = new ReadableChannelPageCursor( channel );
-        return new IndexUpdateCursor<>( channel, pageCursor, layout );
+        return new IndexUpdateCursor<>( pageCursor, layout );
     }
 
     private void flush() throws IOException