Cleanup the relTypes argument in the read operation stack

community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java

@@ -444,7 +444,7 @@ public Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement,
 
     @Override
     public Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement, NodeItem node, Direction direction,
-            int... relTypes )
+            PrimitiveIntSet relTypes )
     {
         return entityReadOperations.nodeGetRelationships( statement, node, direction, relTypes );
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/GuardingStatementOperations.java

@@ -328,7 +328,7 @@ public Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement,
 
     @Override
     public Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement, NodeItem node, Direction direction,
-            int... relTypes )
+            PrimitiveIntSet relTypes )
     {
         guard.check( statement );
         return entityReadDelegate.nodeGetRelationships( statement, node, direction, relTypes );

community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java

@@ -112,6 +112,7 @@
 import org.neo4j.storageengine.api.schema.SchemaRule;
 
 import static java.lang.String.format;
+import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
 import static org.neo4j.collection.primitive.PrimitiveIntCollections.deduplicate;
 
 public class OperationsFacade
@@ -371,7 +372,8 @@ public RelationshipIterator nodeGetRelationships( long nodeId, Direction directi
         try ( Cursor<NodeItem> node = dataRead().nodeCursorById( statement, nodeId ) )
         {
             return new CursorRelationshipIterator( dataRead()
-                    .nodeGetRelationships( statement, node.get(), direction( direction ), deduplicate( relTypes ) ) );
+                    .nodeGetRelationships( statement, node.get(), direction( direction ),
+                            asSet( relTypes, t -> t >= 0 ) ) );
         }
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java

@@ -220,12 +220,12 @@ public Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement,
             return cursor;
         }
         NodeState nodeState = statement.txState().getNodeState( node.id() );
-        return statement.txState().augmentNodeRelationshipCursor( cursor, nodeState, direction, null );
+        return statement.txState().augmentNodeRelationshipCursor( cursor, nodeState, direction );
     }
 
     @Override
     public Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement, NodeItem node, Direction direction,
-            int... relTypes )
+            PrimitiveIntSet relTypes )
     {
         Cursor<RelationshipItem> cursor;
         if ( statement.hasTxStateWithChanges() && statement.txState().nodeIsAddedInThisTx( node.id() ) )
@@ -1721,7 +1721,7 @@ private int computeDegree( KernelStatement statement, NodeItem node,  Direction
         {
             return count( relType == null
                           ? storeLayer.nodeGetRelationships( storeStatement, node, direction )
-                          : storeLayer.nodeGetRelationships( storeStatement, node, direction, relType ) );
+                          : storeLayer.nodeGetRelationships( storeStatement, node, direction, (t) -> t == relType ) );
         }
     }
 

community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java

@@ -147,7 +147,7 @@ Cursor<RelationshipItem> relationshipCursorById( KernelStatement statement, long
     Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement, NodeItem node, Direction direction );
 
     Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement, NodeItem node, Direction direction,
-            int... relTypes );
+            PrimitiveIntSet relTypes );
 
     long nodesGetCount( KernelStatement statement );
 

community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/NodeStateImpl.java

@@ -225,7 +225,7 @@ public PrimitiveLongIterator getAddedRelationships( Direction direction )
     }
 
     @Override
-    public PrimitiveLongIterator getAddedRelationships( Direction direction, int[] relTypes )
+    public PrimitiveLongIterator getAddedRelationships( Direction direction, PrimitiveIntSet relTypes )
     {
         return relationshipsAdded != null ? relationshipsAdded.getRelationships( direction, relTypes ) :
             PrimitiveLongCollections.emptyIterator();
@@ -348,7 +348,7 @@ public PrimitiveLongIterator getAddedRelationships( Direction direction )
             }
 
             @Override
-            public PrimitiveLongIterator getAddedRelationships( Direction direction, int[] relTypes )
+            public PrimitiveLongIterator getAddedRelationships( Direction direction, PrimitiveIntSet relTypes )
             {
                 return null;
             }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNode.java

@@ -258,7 +258,7 @@ public RelationshipIterator augmentRelationships( Direction direction, Relations
         return augmentRelationships( direction, rels, ALL_TYPES );
     }
 
-    public RelationshipIterator augmentRelationships( Direction direction, int[] types, RelationshipIterator rels )
+    public RelationshipIterator augmentRelationships( Direction direction, PrimitiveIntSet types, RelationshipIterator rels )
     {
         return augmentRelationships( direction, rels, typeFilter( types ) );
     }
