Skip to content

Commit

Permalink
Rename label to type
Browse files Browse the repository at this point in the history
In RelationshipGroupCursor we call it type but in the
RelationshipTraversalCursor we call it label, let's be consistent and
call it `type` everywhere
  • Loading branch information
pontusmelke committed Mar 12, 2018
1 parent 62823be commit 1db4cb3
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 27 deletions.
Expand Up @@ -735,7 +735,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona
val cursor = relationshipScanCursor val cursor = relationshipScanCursor
reads().singleRelationship(id, cursor) reads().singleRelationship(id, cursor)
if (cursor.next()) if (cursor.next())
Some(fromRelationshipProxy(entityAccessor.newRelationshipProxy(id, cursor.sourceNodeReference(), cursor.label(), Some(fromRelationshipProxy(entityAccessor.newRelationshipProxy(id, cursor.sourceNodeReference(), cursor.`type`(),
cursor.targetNodeReference()))) cursor.targetNodeReference())))
else else
None None
Expand All @@ -748,7 +748,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona
override protected def fetchNext(): RelationshipValue = { override protected def fetchNext(): RelationshipValue = {
if (relCursor.next()) if (relCursor.next())
fromRelationshipProxy(entityAccessor.newRelationshipProxy(relCursor.relationshipReference(), fromRelationshipProxy(entityAccessor.newRelationshipProxy(relCursor.relationshipReference(),
relCursor.sourceNodeReference(), relCursor.label(), relCursor.sourceNodeReference(), relCursor.`type`(),
relCursor.targetNodeReference())) relCursor.targetNodeReference()))
else null else null
} }
Expand Down
Expand Up @@ -27,7 +27,7 @@ public interface RelationshipDataAccessor
long relationshipReference(); // not sure relationships will have independent references, long relationshipReference(); // not sure relationships will have independent references,
// so exposing this might be leakage. // so exposing this might be leakage.


int label(); int type();


boolean hasProperties(); boolean hasProperties();


Expand Down
Expand Up @@ -190,7 +190,7 @@ public static int countOutgoing( NodeCursor nodeCursor, CursorFactory cursors, i
nodeCursor.allRelationships( traversal ); nodeCursor.allRelationships( traversal );
while ( traversal.next() ) while ( traversal.next() )
{ {
if ( traversal.sourceNodeReference() == nodeCursor.nodeReference() && traversal.label() == type ) if ( traversal.sourceNodeReference() == nodeCursor.nodeReference() && traversal.type() == type )
{ {
count++; count++;
} }
Expand Down Expand Up @@ -236,7 +236,7 @@ public static int countIncoming( NodeCursor nodeCursor, CursorFactory cursors, i
nodeCursor.allRelationships( traversal ); nodeCursor.allRelationships( traversal );
while ( traversal.next() ) while ( traversal.next() )
{ {
if ( traversal.targetNodeReference() == nodeCursor.nodeReference() && traversal.label() == type ) if ( traversal.targetNodeReference() == nodeCursor.nodeReference() && traversal.type() == type )
{ {
count++; count++;
} }
Expand Down Expand Up @@ -280,7 +280,7 @@ public static int countAll( NodeCursor nodeCursor, CursorFactory cursors, int ty
nodeCursor.allRelationships( traversal ); nodeCursor.allRelationships( traversal );
while ( traversal.next() ) while ( traversal.next() )
{ {
if ( traversal.label() == type ) if ( traversal.type() == type )
{ {
count++; count++;
} }
Expand Down
Expand Up @@ -44,7 +44,7 @@ public long relationshipReference()
@Override @Override
public int type() public int type()
{ {
return relationshipCursor.label(); return relationshipCursor.type();
} }


@Override @Override
Expand Down
Expand Up @@ -64,7 +64,7 @@ public R next()
} }
R current = factory.relationship( next, R current = factory.relationship( next,
relationshipCursor.sourceNodeReference(), relationshipCursor.sourceNodeReference(),
relationshipCursor.label(), relationshipCursor.type(),
relationshipCursor.targetNodeReference() ); relationshipCursor.targetNodeReference() );


if ( !fetchNext() ) if ( !fetchNext() )
Expand Down
Expand Up @@ -147,7 +147,7 @@ private boolean correctDirection()


private boolean correctType() private boolean correctType()
{ {
return types == null || ArrayUtils.contains( types, cursor.label() ); return types == null || ArrayUtils.contains( types, cursor.type() );
} }


public void close() public void close()
Expand Down
Expand Up @@ -44,7 +44,7 @@ public long relationshipReference()
@Override @Override
public int type() public int type()
{ {
return cursor.label(); return cursor.type();
} }


@Override @Override
Expand Down
Expand Up @@ -65,7 +65,7 @@ public R next()
} }
R current = factory.relationship( next, R current = factory.relationship( next,
cursor.sourceNodeReference(), cursor.sourceNodeReference(),
cursor.label(), cursor.type(),
cursor.targetNodeReference() ); cursor.targetNodeReference() );


if ( !fetchNext() ) if ( !fetchNext() )
Expand Down
Expand Up @@ -150,7 +150,7 @@ public void shouldAccessRelationshipLabels()
read.allRelationshipsScan( relationships ); read.allRelationshipsScan( relationships );
while ( relationships.next() ) 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 );
} }
} }


