Move initialization to LabelScanReader

neo4j · Jan 9, 2018 · 1af1b18 · 1af1b18
1 parent 056c977
commit 1af1b18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
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
@@ -110,8 +110,7 @@ public PrimitiveLongResourceIterator nodesWithAllLabels( int... labelIds )
     }
 
     @Override
-    public LabelScanValueIndexProgressor nodesWithLabel( IndexProgressor.NodeLabelClient client,
+    public void nodesWithLabel( IndexProgressor.NodeLabelClient client, int labelId )
-            int labelId )
     {
         RawCursor<Hit<LabelScanKey,LabelScanValue>,IOException> cursor;
         try
@@ -124,7 +123,7 @@ public LabelScanValueIndexProgressor nodesWithLabel( IndexProgressor.NodeLabelCl
             throw new UncheckedIOException( e );
         }
 
-        return new LabelScanValueIndexProgressor( cursor, openCursors, client );
+        client.initialize( new LabelScanValueIndexProgressor( cursor, openCursors, client ), false );
     }
 
     private List<PrimitiveLongResourceIterator> iteratorsForLabels( int[] labelIds )

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().nodesWithLabel( indexCursor, label ) );
+        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
@@ -34,13 +34,12 @@ public interface LabelScanReader extends Resource
     PrimitiveLongResourceIterator nodesWithLabel( int labelId );
 
     /**
-     * Returns the index progressor over the label id
+     * Sets the client up for a label scan on <code>labelId</code>
      *
      * @param client the client to communicate with
      * @param labelId label token id
-     * @return index progressor with the given {@code labelId}
      */
-    IndexProgressor nodesWithLabel( IndexProgressor.NodeLabelClient client, int labelId );
+    void nodesWithLabel( IndexProgressor.NodeLabelClient client, int labelId );
 
     /**
      * @param labelIds label token ids.