From 59fd1334a1166f415f572ea2a5c4964e479fa125 Mon Sep 17 00:00:00 2001 From: Davide Grohmann Date: Mon, 13 Mar 2017 16:18:05 +0100 Subject: [PATCH] Acquire AllRelationshiCursor in the StorageLayer --- .../kernel/impl/api/StateHandlingStatementOperations.java | 2 +- .../java/org/neo4j/kernel/impl/api/store/StorageLayer.java | 7 +++++++ .../java/org/neo4j/storageengine/api/StoreReadLayer.java | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java index 0df5f4afb554..cbf207faaddb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java @@ -185,7 +185,7 @@ private Cursor relationshipCursor( KernelStatement statement, public Cursor relationshipCursorGetAll( KernelStatement statement ) { ReadableTransactionState state = statement.hasTxStateWithChanges() ? statement.txState() : null; - return statement.getStoreStatement().relationshipsGetAllCursor( state ); + return storeLayer.relationshipsGetAllCursor( statement.getStoreStatement(), state ); } @Override diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index b6b3a6e01ae7..cb00e62afe80 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -416,6 +416,13 @@ public Cursor relationshipCursor( StorageStatement statement, return statement.acquireSingleRelationshipCursor( relationshipId, state ); } + @Override + public Cursor relationshipsGetAllCursor( StorageStatement statement, + ReadableTransactionState state ) + { + return statement.relationshipsGetAllCursor( state ); + } + @Override public Cursor nodeGetRelationships( StorageStatement statement, NodeItem nodeItem, Direction direction, ReadableTransactionState state ) diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java index f80622492634..6d05cd7a0d1b 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java @@ -275,6 +275,8 @@ void relationshipVisit( long relationshipId, Cursor relationshipCursor( StorageStatement storeStatement, long relationshipId, ReadableTransactionState state ); + Cursor relationshipsGetAllCursor( StorageStatement storeStatement, ReadableTransactionState state ); + Cursor nodeGetRelationships( StorageStatement statement, NodeItem nodeItem, Direction direction, ReadableTransactionState state );