Expand Down
Expand Up @@ -153,7 +153,7 @@ static void assertCount(


while ( relationship.next() ) while ( relationship.next() )
{ {
assertEquals( "same type", expectedType, relationship.label() ); assertEquals( "same type", expectedType, relationship.type() );
count++; count++;
} }


Expand Down Expand Up @@ -239,7 +239,7 @@ else if ( r.sourceNodeReference() == r.originNodeReference() )
d = Direction.INCOMING; 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 ) static String computeKey( String type, Direction direction )
Expand Down
Expand Up @@ -80,7 +80,7 @@ public void shouldSeeSingleRelationshipInTransaction() throws Exception
tx.dataRead().singleRelationship( r, relationship ); tx.dataRead().singleRelationship( r, relationship );
assertTrue( "should find relationship", relationship.next() ); assertTrue( "should find relationship", relationship.next() );


assertEquals( label, relationship.label() ); assertEquals( label, relationship.type() );
assertEquals( n1, relationship.sourceNodeReference() ); assertEquals( n1, relationship.sourceNodeReference() );
assertEquals( n2, relationship.targetNodeReference() ); assertEquals( n2, relationship.targetNodeReference() );
assertEquals( r, relationship.relationshipReference() ); assertEquals( r, relationship.relationshipReference() );
Expand Down Expand Up @@ -1285,7 +1285,7 @@ private void assertCountRelationships(
while ( relationship.next() ) while ( relationship.next() )
{ {
assertEquals( sourceNode, relationship.sourceNodeReference() ); assertEquals( sourceNode, relationship.sourceNodeReference() );
assertEquals( type, relationship.label() ); assertEquals( type, relationship.type() );
assertEquals( targetNode, relationship.targetNodeReference() ); assertEquals( targetNode, relationship.targetNodeReference() );
count++; count++;
} }
Expand Down
Expand Up @@ -122,23 +122,23 @@ public void shouldTraverseRelationshipsOfGivenType()
{ {
assertEquals( "node #" + node.nodeReference() + assertEquals( "node #" + node.nodeReference() +
" relationship should have same label as group", group.type(), " relationship should have same label as group", group.type(),
relationship.label() ); relationship.type() );
degree.outgoing++; degree.outgoing++;
} }
group.incoming( relationship ); group.incoming( relationship );
while ( relationship.next() ) while ( relationship.next() )
{ {
assertEquals( "node #" + node.nodeReference() + assertEquals( "node #" + node.nodeReference() +
"relationship should have same label as group", group.type(), "relationship should have same label as group", group.type(),
relationship.label() ); relationship.type() );
degree.incoming++; degree.incoming++;
} }
group.loops( relationship ); group.loops( relationship );
while ( relationship.next() ) while ( relationship.next() )
{ {
assertEquals( "node #" + node.nodeReference() + assertEquals( "node #" + node.nodeReference() +
"relationship should have same label as group", group.type(), "relationship should have same label as group", group.type(),
relationship.label() ); relationship.type() );
degree.loop++; degree.loop++;
} }


Expand Down Expand Up @@ -191,7 +191,7 @@ public void shouldFollowSpecificRelationship()
assertEquals( "neighbouring node", end, relationship.neighbourNodeReference() ); assertEquals( "neighbouring node", end, relationship.neighbourNodeReference() );


assertEquals( "relationship should have same label as group", group.type(), assertEquals( "relationship should have same label as group", group.type(),
relationship.label() ); relationship.type() );


assertFalse( "only a single relationship", relationship.next() ); assertFalse( "only a single relationship", relationship.next() );


Expand All @@ -218,7 +218,7 @@ public void shouldFollowSpecificRelationship()
assertEquals( "neighbouring node", start, relationship.neighbourNodeReference() ); assertEquals( "neighbouring node", start, relationship.neighbourNodeReference() );


assertEquals( "relationship should have same label as group", group.type(), assertEquals( "relationship should have same label as group", group.type(),
relationship.label() ); relationship.type() );


assertFalse( "only a single relationship", relationship.next() ); assertFalse( "only a single relationship", relationship.next() );


Expand Down
Expand Up @@ -66,7 +66,7 @@ public long relationshipReference()
} }


