diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala index 6a96443a423f..e07b131ae9c7 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala @@ -735,7 +735,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona val cursor = relationshipScanCursor reads().singleRelationship(id, cursor) if (cursor.next()) - Some(fromRelationshipProxy(entityAccessor.newRelationshipProxy(id, cursor.sourceNodeReference(), cursor.label(), + Some(fromRelationshipProxy(entityAccessor.newRelationshipProxy(id, cursor.sourceNodeReference(), cursor.`type`(), cursor.targetNodeReference()))) else None @@ -748,7 +748,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona override protected def fetchNext(): RelationshipValue = { if (relCursor.next()) fromRelationshipProxy(entityAccessor.newRelationshipProxy(relCursor.relationshipReference(), - relCursor.sourceNodeReference(), relCursor.label(), + relCursor.sourceNodeReference(), relCursor.`type`(), relCursor.targetNodeReference())) else null } diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/RelationshipDataAccessor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/RelationshipDataAccessor.java index 9da6906eca4c..147a09c15ce0 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/RelationshipDataAccessor.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/RelationshipDataAccessor.java @@ -27,7 +27,7 @@ public interface RelationshipDataAccessor long relationshipReference(); // not sure relationships will have independent references, // so exposing this might be leakage. - int label(); + int type(); boolean hasProperties(); diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/Nodes.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/Nodes.java index a7706d0a14b2..309d15286d1c 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/Nodes.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/Nodes.java @@ -190,7 +190,7 @@ public static int countOutgoing( NodeCursor nodeCursor, CursorFactory cursors, i nodeCursor.allRelationships( traversal ); while ( traversal.next() ) { - if ( traversal.sourceNodeReference() == nodeCursor.nodeReference() && traversal.label() == type ) + if ( traversal.sourceNodeReference() == nodeCursor.nodeReference() && traversal.type() == type ) { count++; } @@ -236,7 +236,7 @@ public static int countIncoming( NodeCursor nodeCursor, CursorFactory cursors, i nodeCursor.allRelationships( traversal ); while ( traversal.next() ) { - if ( traversal.targetNodeReference() == nodeCursor.nodeReference() && traversal.label() == type ) + if ( traversal.targetNodeReference() == nodeCursor.nodeReference() && traversal.type() == type ) { count++; } @@ -280,7 +280,7 @@ public static int countAll( NodeCursor nodeCursor, CursorFactory cursors, int ty nodeCursor.allRelationships( traversal ); while ( traversal.next() ) { - if ( traversal.label() == type ) + if ( traversal.type() == type ) { count++; } diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionCursor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionCursor.java index 7678ecb83077..39d4861f592d 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionCursor.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionCursor.java @@ -44,7 +44,7 @@ public long relationshipReference() @Override public int type() { - return relationshipCursor.label(); + return relationshipCursor.type(); } @Override diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionIterator.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionIterator.java index 20fef27a0779..20eb8dd64b02 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionIterator.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipDenseSelectionIterator.java @@ -64,7 +64,7 @@ public R next() } R current = factory.relationship( next, relationshipCursor.sourceNodeReference(), - relationshipCursor.label(), + relationshipCursor.type(), relationshipCursor.targetNodeReference() ); if ( !fetchNext() ) diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelection.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelection.java index 23ab9aa79b4f..67032897e51c 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelection.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelection.java @@ -147,7 +147,7 @@ private boolean correctDirection() private boolean correctType() { - return types == null || ArrayUtils.contains( types, cursor.label() ); + return types == null || ArrayUtils.contains( types, cursor.type() ); } public void close() diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionCursor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionCursor.java index 21ab540cd2e0..565eb2e66fc3 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionCursor.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionCursor.java @@ -44,7 +44,7 @@ public long relationshipReference() @Override public int type() { - return cursor.label(); + return cursor.type(); } @Override diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionIterator.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionIterator.java index 2b1dc5610c42..a7475f42acbd 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionIterator.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/helpers/RelationshipSparseSelectionIterator.java @@ -65,7 +65,7 @@ public R next() } R current = factory.relationship( next, cursor.sourceNodeReference(), - cursor.label(), + cursor.type(), cursor.targetNodeReference() ); if ( !fetchNext() ) diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipScanCursorTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipScanCursorTestBase.java index e06e53bbbbea..2f8375826cdf 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipScanCursorTestBase.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipScanCursorTestBase.java @@ -150,7 +150,7 @@ public void shouldAccessRelationshipLabels() read.allRelationshipsScan( relationships ); while ( relationships.next() ) { - counts.compute( relationships.label(), ( k, v ) -> v == null ? 1 : v + 1 ); + counts.compute( relationships.type(), ( k, v ) -> v == null ? 1 : v + 1 ); } } diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTestSupport.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTestSupport.java index ba5b473373d3..5e03df9af1ee 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTestSupport.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTestSupport.java @@ -153,7 +153,7 @@ static void assertCount( while ( relationship.next() ) { - assertEquals( "same type", expectedType, relationship.label() ); + assertEquals( "same type", expectedType, relationship.type() ); count++; } @@ -239,7 +239,7 @@ else if ( r.sourceNodeReference() == r.originNodeReference() ) d = Direction.INCOMING; } - return computeKey( transaction.token().relationshipTypeName( r.label() ), d ); + return computeKey( transaction.token().relationshipTypeName( r.type() ), d ); } static String computeKey( String type, Direction direction ) diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTransactionStateTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTransactionStateTestBase.java index 5a2c3cce29dc..b10b6511aeb8 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTransactionStateTestBase.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTransactionStateTestBase.java @@ -80,7 +80,7 @@ public void shouldSeeSingleRelationshipInTransaction() throws Exception tx.dataRead().singleRelationship( r, relationship ); assertTrue( "should find relationship", relationship.next() ); - assertEquals( label, relationship.label() ); + assertEquals( label, relationship.type() ); assertEquals( n1, relationship.sourceNodeReference() ); assertEquals( n2, relationship.targetNodeReference() ); assertEquals( r, relationship.relationshipReference() ); @@ -1285,7 +1285,7 @@ private void assertCountRelationships( while ( relationship.next() ) { assertEquals( sourceNode, relationship.sourceNodeReference() ); - assertEquals( type, relationship.label() ); + assertEquals( type, relationship.type() ); assertEquals( targetNode, relationship.targetNodeReference() ); count++; } diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTraversalCursorTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTraversalCursorTestBase.java index f9eae6e1bf48..c76961951166 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTraversalCursorTestBase.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/RelationshipTraversalCursorTestBase.java @@ -122,7 +122,7 @@ public void shouldTraverseRelationshipsOfGivenType() { assertEquals( "node #" + node.nodeReference() + " relationship should have same label as group", group.type(), - relationship.label() ); + relationship.type() ); degree.outgoing++; } group.incoming( relationship ); @@ -130,7 +130,7 @@ public void shouldTraverseRelationshipsOfGivenType() { assertEquals( "node #" + node.nodeReference() + "relationship should have same label as group", group.type(), - relationship.label() ); + relationship.type() ); degree.incoming++; } group.loops( relationship ); @@ -138,7 +138,7 @@ public void shouldTraverseRelationshipsOfGivenType() { assertEquals( "node #" + node.nodeReference() + "relationship should have same label as group", group.type(), - relationship.label() ); + relationship.type() ); degree.loop++; } @@ -191,7 +191,7 @@ public void shouldFollowSpecificRelationship() assertEquals( "neighbouring node", end, relationship.neighbourNodeReference() ); assertEquals( "relationship should have same label as group", group.type(), - relationship.label() ); + relationship.type() ); assertFalse( "only a single relationship", relationship.next() ); @@ -218,7 +218,7 @@ public void shouldFollowSpecificRelationship() assertEquals( "neighbouring node", start, relationship.neighbourNodeReference() ); assertEquals( "relationship should have same label as group", group.type(), - relationship.label() ); + relationship.type() ); assertFalse( "only a single relationship", relationship.next() ); diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRelationshipCursor.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRelationshipCursor.java index 588ed192be3e..175755558dbc 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRelationshipCursor.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRelationshipCursor.java @@ -66,7 +66,7 @@ public long relationshipReference() } @Override - public int label() + public int type() { return store.get( chainId ).get( offset ).type; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java index de6c3a68f128..f760f7dc5d90 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java @@ -757,7 +757,7 @@ public Iterable getRelationshipTypes() List types = new ArrayList<>(); while ( relationships.next() ) { - types.add( RelationshipType.withName( tokenRead.relationshipTypeName( relationships.label() ) ) ); + types.add( RelationshipType.withName( tokenRead.relationshipTypeName( relationships.type() ) ) ); } return types; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java index 04841e60154b..489401ed6d52 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java @@ -476,7 +476,7 @@ protected Relationship fetchNextOrNull() return newRelationshipProxy( cursor.relationshipReference(), cursor.sourceNodeReference(), - cursor.label(), + cursor.type(), cursor.targetNodeReference() ); } else diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipScanCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipScanCursor.java index 7e1f6928ac5a..6aa5b5d7af9d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipScanCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultRelationshipScanCursor.java @@ -131,7 +131,7 @@ else if ( hasChanges && txs.relationshipIsDeletedInThisTx( next ) ) private boolean isWantedLabelAndInUse() { - return (label == -1 || label() == label) && inUse(); + return (label == -1 || type() == label) && inUse(); } private boolean containsRelationship( TransactionState txs ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java index 41929df4feb5..286959be5461 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/RelationshipCursor.java @@ -49,7 +49,7 @@ public long relationshipReference() } @Override - public int label() + public int type() { return getType(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java index 61df0fa4453b..20600bf27f34 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java @@ -431,6 +431,6 @@ private void setStoreRelationship( long relationshipId, long sourceNode, long ta when( relationshipCursor.relationshipReference() ).thenReturn( relationshipId ); when( relationshipCursor.sourceNodeReference() ).thenReturn( sourceNode ); when( relationshipCursor.targetNodeReference() ).thenReturn( targetNode ); - when( relationshipCursor.label() ).thenReturn( relationshipLabel ); + when( relationshipCursor.type() ).thenReturn( relationshipLabel ); } }