Provides LabelScanKey constructor for convenience

neo4j · Jan 12, 2017 · 100a6ac · 100a6ac
1 parent 2f1ac18
commit 100a6ac
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanKey.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanKey.java
@@ -25,8 +25,18 @@
  */
 class LabelScanKey
 {
-    int labelId = -1;
-    long idRange = -1;
+    int labelId;
+    long idRange;
+
+    LabelScanKey()
+    {
+        clear();
+    }
+
+    LabelScanKey( int labelId, long idRange )
+    {
+        set( labelId, idRange );
+    }
 
     /**
      * Sets this key.
@@ -42,9 +52,14 @@ LabelScanKey set( int labelId, long idRange )
         return this;
     }
 
+    void clear()
+    {
+        set( -1, -1 );
+    }
+
     @Override
     public String toString()
     {
-        return "[lbl:" + labelId + ",range:" + idRange + "]";
+        return "[label:" + labelId + ",range:" + idRange + "]";
     }
 }
diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReader.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReader.java
@@ -135,8 +135,8 @@ private List<PrimitiveLongIterator> iteratorsForLabels( int[] labelIds )
 
     private RawCursor<Hit<LabelScanKey,LabelScanValue>,IOException> seekerForLabel( int labelId ) throws IOException
     {
-        LabelScanKey from = new LabelScanKey().set( labelId, 0 );
-        LabelScanKey to = new LabelScanKey().set( labelId, Long.MAX_VALUE );
+        LabelScanKey from = new LabelScanKey( labelId, 0 );
+        LabelScanKey to = new LabelScanKey( labelId, Long.MAX_VALUE );
         return index.seek( from, to );
     }
 

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStore.java
@@ -248,8 +248,8 @@ public void start() throws IOException
     private boolean isEmpty() throws IOException
     {
         try ( RawCursor<Hit<LabelScanKey,LabelScanValue>,IOException> cursor = index.seek(
-                new LabelScanKey().set( 0, 0 ),
-                new LabelScanKey().set( Integer.MAX_VALUE, Long.MAX_VALUE ) ) )
+                new LabelScanKey( 0, 0 ),
+                new LabelScanKey( Integer.MAX_VALUE, Long.MAX_VALUE ) ) )
         {
             return !cursor.next();
         }

diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriter.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriter.java
@@ -167,7 +167,7 @@ private void flushPendingChanges() throws IOException
 
         long currentLabelId = lowestLabelId;
         value.clear();
-        key.set( -1, -1 );
+        key.clear();
         while ( currentLabelId != Long.MAX_VALUE )
         {
             long nextLabelId = Long.MAX_VALUE;

diff --git a/...kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReaderTest.java b/...kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanReaderTest.java
@@ -72,7 +72,7 @@ public void shouldFindMultipleNodesInEachRange() throws Exception
 
     private static Hit<LabelScanKey,LabelScanValue> hit( long baseNodeId, long bits )
     {
-        LabelScanKey key = new LabelScanKey().set( LABEL_ID, baseNodeId );
+        LabelScanKey key = new LabelScanKey( LABEL_ID, baseNodeId );
         LabelScanValue value = new LabelScanValue();
         value.bits = bits;
         return new MutableHit<>( key, value );

diff --git a/...kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriterTest.java b/...kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanWriterTest.java
@@ -173,7 +173,7 @@ private static LabelScanValue clone( LabelScanValue value )
 
         private static LabelScanKey clone( LabelScanKey key )
         {
-            return new LabelScanKey().set( key.labelId, key.idRange );
+            return new LabelScanKey( key.labelId, key.idRange );
         }
 
         @Override