outgoingCount should check tx-state

neo4j · Feb 25, 2018 · 7fd4499 · 7fd4499
1 parent 0079c91
commit 7fd4499
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 7 deletions.
diff --git a/...api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTransactionStateTestBase.java b/...api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTransactionStateTestBase.java
@@ -41,6 +41,7 @@
 import static org.neo4j.internal.kernel.api.RelationshipTestSupport.assertCounts;
 import static org.neo4j.internal.kernel.api.RelationshipTestSupport.computeKey;
 import static org.neo4j.internal.kernel.api.RelationshipTestSupport.count;
+import static org.neo4j.internal.kernel.api.RelationshipTestSupport.sparse;
 import static org.neo4j.values.storable.Values.NO_VALUE;
 import static org.neo4j.values.storable.Values.stringValue;
 
@@ -274,7 +275,7 @@ public void shouldSeeRelationshipInTransactionBeforeCursorInitialization() throw
     @Test
     public void shouldTraverseSparseNodeWithoutGroups() throws Exception
     {
-        traverseWithoutGroups( RelationshipTestSupport.sparse( graphDb ), false );
+        traverseWithoutGroups( sparse( graphDb ), false );
     }
 
     @Test
@@ -286,7 +287,7 @@ public void shouldTraverseDenseNodeWithoutGroups() throws Exception
     @Test
     public void shouldTraverseSparseNodeWithoutGroupsWithDetachedReferences() throws Exception
     {
-        traverseWithoutGroups( RelationshipTestSupport.sparse( graphDb ), true );
+        traverseWithoutGroups( sparse( graphDb ), true );
     }
 
     @Test
@@ -298,7 +299,7 @@ public void shouldTraverseDenseNodeWithoutGroupsWithDetachedReferences() throws
     @Test
     public void shouldTraverseSparseNodeViaGroups() throws Exception
     {
-        traverseViaGroups( RelationshipTestSupport.sparse( graphDb ), false );
+        traverseViaGroups( sparse( graphDb ), false );
     }
 
     @Test
@@ -310,7 +311,7 @@ public void shouldTraverseDenseNodeViaGroups() throws Exception
     @Test
     public void shouldTraverseSparseNodeViaGroupsWithDetachedReferences() throws Exception
     {
-        traverseViaGroups( RelationshipTestSupport.sparse( graphDb ), true );
+        traverseViaGroups( sparse( graphDb ), true );
     }
 
     @Test
@@ -623,6 +624,14 @@ public void shouldSeeRemovedThenAddedPropertyInTransaction() throws Exception
         }
     }
 
+
+    @Test
+    public void shouldCountOutgoingNodesFromTxState() throws Exception
+    {
+        assertOutgoingCount( 100 );//node will be dense
+        assertOutgoingCount( 1 );//node will be sparse
+    }
+
     private void traverseWithoutGroups( RelationshipTestSupport.StartNode start, boolean detached ) throws Exception
     {
         try ( Transaction tx = session.beginTransaction() )
@@ -787,4 +796,39 @@ private void assertCountRelationships(
         }
         assertEquals( expectedCount, count );
     }
+
+    private void assertOutgoingCount( int count ) throws Exception
+    {
+        long start;
+        int type;
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            Write write = tx.dataWrite();
+            start = write.nodeCreate();
+            type = tx.tokenWrite().relationshipTypeGetOrCreateForName( "R" );
+            for ( int i = 0; i < count; i++ )
+            {
+                write.relationshipCreate( start, type, write.nodeCreate() );
+            }
+            tx.success();
+        }
+
+        try ( Transaction tx = session.beginTransaction() )
+        {
+            Write write = tx.dataWrite();
+            write.relationshipCreate( start, type, write.nodeCreate() );
+            try ( NodeCursor node = cursors.allocateNodeCursor();
+                  RelationshipGroupCursor group = cursors.allocateRelationshipGroupCursor() )
+            {
+                Read read = tx.dataRead();
+                read.singleNode( start, node );
+                assertTrue( node.next() );
+                node.relationships( group );
+                assertTrue( group.next() );
+
+                assertEquals( count + 1, group.outgoingCount() );
+                assertEquals( count + 1, group.totalCount() );
+            }
+        }
+    }
 }
diff --git a/...ity/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipGroupCursor.java b/...ity/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipGroupCursor.java
@@ -27,6 +27,7 @@
 import org.neo4j.kernel.impl.newapi.DefaultRelationshipTraversalCursor.Record;
 import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord;
 import org.neo4j.kernel.impl.store.record.RelationshipRecord;
+import org.neo4j.storageengine.api.Direction;
 
 import static org.neo4j.kernel.impl.newapi.RelationshipReferenceEncoding.encodeForFiltering;
 import static org.neo4j.kernel.impl.newapi.RelationshipReferenceEncoding.encodeForTxStateFiltering;
@@ -183,11 +184,22 @@ public int relationshipLabel()
     @Override
     public int outgoingCount()
     {
-        if ( isBuffered() )
+        int count;
+        if ( read.hasTxStateWithChanges() && read.txState().nodeIsAddedInThisTx( getOwningNode() ) )
+        {
+            count = 0;
+        }
+        else if ( isBuffered() )
+        {
+            count = bufferedGroup.outgoingCount;
+        }
+        else
         {
-            return bufferedGroup.outgoingCount;
+            count = count( outgoingRawId() );
         }
-        return count( outgoingRawId() );
+        return read.hasTxStateWithChanges()
+               ? read.txState().getNodeState( getOwningNode() )
+                       .augmentDegree( Direction.OUTGOING, count, getType() ) : count;
     }
 
     @Override