Only setup filter state if needed

neo4j · Mar 1, 2018 · 0a11d48 · 0a11d48
1 parent 01f73d3
commit 0a11d48
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/...kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipTraversalCursor.java b/...kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipTraversalCursor.java
@@ -275,13 +275,16 @@ public boolean next()
             //  - Return first relationship if it's not deleted
             // Subsequent relationships need to have same type and direction
 
-            read.relationshipFull( this, next, pageCursor );
-            setupFilterState();
-
-            hasChanges = hasChanges();
+            hasChanges = hasChanges(); // <- will setup filter state if needed
             txs = hasChanges ? read.txState() : null;
 
-            if ( !hasChanges || !txs.relationshipIsDeletedInThisTx( getId() ) )
+            if ( filterState == FilterState.NOT_INITIALIZED && filterStore )
+            {
+                read.relationshipFull( this, next, pageCursor );
+                setupFilterState();
+            }
+
+            if ( filterState != FilterState.NOT_INITIALIZED && (!hasChanges || !txs.relationshipIsDeletedInThisTx( getId() ) ) )
             {
                 return true;
             }
@@ -507,6 +510,12 @@ private void reset()
     @Override
     protected void collectAddedTxStateSnapshot()
     {
+        if ( filterState == FilterState.NOT_INITIALIZED )
+        {
+            read.relationshipFull( this, next, pageCursor );
+            setupFilterState();
+        }
+
         NodeState nodeState = read.txState().getNodeState( originNodeReference );
         addedRelationships = hasTxStateFilter() ?
                              nodeState.getAddedRelationships( filterState.direction, filterType ) :