Acquire FreshIndexReader in the StorageLayer

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

@@ -718,21 +718,21 @@ public Iterator<IndexDescriptor> indexesGetAll( KernelStatement state )
     }
 
     @Override
-    public long nodeGetFromUniqueIndexSeek(
-            KernelStatement state, IndexDescriptor index, IndexQuery.ExactPredicate... query )
+    public long nodeGetFromUniqueIndexSeek( KernelStatement statement, IndexDescriptor index,
+            IndexQuery.ExactPredicate... query )
             throws IndexNotFoundKernelException, IndexBrokenKernelException, IndexNotApplicableKernelException
     {
-        IndexReader reader = state.getStoreStatement().getFreshIndexReader( index );
+        IndexReader reader = storeLayer.indexGetFreshReader( statement.getStoreStatement(), index );
 
         /* Here we have an intricate scenario where we need to return the PrimitiveLongIterator
          * since subsequent filtering will happen outside, but at the same time have the ability to
          * close the IndexReader when done iterating over the lookup result. This is because we get
          * a fresh reader that isn't associated with the current transaction and hence will not be
          * automatically closed. */
         PrimitiveLongResourceIterator committed = resourceIterator( reader.query( query ), reader );
-        PrimitiveLongIterator exactMatches = LookupFilter.exactIndexMatches( this, state, committed, query );
+        PrimitiveLongIterator exactMatches = LookupFilter.exactIndexMatches( this, statement, committed, query );
         PrimitiveLongIterator changesFiltered =
-                filterIndexStateChangesForSeek( state, exactMatches, index, OrderedPropertyValues.of( query ) );
+                filterIndexStateChangesForSeek( statement, exactMatches, index, OrderedPropertyValues.of( query ) );
         return single( resourceIterator( changesFiltered, committed ), NO_SUCH_NODE );
     }
 

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

@@ -269,6 +269,13 @@ public IndexReader indexGetReader( StorageStatement statement, IndexDescriptor i
         return statement.getIndexReader( index );
     }
 
+    @Override
+    public IndexReader indexGetFreshReader( StorageStatement statement, IndexDescriptor index )
+            throws IndexNotFoundKernelException
+    {
+        return statement.getFreshIndexReader( index );
+    }
+
     @Override
     public Iterator<ConstraintDescriptor> constraintsGetForSchema( SchemaDescriptor descriptor )
     {

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

@@ -170,6 +170,9 @@ long indexGetCommittedId( IndexDescriptor index )
     IndexReader indexGetReader( StorageStatement statement, IndexDescriptor index )
             throws IndexNotFoundKernelException;
 
+    IndexReader indexGetFreshReader( StorageStatement storeStatement, IndexDescriptor index )
+            throws IndexNotFoundKernelException;
+
     /**
      * @param labelName name of label.
      * @return token id of label.

community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java

@@ -40,7 +40,6 @@
 import org.neo4j.kernel.impl.api.StatementOperationsTestHelper;
 import org.neo4j.kernel.impl.api.legacyindex.InternalAutoIndexing;
 import org.neo4j.kernel.impl.api.operations.EntityOperations;
-import org.neo4j.kernel.impl.api.store.StoreStatement;
 import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;
 import org.neo4j.kernel.impl.index.LegacyIndexStore;
 import org.neo4j.storageengine.api.NodeItem;
@@ -98,9 +97,8 @@ public void before() throws Exception
         indexReader = mock( IndexReader.class );
         when( store.indexGetReader( any( StorageStatement.class ), eq( indexDescriptor ) ) )
                 .thenReturn( indexReader );
-        StoreStatement statement = mock( StoreStatement.class );
-        when( state.getStoreStatement() ).thenReturn( statement );
-        when( statement.getFreshIndexReader( indexDescriptor ) ).thenReturn( indexReader );
+        when( store.indexGetFreshReader( any( StorageStatement.class ), eq( indexDescriptor ) ) )
+                .thenReturn( indexReader );
 
         StateHandlingStatementOperations stateHandlingOperations = new StateHandlingStatementOperations(
                 store,

community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java

@@ -472,14 +472,13 @@ public void shouldConsiderTransactionStateDuringIndexBetweenRangeSeekByStringWit
     public void indexQueryClosesIndexReader() throws Exception
     {
         KernelStatement kernelStatement = mock( KernelStatement.class );
-        StoreStatement storeStatement = mock( StoreStatement.class );
         IndexReader indexReader = mock( IndexReader.class );
-
         when( indexReader.query( any() ) ).thenReturn( PrimitiveLongCollections.emptyIterator() );
-        when( storeStatement.getFreshIndexReader( any() ) ).thenReturn( indexReader );
-        when( kernelStatement.getStoreStatement() ).thenReturn( storeStatement );
+        StoreReadLayer storeReadLayer = mock( StoreReadLayer.class );
+        when( storeReadLayer.indexGetFreshReader( any( StorageStatement.class ), any( IndexDescriptor.class ) ) )
+                .thenReturn( indexReader );
 
-        StateHandlingStatementOperations operations = newTxStateOps( mock( StoreReadLayer.class ) );
+        StateHandlingStatementOperations operations = newTxStateOps( storeReadLayer );
 
         operations.nodeGetFromUniqueIndexSeek(
                 kernelStatement,