Revert "Merge pull request #4 from davidegrohmann/3.3-refactor-node-c…

…ursor"

This reverts commit f9f03c2, reversing
changes made to c6f73a2.

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -101,6 +101,7 @@
 import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
 import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord;
+import org.neo4j.kernel.impl.util.Bits;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.logging.FormattedLog;
 import org.neo4j.storageengine.api.schema.SchemaRule;
@@ -141,7 +142,7 @@
 import static org.neo4j.kernel.impl.store.record.Record.NO_NEXT_RELATIONSHIP;
 import static org.neo4j.kernel.impl.store.record.Record.NO_PREV_RELATIONSHIP;
 import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE;
-import static org.neo4j.kernel.impl.transaction.state.NodeLabelsFieldTest.inlinedLabelsLongRepresentation;
+import static org.neo4j.kernel.impl.util.Bits.bits;
 import static org.neo4j.test.Property.property;
 import static org.neo4j.test.Property.set;
 
@@ -693,6 +694,18 @@ protected void transactionData( GraphStoreFixture.TransactionDataBuilder tx,
                 .andThatsAllFolks();
     }
 
+    private long inlinedLabelsLongRepresentation( long... labelIds )
+    {
+        long header = (long) labelIds.length << 36;
+        byte bitsPerLabel = (byte) (36 / labelIds.length);
+        Bits bits = bits( 5 );
+        for ( long labelId : labelIds )
+        {
+            bits.put( labelId, bitsPerLabel );
+        }
+        return header | bits.getLongs()[0];
+    }
+
     @Test
     public void shouldReportCyclesInDynamicRecordsWithLabels() throws Exception
     {

community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java

@@ -211,8 +211,6 @@ <EXCEPTION extends Exception> void relationshipVisit( long relId, RelationshipVi
     //== CURSOR ACCESS OPERATIONS ===============
     //===========================================
 
-    Cursor<NodeItem> nodeGetAllCursor();
-
     Cursor<NodeItem> nodeCursorById( long nodeId ) throws EntityNotFoundException;
 
     Cursor<RelationshipItem> relationshipCursorById( long relId ) throws EntityNotFoundException;

community/kernel/src/main/java/org/neo4j/kernel/api/StatementConstants.java

@@ -26,7 +26,6 @@ public final class StatementConstants
     public static final int NO_SUCH_PROPERTY_KEY = -1;
     public static final long NO_SUCH_NODE = -1;
     public static final long NO_SUCH_RELATIONSHIP = -1;
-    public static final long NO_SUCH_PROPERTY = -1;
 
     private StatementConstants()
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java

@@ -473,12 +473,6 @@ public <EXCEPTION extends Exception> void relationshipVisit( KernelStatement sta
         entityReadOperations.relationshipVisit( statement, relId, visitor );
     }
 
-    @Override
-    public Cursor<NodeItem> nodeGetAllCursor( KernelStatement statement )
-    {
-        return entityReadOperations.nodeGetAllCursor( statement );
-    }
-
     @Override
     public Cursor<NodeItem> nodeCursorById( KernelStatement statement, long nodeId ) throws EntityNotFoundException
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/api/GuardingStatementOperations.java

@@ -243,13 +243,6 @@ public <EXCEPTION extends Exception> void relationshipVisit( KernelStatement sta
         entityReadDelegate.relationshipVisit( statement, relId, visitor );
     }
 
-    @Override
-    public Cursor<NodeItem> nodeGetAllCursor( KernelStatement statement )
-    {
-        guard.check( statement );
-        return entityReadDelegate.nodeGetAllCursor( statement );
-    }
-
     @Override
     public Cursor<NodeItem> nodeCursorById( KernelStatement statement, long nodeId ) throws EntityNotFoundException
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java

@@ -549,13 +549,6 @@ public long nodesCountIndexed( IndexDescriptor index, long nodeId, Object value
     // </DataRead>
 
     // <DataReadCursors>
-    @Override
-    public Cursor<NodeItem> nodeGetAllCursor()
-    {
-        statement.assertOpen();
-        return dataRead().nodeGetAllCursor( statement );
-    }
-
     @Override
     public Cursor<NodeItem> nodeCursorById( long nodeId ) throws EntityNotFoundException
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java

@@ -144,13 +144,6 @@ public StateHandlingStatementOperations( StoreReadLayer storeLayer, AutoIndexing
 
     // <Cursors>
 
-    @Override
-    public Cursor<NodeItem> nodeGetAllCursor( KernelStatement statement )
-    {
-        TransactionState state = statement.hasTxStateWithChanges() ? statement.txState() : null;
-        return storeLayer.nodeGetAllCursor( statement.getStoreStatement(), state );
-    }
-
     @Override
     public Cursor<NodeItem> nodeCursorById( KernelStatement statement, long nodeId ) throws EntityNotFoundException
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java

@@ -86,8 +86,6 @@ long nodesCountIndexed( KernelStatement statement, IndexDescriptor index, long n
     <EXCEPTION extends Exception> void relationshipVisit( KernelStatement statement, long relId,
             RelationshipVisitor<EXCEPTION> visitor ) throws EntityNotFoundException, EXCEPTION;
 
-    Cursor<NodeItem> nodeGetAllCursor( KernelStatement statement );
-
     Cursor<NodeItem> nodeCursorById( KernelStatement statement, long nodeId ) throws EntityNotFoundException;
 
     Cursor<RelationshipItem> relationshipCursorById( KernelStatement statement, long relId )

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java

@@ -43,7 +43,6 @@
 import org.neo4j.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
-import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.impl.api.DegreeVisitor;
 import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.api.index.IndexingService;
@@ -419,12 +418,6 @@ public RelationshipIterator relationshipsGetAll()
         return new AllRelationshipIterator( relationshipStore );
     }
 
-    @Override
-    public Cursor<NodeItem> nodeGetAllCursor( StorageStatement statement, TransactionState state )
-    {
-        return statement.acquireNodeCursor( state );
-    }
-
     @Override
     public Cursor<NodeItem> nodeCursor( StorageStatement statement, long nodeId, ReadableTransactionState state )
     {