@@ -441,11 +441,11 @@ private Map<Integer, Set<Long>> getTypeToRelMapForDirection( Direction direction
         return relTypeToRelsMap;
     }
 
-    private Function<Map<Integer, Set<Long>>, Iterator<Set<Long>>> typeFilter( final int[] types )
+    private Function<Map<Integer, Set<Long>>, Iterator<Set<Long>>> typeFilter( PrimitiveIntSet types )
     {
         return relationshipsByType -> new PrefetchingIterator<Set<Long>>()
         {
-            private final PrimitiveIntIterator iterTypes = iterator( types );
+            private final PrimitiveIntIterator iterTypes = types.iterator();
 
             @Override
             protected Set<Long> fetchNextOrNull()
@@ -490,7 +490,7 @@ public PrimitiveLongIterator getRelationships( Direction direction )
         return getRelationships( direction, ALL_TYPES );
     }
 
-    public PrimitiveLongIterator getRelationships( Direction direction, int[] types )
+    public PrimitiveLongIterator getRelationships( Direction direction, PrimitiveIntSet types )
     {
         return getRelationships( direction, typeFilter( types ) );
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java

@@ -801,22 +801,24 @@ public Cursor<RelationshipItem> augmentSingleRelationshipCursor( Cursor<Relation
         return hasChanges ? singleRelationshipCursor.get().init( cursor, relationshipId ) : cursor;
     }
 
+    @Override
+    public Cursor<RelationshipItem> augmentNodeRelationshipCursor( Cursor<RelationshipItem> cursor,
+            NodeState nodeState,
+            Direction direction )
+    {
+        return nodeState.hasChanges()
+               ? iteratorRelationshipCursor.get().init( cursor, nodeState.getAddedRelationships( direction ) )
+               : cursor;
+    }
     @Override
     public Cursor<RelationshipItem> augmentNodeRelationshipCursor( Cursor<RelationshipItem> cursor,
             NodeState nodeState,
             Direction direction,
-            int[] relTypes )
+            PrimitiveIntSet relTypes )
     {
-        if ( nodeState.hasChanges() )
-        {
-            if ( relTypes == null )
-            {
-                return iteratorRelationshipCursor.get().init( cursor, nodeState.getAddedRelationships( direction ) );
-            }
-            return iteratorRelationshipCursor.get().init( cursor,
-                    nodeState.getAddedRelationships( direction, relTypes ) );
-        }
-        return cursor;
+        return nodeState.hasChanges()
+               ? iteratorRelationshipCursor.get().init( cursor, nodeState.getAddedRelationships( direction, relTypes ) )
+               : cursor;
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java

@@ -20,6 +20,7 @@
 package org.neo4j.kernel.impl.api.store;
 
 import java.util.Iterator;
+import java.util.function.IntPredicate;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
@@ -81,6 +82,7 @@
 import org.neo4j.storageengine.api.schema.SchemaRule;
 
 import static org.neo4j.collection.primitive.Primitive.intSet;
+import static org.neo4j.function.Predicates.ALWAYS_TRUE_INT;
 import static org.neo4j.helpers.collection.Iterables.filter;
 import static org.neo4j.kernel.api.schema_new.SchemaDescriptorPredicates.hasLabel;
 import static org.neo4j.kernel.impl.api.store.DegreeCounter.countByFirstPrevPointer;
@@ -411,9 +413,16 @@ public RelationshipIterator relationshipsGetAll()
         return new AllRelationshipIterator( relationshipStore );
     }
 
+    @Override
+    public Cursor<RelationshipItem> nodeGetRelationships( StorageStatement statement, NodeItem nodeItem,
+            Direction direction )
+    {
+        return nodeGetRelationships( statement, nodeItem, direction, ALWAYS_TRUE_INT );
+    }
+
     @Override
     public Cursor<RelationshipItem> nodeGetRelationships( StorageStatement statement, NodeItem node,
-            Direction direction, int... relTypes )
+            Direction direction, IntPredicate relTypes )
     {
         return statement.acquireNodeRelationshipCursor( node.isDense(), node.id(), node.nextRelationshipId(), direction,
                 relTypes );

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreStatement.java

@@ -142,31 +142,10 @@ public Cursor<RelationshipItem> acquireSingleRelationshipCursor( long relId )
 
     @Override
     public Cursor<RelationshipItem> acquireNodeRelationshipCursor( boolean isDense, long nodeId, long relationshipId,
-            Direction direction, int... relTypes )
+            Direction direction, IntPredicate relTypeFilter )
     {
         neoStores.assertOpen();
-        return nodeRelationshipCursor.get().init( isDense, relationshipId, nodeId, direction, predicate( relTypes ) );
-    }
-
-    private IntPredicate predicate( int[] relTypes )
-    {
-        if ( relTypes.length == 0 )
-        {
-            return Predicates.ALWAYS_TRUE_INT;
-        }
-
-        return type ->
-        {
-            for ( int relType : relTypes )
-            {
-                if ( type == relType )
-                {
-                    return true;
-                }
-            }
-            return false;
-
-        };
+        return nodeRelationshipCursor.get().init( isDense, relationshipId, nodeId, direction, relTypeFilter );
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/storageengine/api/StorageStatement.java

@@ -19,6 +19,8 @@
  */
 package org.neo4j.storageengine.api;
 
+import java.util.function.IntPredicate;
+
 import org.neo4j.cursor.Cursor;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
 import org.neo4j.kernel.api.schema_new.index.NewIndexDescriptor;
@@ -93,11 +95,11 @@ public interface StorageStatement extends AutoCloseable
      * @param nodeId the id of the node where to start traversing the relationships
      * @param relationshipId the id of the first relationship in the chain
      * @param direction the direction of the relationship wrt the node
-     * @param relTypes the allowed types (it allows all types if unspecified)
+     * @param relTypeFilter the allowed types (it allows all types if unspecified)
      * @return a {@link Cursor} over {@link RelationshipItem} for traversing the relationships associated to the node.
      */
     Cursor<RelationshipItem> acquireNodeRelationshipCursor(  boolean isDense, long nodeId, long relationshipId,
-            Direction direction, int... relTypes );
+            Direction direction, IntPredicate relTypeFilter );
 
     /**
      -     * Acquires {@link Cursor} capable of {@link Cursor#get() serving} {@link RelationshipItem} for selected

community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java

@@ -20,6 +20,7 @@
 package org.neo4j.storageengine.api;
 
 import java.util.Iterator;
+import java.util.function.IntPredicate;
 
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
@@ -281,8 +282,10 @@ <EXCEPTION extends Exception> void relationshipVisit( long relationshipId,
      */
     RelationshipIterator relationshipsGetAll();
 
