Check that transaction is open before returning property value

neo4j · Dec 4, 2017 · 7b0ccd5 · 7b0ccd5
1 parent 26cbd27
commit 7b0ccd5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 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
@@ -198,7 +198,8 @@ public KernelTransactionImplementation( StatementOperationParts statementOperati
         this.statistics = new Statistics( this, cpuClock, heapAllocation );
         this.userMetaData = new HashMap<>();
         AllStoreHolder allStoreHolder =
-                new AllStoreHolder( storageEngine, storageStatement, this, cursors, explicitIndexStore );
+                new AllStoreHolder( storageEngine, storageStatement, this, cursors, explicitIndexStore,
+                        this::assertTransactionOpen );
         this.operations =
                 new Operations(
                         allStoreHolder,

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
@@ -31,6 +31,7 @@
 import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException;
 import org.neo4j.io.pagecache.PageCursor;
+import org.neo4j.kernel.api.AssertOpen;
 import org.neo4j.kernel.api.ExplicitIndex;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
 import org.neo4j.kernel.api.schema.LabelSchemaDescriptor;
@@ -71,9 +72,11 @@ public class AllStoreHolder extends Read implements Token
     public AllStoreHolder( StorageEngine engine,
             StorageStatement statement,
             TxStateHolder txStateHolder,
-            Cursors cursors, ExplicitIndexStore explicitIndexStore )
+            Cursors cursors,
+            ExplicitIndexStore explicitIndexStore,
+            AssertOpen assertOpen )
     {
-        super( cursors, txStateHolder );
+        super( cursors, txStateHolder, assertOpen );
         this.storeReadLayer = engine.storeReadLayer();
         this.statement = statement; // use provided statement, to assert no leakage
         this.explicitIndexes = Suppliers.lazySingleton( txStateHolder::explicitIndexTxState );

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/PropertyCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/PropertyCursor.java
@@ -24,6 +24,7 @@
 import java.util.regex.Pattern;
 
 import org.neo4j.io.pagecache.PageCursor;
+import org.neo4j.kernel.api.AssertOpen;
 import org.neo4j.kernel.impl.store.LongerShortString;
 import org.neo4j.kernel.impl.store.PropertyType;
 import org.neo4j.kernel.impl.store.ShortArray;
@@ -59,19 +60,21 @@ public class PropertyCursor extends PropertyRecord implements org.neo4j.internal
     private PropertyContainerState propertiesState;
     private Iterator<StorageProperty> changedProperties;
     private StorageProperty stateValue;
+    private AssertOpen assertOpen;
 
     public PropertyCursor()
     {
         super( NO_ID );
     }
 
-    void init( long reference, Read read )
+    void init( long reference, Read read, AssertOpen assertOpen )
     {
         if ( getId() != NO_ID )
         {
             clear();
         }
 
+        this.assertOpen = assertOpen;
         this.block = Integer.MAX_VALUE;
         this.read = read;
         if ( reference == NO_ID )
@@ -249,6 +252,14 @@ public Value propertyValue()
             return stateValue.value();
         }
 
+        Value value = readValue();
+
+        assertOpen.assertOpen();
+        return value;
+    }
+
+    private Value readValue()
+    {
         PropertyType type = type();
         if ( type == null )
         {

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
@@ -29,6 +29,7 @@
 import org.neo4j.internal.kernel.api.Scan;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.io.pagecache.PageCursor;
+import org.neo4j.kernel.api.AssertOpen;
 import org.neo4j.kernel.api.ExplicitIndex;
 import org.neo4j.kernel.api.ExplicitIndexHits;
 import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
@@ -61,11 +62,13 @@ abstract class Read implements TxStateHolder,
 {
     private final Cursors cursors;
     private final TxStateHolder txStateHolder;
+    private final AssertOpen assertOpen;
 
-    Read( Cursors cursors, TxStateHolder txStateHolder )
+    Read( Cursors cursors, TxStateHolder txStateHolder, AssertOpen assertOpen )
     {
         this.cursors = cursors;
         this.txStateHolder = txStateHolder;
+        this.assertOpen = assertOpen;
     }
 
     @Override
@@ -277,19 +280,19 @@ else if ( hasFilterFlag( reference ) ) // this relationship chain need to be fil
     @Override
     public final void nodeProperties( long reference, org.neo4j.internal.kernel.api.PropertyCursor cursor )
     {
-        ((PropertyCursor) cursor).init( reference, this );
+        ((PropertyCursor) cursor).init( reference, this, assertOpen );
     }
 
     @Override
     public final void relationshipProperties( long reference, org.neo4j.internal.kernel.api.PropertyCursor cursor )
     {
-        ((PropertyCursor) cursor).init( reference, this );
+        ((PropertyCursor) cursor).init( reference, this, assertOpen );
     }
 
     @Override
     public final void graphProperties( org.neo4j.internal.kernel.api.PropertyCursor cursor )
     {
-        ((PropertyCursor) cursor).init( graphPropertiesReference(), this );
+        ((PropertyCursor) cursor).init( graphPropertiesReference(), this, assertOpen );
     }
 
     abstract long graphPropertiesReference();

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/MockStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/MockStore.java
@@ -27,6 +27,7 @@
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
 import org.neo4j.internal.kernel.api.CapableIndexReference;
 import org.neo4j.io.pagecache.PageCursor;
+import org.neo4j.kernel.api.AssertOpen;
 import org.neo4j.kernel.api.ExplicitIndex;
 import org.neo4j.kernel.api.txstate.TxStateHolder;
 import org.neo4j.kernel.impl.store.DynamicRecordAllocator;
@@ -67,7 +68,7 @@ public DynamicRecord nextRecord()
 
     MockStore( Cursors cursors )
     {
-        super( cursors, mock( TxStateHolder.class ) );
+        super( cursors, mock( TxStateHolder.class ), AssertOpen.ALWAYS_OPEN );
     }
 
     @Override