@Override @Override
public int label() public int type()
{ {
return store.get( chainId ).get( offset ).type; return store.get( chainId ).get( offset ).type;
} }
Expand Down
Expand Up @@ -757,7 +757,7 @@ public Iterable<RelationshipType> getRelationshipTypes()
List<RelationshipType> types = new ArrayList<>(); List<RelationshipType> types = new ArrayList<>();
while ( relationships.next() ) while ( relationships.next() )
{ {
types.add( RelationshipType.withName( tokenRead.relationshipTypeName( relationships.label() ) ) ); types.add( RelationshipType.withName( tokenRead.relationshipTypeName( relationships.type() ) ) );
} }


return types; return types;
Expand Down
Expand Up @@ -476,7 +476,7 @@ protected Relationship fetchNextOrNull()
return newRelationshipProxy( return newRelationshipProxy(
cursor.relationshipReference(), cursor.relationshipReference(),
cursor.sourceNodeReference(), cursor.sourceNodeReference(),
cursor.label(), cursor.type(),
cursor.targetNodeReference() ); cursor.targetNodeReference() );
} }
else else
Expand Down
Expand Up @@ -131,7 +131,7 @@ else if ( hasChanges && txs.relationshipIsDeletedInThisTx( next ) )


private boolean isWantedLabelAndInUse() private boolean isWantedLabelAndInUse()
{ {
return (label == -1 || label() == label) && inUse(); return (label == -1 || type() == label) && inUse();
} }


private boolean containsRelationship( TransactionState txs ) private boolean containsRelationship( TransactionState txs )
Expand Down
Expand Up @@ -49,7 +49,7 @@ public long relationshipReference()
} }


@Override @Override
public int label() public int type()
{ {
return getType(); return getType();
} }
Expand Down
Expand Up @@ -431,6 +431,6 @@ private void setStoreRelationship( long relationshipId, long sourceNode, long ta
when( relationshipCursor.relationshipReference() ).thenReturn( relationshipId ); when( relationshipCursor.relationshipReference() ).thenReturn( relationshipId );
when( relationshipCursor.sourceNodeReference() ).thenReturn( sourceNode ); when( relationshipCursor.sourceNodeReference() ).thenReturn( sourceNode );
when( relationshipCursor.targetNodeReference() ).thenReturn( targetNode ); when( relationshipCursor.targetNodeReference() ).thenReturn( targetNode );
when( relationshipCursor.label() ).thenReturn( relationshipLabel ); when( relationshipCursor.type() ).thenReturn( relationshipLabel );
} }
} }

0 comments on commit 1db4cb3

Please sign in to comment.