+    Cursor<RelationshipItem> nodeGetRelationships( StorageStatement statement, NodeItem nodeItem, Direction direction );
+
     Cursor<RelationshipItem> nodeGetRelationships( StorageStatement statement, NodeItem nodeItem, Direction direction,
-            int... typeIds );
+            IntPredicate typeIds );
 
     /**
      * Reserves a node id for future use to store a node. The reason for it being exposed here is that

community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/NodeState.java

@@ -57,5 +57,5 @@ void visitLabelChanges( long nodeId, Set<Integer> added, Set<Integer> removed )
 
     PrimitiveLongIterator getAddedRelationships( Direction direction );
 
-    PrimitiveLongIterator getAddedRelationships( Direction direction, int[] relTypes );
+    PrimitiveLongIterator getAddedRelationships( Direction direction, PrimitiveIntSet relTypes );
 }

community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java

@@ -160,10 +160,11 @@ Cursor<PropertyItem> augmentSinglePropertyCursor( Cursor<PropertyItem> cursor,
 
     Cursor<RelationshipItem> augmentSingleRelationshipCursor( Cursor<RelationshipItem> cursor, long relationshipId );
 
-    Cursor<RelationshipItem> augmentNodeRelationshipCursor( Cursor<RelationshipItem> cursor,
-            NodeState nodeState,
-            Direction direction,
-            int[] relTypes );
+    Cursor<RelationshipItem> augmentNodeRelationshipCursor( Cursor<RelationshipItem> cursor, NodeState nodeState,
+            Direction direction );
+
+    Cursor<RelationshipItem> augmentNodeRelationshipCursor( Cursor<RelationshipItem> cursor, NodeState nodeState,
+            Direction direction, PrimitiveIntSet relTypes );
 
     Cursor<RelationshipItem> augmentRelationshipsGetAllCursor( Cursor<RelationshipItem> cursor );
 

community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/RelationshipChangesForNodeTest.java

@@ -27,6 +27,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
+import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
 import static org.neo4j.kernel.impl.api.store.RelationshipIterator.EMPTY;
 
 public class RelationshipChangesForNodeTest
@@ -45,7 +46,7 @@ public void testOutgoingRelsWithTypeAndLoop() throws Exception
         changes.addRelationship( REL_1, TYPE_DIR, Direction.OUTGOING );
 
         RelationshipIterator iterator = changes.augmentRelationships(
-                Direction.OUTGOING, new int[]{TYPE_DIR}, EMPTY );
+                Direction.OUTGOING, asSet( new int[]{TYPE_DIR} ), EMPTY );
         assertEquals( true, iterator.hasNext() );
         assertEquals( REL_1, iterator.next() );
         assertEquals( "should have no next relationships but has ", false, iterator.hasNext() );
@@ -59,7 +60,7 @@ public void testIncomingRelsWithTypeAndLoop() throws Exception
         changes.addRelationship( REL_1, TYPE_DIR, Direction.INCOMING );
 
         RelationshipIterator iterator = changes.augmentRelationships(
-                Direction.INCOMING, new int[]{TYPE_DIR}, EMPTY );
+                Direction.INCOMING, asSet( new int[]{TYPE_DIR} ), EMPTY );
         assertEquals( true, iterator.hasNext() );
         assertEquals( REL_1, iterator.next() );
         assertEquals( "should have no next relationships but has ", false, iterator.hasNext() );

community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java

@@ -40,14 +40,14 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.Pair;
-import org.neo4j.kernel.api.schema.NodePropertyDescriptor;
-import org.neo4j.kernel.api.schema.RelationshipPropertyDescriptor;
 import org.neo4j.kernel.api.constraints.NodePropertyConstraint;
 import org.neo4j.kernel.api.constraints.RelationshipPropertyExistenceConstraint;
 import org.neo4j.kernel.api.constraints.UniquenessConstraint;
 import org.neo4j.kernel.api.cursor.RelationshipItemHelper;
 import org.neo4j.kernel.api.properties.DefinedProperty;
 import org.neo4j.kernel.api.properties.Property;
+import org.neo4j.kernel.api.schema.NodePropertyDescriptor;
+import org.neo4j.kernel.api.schema.RelationshipPropertyDescriptor;
 import org.neo4j.kernel.api.schema_new.index.NewIndexDescriptor;
 import org.neo4j.kernel.api.schema_new.index.NewIndexDescriptorFactory;
 import org.neo4j.kernel.api.txstate.TransactionState;
@@ -80,8 +80,8 @@
 import static org.neo4j.kernel.api.properties.Property.noNodeProperty;
 import static org.neo4j.kernel.api.properties.Property.numberProperty;
 import static org.neo4j.kernel.api.properties.Property.stringProperty;
-import static org.neo4j.kernel.impl.api.state.StubCursors.cursor;
 import static org.neo4j.kernel.api.schema_new.index.NewIndexDescriptor.Filter.GENERAL;
+import static org.neo4j.kernel.impl.api.state.StubCursors.cursor;
 
 public class TxStateTest
 {
@@ -1459,9 +1459,10 @@ public void shouldObserveCorrectAugmentedNodeRelationshipsState() throws Excepti
             int[] relationshipTypes = randomTypes( relationshipTypeCount, random.random() );
             Cursor<RelationshipItem> committed = cursor(
                     relationshipsForNode( i, committedRelationships, direction, relationshipTypes ).values() );
-            Cursor<RelationshipItem> augmented =
-                    state.augmentNodeRelationshipCursor( committed, state.getNodeState( i ), direction,
-                            relationshipTypes );
+            Cursor<RelationshipItem> augmented = relationshipTypes == null
+                    ? state.augmentNodeRelationshipCursor( committed, state.getNodeState( i ), direction )
+                    : state.augmentNodeRelationshipCursor( committed, state.getNodeState( i ), direction,
+                             PrimitiveIntCollections.asSet( relationshipTypes ) );
 
             Map<Long,RelationshipItem> expectedRelationships =
                     relationshipsForNode( i, allRelationships, direction, relationshipTypes );