Expose cursors and token via API

community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Transaction.java

@@ -94,4 +94,9 @@ enum Type
      * @return The lock operations of the graph.
      */
     Locks locks();
+
+    /**
+     * @return The cursor factory
+     */
+    CursorFactory cursors();
 }

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

@@ -34,6 +34,7 @@
 
 import org.neo4j.collection.pool.Pool;
 import org.neo4j.graphdb.TransactionTerminatedException;
+import org.neo4j.internal.kernel.api.CursorFactory;
 import org.neo4j.internal.kernel.api.ExplicitIndexRead;
 import org.neo4j.internal.kernel.api.ExplicitIndexWrite;
 import org.neo4j.internal.kernel.api.Read;
@@ -123,7 +124,6 @@ public class KernelTransactionImplementation implements KernelTransaction, TxSta
     private final StoreReadLayer storeLayer;
     private final Clock clock;
     private final AccessCapability accessCapability;
-    private final Token token;
 
     // State that needs to be reset between uses. Most of these should be cleared or released in #release(),
     // whereas others, such as timestamp or txId when transaction starts, even locks, needs to be set in #initialize().
@@ -172,7 +172,7 @@ public KernelTransactionImplementation( StatementOperationParts statementOperati
             Pool<KernelTransactionImplementation> pool, Clock clock, CpuClock cpuClock, HeapAllocation heapAllocation,
             TransactionTracer transactionTracer, LockTracer lockTracer, PageCursorTracerSupplier cursorTracerSupplier,
             StorageEngine storageEngine, AccessCapability accessCapability, Cursors cursors, AutoIndexing autoIndexing,
-            ExplicitIndexStore explicitIndexStore, Token token )
+            ExplicitIndexStore explicitIndexStore)
     {
         this.statementOperations = statementOperations;
         this.schemaWriteGuard = schemaWriteGuard;
@@ -196,7 +196,6 @@ public KernelTransactionImplementation( StatementOperationParts statementOperati
         this.userMetaData = new HashMap<>();
         this.operations =
                 new Operations( storageEngine, storageStatement, this, cursors, autoIndexing, explicitIndexStore );
-        this.token = token;
     }
 
     /**
@@ -705,7 +704,7 @@ public Write dataWrite() throws InvalidTransactionTypeKernelException
     @Override
     public Token token()
     {
-        return token;
+        return operations.token();
     }
 
     @Override
@@ -739,6 +738,12 @@ public StatementLocks locks()
        return statementLocks;
     }
 
+    @Override
+    public CursorFactory cursors()
+    {
+        return operations.cursors();
+    }
+
     public LockTracer lockTracer()
     {
         return currentStatement.lockTracer();

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java

@@ -58,7 +58,6 @@
 import org.neo4j.helpers.collection.ResourceClosingIterator;
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.internal.kernel.api.NodeCursor;
-import org.neo4j.internal.kernel.api.Read;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
@@ -96,7 +95,6 @@
 import org.neo4j.kernel.impl.coreapi.StandardRelationshipActions;
 import org.neo4j.kernel.impl.coreapi.TopLevelTransaction;
 import org.neo4j.kernel.impl.coreapi.schema.SchemaImpl;
-import org.neo4j.kernel.impl.newapi.Cursors;
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
@@ -137,7 +135,6 @@ public class GraphDatabaseFacade implements GraphDatabaseAPI
     private SPI spi;
     private TransactionalContextFactory contextFactory;
     private Config config;
-    private final Cursors cursors = new Cursors();
 
     /**
      * This is what you need to implemenent to get your very own {@link GraphDatabaseFacade}. This SPI exists as a thin
@@ -334,10 +331,10 @@ public Node getNodeById( long id )
                     new EntityNotFoundException( EntityType.NODE, id ) );
         }
 
-        Read read = spi.currentTransaction().dataRead();
-        try ( NodeCursor nodeCursor = cursors.allocateNodeCursor() )
+        KernelTransaction ktx = spi.currentTransaction();
+        try ( NodeCursor nodeCursor = ktx.cursors().allocateNodeCursor() )
         {
-            read.singleNode( id, nodeCursor );
+            ktx.dataRead().singleNode( id, nodeCursor );
             if ( !nodeCursor.next() )
             {
                 throw new NotFoundException( format( "Node %d not found", id ),
@@ -465,8 +462,9 @@ public ResourceIterable<Node> getAllNodes()
         assertTransactionOpen();
         return () ->
         {
-            NodeCursor cursor = cursors.allocateNodeCursor();
-            spi.currentTransaction().dataRead().allNodesScan( cursor );
+            KernelTransaction ktx = spi.currentTransaction();
+            NodeCursor cursor = ktx.cursors().allocateNodeCursor();
+            ktx.dataRead().allNodesScan( cursor );
             return new PrefetchingResourceIterator<Node>()
             {
                 @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java

@@ -25,6 +25,7 @@
 import org.neo4j.graphdb.NotInTransactionException;
 import org.neo4j.graphdb.TransactionTerminatedException;
 import org.neo4j.internal.kernel.api.CapableIndexReference;
+import org.neo4j.internal.kernel.api.CursorFactory;
 import org.neo4j.internal.kernel.api.ExplicitIndexRead;
 import org.neo4j.internal.kernel.api.ExplicitIndexWrite;
 import org.neo4j.internal.kernel.api.IndexOrder;
@@ -41,6 +42,7 @@
 import org.neo4j.internal.kernel.api.RelationshipTraversalCursor;
 import org.neo4j.internal.kernel.api.Scan;
 import org.neo4j.internal.kernel.api.SchemaRead;
+import org.neo4j.internal.kernel.api.Token;
 import org.neo4j.internal.kernel.api.Write;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
@@ -50,8 +52,8 @@
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.index.ExplicitIndexStore;
-import org.neo4j.kernel.impl.locking.ResourceTypes;
 import org.neo4j.kernel.impl.index.IndexEntityType;
+import org.neo4j.kernel.impl.locking.ResourceTypes;
 import org.neo4j.storageengine.api.EntityType;
 import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StorageStatement;
@@ -73,6 +75,7 @@ public class Operations implements Read, ExplicitIndexRead, SchemaRead, Write, E
     private org.neo4j.kernel.impl.newapi.NodeCursor nodeCursor;
     private final IndexTxStateUpdater updater;
     private final PropertyCursor propertyCursor;
+    private final Cursors cursors;
 
     public Operations(
             StorageEngine engine,
@@ -87,6 +90,7 @@ public Operations(
         this.nodeCursor = cursors.allocateNodeCursor();
         this.propertyCursor = cursors.allocatePropertyCursor();
         this.updater = new IndexTxStateUpdater( engine.storeReadLayer(), allStoreHolder );
+        this.cursors = cursors;
     }
 
     // READ
@@ -615,4 +619,14 @@ private Value readProperty( long node, int propertyKey ) throws EntityNotFoundEx
         }
         return existingValue;
     }
+
+    public CursorFactory cursors()
+    {
+        return cursors;
+    }
+
+    public Token token()
+    {
+        return allStoreHolder;
+    }
 }

community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java

@@ -30,9 +30,9 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
+import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.kernel.api.AssertOpen;
 import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException;
-import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException;

community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/StubKernelTransaction.java

@@ -21,6 +21,7 @@
 
 import java.util.Optional;
 
+import org.neo4j.internal.kernel.api.CursorFactory;
 import org.neo4j.internal.kernel.api.ExplicitIndexRead;
 import org.neo4j.internal.kernel.api.ExplicitIndexWrite;
 import org.neo4j.internal.kernel.api.Locks;
@@ -111,6 +112,12 @@ public Locks locks()
         throw new UnsupportedOperationException( "not implemented" );
     }
 
+    @Override
+    public CursorFactory cursors()
+    {
+        throw new UnsupportedOperationException( "not implemented" );
+    }
+
     @Override
     public long closeTransaction() throws TransactionFailureException
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java

@@ -435,6 +435,12 @@ public Locks locks()
                 throw new UnsupportedOperationException( "not implemented" );
             }
 
+            @Override
+            public CursorFactory cursors()
+            {
+                throw new UnsupportedOperationException( "not implemented" );
+            }
+
             @Override
             public long closeTransaction() throws TransactionFailureException
             {

community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java

@@ -47,6 +47,7 @@
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException;
+import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException;
 import org.neo4j.internal.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.GraphDatabaseQueryService;
@@ -57,7 +58,6 @@
 import org.neo4j.kernel.api.dbms.DbmsOperations;
 import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.ProcedureException;
-import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;