Refactor so that Read is monomorphic

This is probably not a bottleneck but it makes sense from code style perspective as well so why not.
neo4j · Dec 7, 2017 · 5294a0b · 5294a0b
1 parent f2c3efe
commit 5294a0b
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 288 deletions.
diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
@@ -478,7 +478,7 @@ private void assertTransactionOpen()
         }
     }
 
-    private void assertOpen()
+    public void assertOpen()
     {
         Optional<Status> terminationReason = getReasonIfTerminated();
         if ( terminationReason.isPresent() )
@@ -724,7 +724,7 @@ public void visitCreatedRelationship( long id, int type, long startNode, long en
     public Read dataRead()
     {
         currentStatement.assertAllows( AccessMode::allowsReads, "Read" );
-        return operations;
+        return operations.dataRead();
     }
 
     @Override
@@ -754,7 +754,7 @@ public TokenRead tokenRead()
     @Override
     public ExplicitIndexRead indexRead()
     {
-        return operations;
+        return operations.indexRead();
     }
 
     @Override
@@ -766,7 +766,7 @@ public ExplicitIndexWrite indexWrite()
     @Override
     public SchemaRead schemaRead()
     {
-        return operations;
+        return operations.schemaRead();
     }
 
     @Override

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java
@@ -505,7 +505,7 @@ public Object getProperty( String key ) throws NotFoundException
         }
         NodeCursor nodes = transaction.nodeCursor();
         PropertyCursor properties = transaction.propertyCursor();
-        try ( Statement ignore = actions.statement())
+        try ( Statement ignore = actions.statement() )
         {
             transaction.dataRead().singleNode( nodeId, nodes );
             if ( !nodes.next() )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
@@ -332,7 +332,7 @@ public Node getNodeById( long id )
         }
 
         KernelTransaction ktx = spi.currentTransaction();
-        try ( Statement ignore = spi.currentStatement())
+        try ( Statement ignore = spi.currentStatement() )
         {
             if ( !ktx.dataRead().nodeExists( id ) )
             {

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java
@@ -152,6 +152,7 @@ ExplicitIndex explicitRelationshipIndex( String indexName ) throws ExplicitIndex
     @Override
     public CapableIndexReference index( int label, int... properties )
     {
+        assertOpen.assertOpen();
         IndexDescriptor indexDescriptor = storeReadLayer.indexGetForSchema( new LabelSchemaDescriptor( label, properties ) );
         if ( indexDescriptor == null )
         {