Code review fixes

neo4j · Jan 8, 2018 · 056c977 · 056c977
1 parent 3a2a6d2
commit 056c977
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/...el/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIndexProgressor.java b/...el/src/main/java/org/neo4j/kernel/impl/index/labelscan/LabelScanValueIndexProgressor.java
@@ -47,16 +47,18 @@ class LabelScanValueIndexProgressor extends LabelScanValueIndexAccessor implemen
     }
 
     /**
-     * @return next node id in the current {@link LabelScanValue} or, if current value exhausted,
+     *  Progress through the index until the next accepted entry.
-     * goes to next {@link LabelScanValue} from {@link RawCursor}. Returns {@code true} if next node id
+     *
-     * was found, otherwise {@code false}.
+     *  Progress the cursor to the current {@link LabelScanValue}, if this is not accepted by the client or if current
+     *  value is exhausted it continues to the next {@link LabelScanValue}  from {@link RawCursor}.
+     * @return <code>true</code> if an accepted entry was found, <code>false</code> otherwise
      */
     @Override
     public boolean next()
     {
-        while ( true )
+        for ( ; ; )
         {
-            if ( bits != 0 )
+            while ( bits != 0 )
             {
                 int delta = Long.numberOfTrailingZeros( bits );
                 bits &= bits - 1;

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
@@ -32,7 +32,6 @@
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.index.internal.gbptree.GBPTree;
 import org.neo4j.index.internal.gbptree.Hit;
-import org.neo4j.kernel.impl.index.schema.NumberHitIndexProgressor;
 import org.neo4j.storageengine.api.schema.IndexProgressor;
 import org.neo4j.storageengine.api.schema.LabelScanReader;
 
@@ -110,7 +109,8 @@ public PrimitiveLongResourceIterator nodesWithAllLabels( int... labelIds )
         return new CompositeLabelScanValueIterator( iterators, true );
     }
 
-    public LabelScanValueIndexProgressor nodesWithLabelIndex( IndexProgressor.NodeLabelClient client,
+    @Override
+    public LabelScanValueIndexProgressor nodesWithLabel( IndexProgressor.NodeLabelClient client,
             int labelId )
     {
         RawCursor<Hit<LabelScanKey,LabelScanValue>,IOException> cursor;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -141,7 +141,7 @@ public final void nodeLabelScan( int label, org.neo4j.internal.kernel.api.NodeLa
 
         NodeLabelIndexCursor indexCursor = (NodeLabelIndexCursor) cursor;
         indexCursor.setRead( this );
-        indexCursor.initialize( labelScanReader().nodesWithLabelIndex( indexCursor, label ) );
+        indexCursor.initialize( labelScanReader().nodesWithLabel( indexCursor, label ) );
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/LabelScanReader.java
@@ -40,7 +40,7 @@ public interface LabelScanReader extends Resource
      * @param labelId label token id
      * @return index progressor with the given {@code labelId}
      */
-    IndexProgressor nodesWithLabelIndex( IndexProgressor.NodeLabelClient client, int labelId );
+    IndexProgressor nodesWithLabel( IndexProgressor.NodeLabelClient client, int labelId );
 
     /**
      * @param labelIds label token ids.