Return sets instead of collections in Kernel APIs where uniqueness

semantic is implied by design
neo4j · Feb 16, 2018 · 0157562 · 0157562
1 parent d999c2a
commit 0157562
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 26 deletions.
diff --git a/...ty/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionCountingStateVisitor.java b/...ty/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionCountingStateVisitor.java
@@ -21,7 +21,6 @@
 
 import java.util.Set;
 
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.collection.primitive.PrimitiveIntVisitor;
 import org.neo4j.cursor.Cursor;
@@ -134,7 +133,7 @@ public void visitNodeLabelChanges( long id, final Set<Integer> added, final Set<
         super.visitNodeLabelChanges( id, added, removed );
     }
 
-    private void updateRelationshipsCountsFromDegrees( PrimitiveIntCollection labels, int type, long outgoing,
+    private void updateRelationshipsCountsFromDegrees( PrimitiveIntSet labels, int type, long outgoing,
             long incoming )
     {
         labels.visitKeys( label -> updateRelationshipsCountsFromDegrees( type, label, outgoing, incoming ) );

diff --git a/...y/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java b/...y/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java
@@ -23,7 +23,6 @@
 
 import java.util.Iterator;
 
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
 import org.neo4j.collection.primitive.PrimitiveIntCollections;
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
@@ -510,7 +509,7 @@ public boolean nodeHasProperty( KernelStatement statement, NodeItem node, int pr
     }
 
     @Override
-    public PrimitiveIntCollection nodeGetPropertyKeys( KernelStatement statement, NodeItem node )
+    public PrimitiveIntSet nodeGetPropertyKeys( KernelStatement statement, NodeItem node )
     {
         return entityReadOperations.nodeGetPropertyKeys( statement, node );
     }
@@ -535,7 +534,7 @@ public boolean relationshipHasProperty( KernelStatement statement, RelationshipI
     }
 
     @Override
-    public PrimitiveIntCollection relationshipGetPropertyKeys( KernelStatement statement,
+    public PrimitiveIntSet relationshipGetPropertyKeys( KernelStatement statement,
             RelationshipItem relationship )
     {
         return entityReadOperations.relationshipGetPropertyKeys( statement, relationship );

diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
@@ -24,10 +24,8 @@
 import java.util.Map;
 
 import org.neo4j.collection.primitive.Primitive;
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
-import org.neo4j.collection.primitive.PrimitiveIntStack;
 import org.neo4j.collection.primitive.PrimitiveLongIterator;
 import org.neo4j.collection.primitive.PrimitiveLongResourceIterator;
 import org.neo4j.cursor.Cursor;
@@ -267,14 +265,14 @@ public Cursor<PropertyItem> nodeGetProperties( KernelStatement statement, NodeIt
     }
 
     @Override
-    public PrimitiveIntCollection nodeGetPropertyKeys( KernelStatement statement, NodeItem node )
+    public PrimitiveIntSet nodeGetPropertyKeys( KernelStatement statement, NodeItem node )
     {
-        PrimitiveIntStack keys = new PrimitiveIntStack();
+        final PrimitiveIntSet keys = Primitive.intSet();
         try ( Cursor<PropertyItem> properties = nodeGetProperties( statement, node ) )
         {
             while ( properties.next() )
             {
-                keys.push( properties.get().propertyKeyId() );
+                keys.add( properties.get().propertyKeyId() );
             }
         }
 
@@ -347,15 +345,15 @@ public Cursor<PropertyItem> relationshipGetProperties( KernelStatement statement
     }
 
     @Override
-    public PrimitiveIntCollection relationshipGetPropertyKeys( KernelStatement statement,
+    public PrimitiveIntSet relationshipGetPropertyKeys( KernelStatement statement,
             RelationshipItem relationship )
     {
-        PrimitiveIntStack keys = new PrimitiveIntStack();
+        final PrimitiveIntSet keys = Primitive.intSet();
         try ( Cursor<PropertyItem> properties = relationshipGetProperties( statement, relationship ) )
         {
             while ( properties.next() )
             {
-                keys.push( properties.get().propertyKeyId() );
+                keys.add( properties.get().propertyKeyId() );
             }
         }
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java
@@ -28,9 +28,9 @@
 import java.util.function.BiConsumer;
 
 import org.neo4j.collection.primitive.Primitive;
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
+import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.collection.primitive.PrimitiveLongCollections;
 import org.neo4j.collection.primitive.PrimitiveLongIterator;
 import org.neo4j.collection.primitive.PrimitiveLongObjectMap;
@@ -145,7 +145,7 @@ public Iterable<IndexProxy> getAllIndexProxies()
      * @return set of LabelSchemaDescriptors describing the potentially affected indexes
      */
     public Set<LabelSchemaDescriptor> getRelatedIndexes(
-            long[] changedLabels, long[] unchangedLabels, PrimitiveIntCollection properties )
+            long[] changedLabels, long[] unchangedLabels, PrimitiveIntSet properties )
     {
         if ( changedLabels.length == 1 && properties.isEmpty() )
         {
@@ -269,7 +269,7 @@ private static Map<LabelSchemaDescriptor, Long> indexIdsByDescriptor( PrimitiveL
      */
     private Set<LabelSchemaDescriptor> getDescriptorsByProperties(
             long[] unchangedLabels,
-            PrimitiveIntCollection properties )
+            PrimitiveIntSet properties )
     {
         int nIndexesForLabels = countIndexesByLabels( unchangedLabels );
         int nIndexesForProperties = countIndexesByProperties( properties );
@@ -316,7 +316,7 @@ private int countIndexesByLabels( long[] labels )
         return count;
     }
 
-    private Set<LabelSchemaDescriptor> extractIndexesByProperties( PrimitiveIntCollection properties )
+    private Set<LabelSchemaDescriptor> extractIndexesByProperties( PrimitiveIntSet properties )
     {
         Set<LabelSchemaDescriptor> set = new HashSet<>();
         for ( PrimitiveIntIterator iterator = properties.iterator(); iterator.hasNext(); )
@@ -330,7 +330,7 @@ private Set<LabelSchemaDescriptor> extractIndexesByProperties( PrimitiveIntColle
         return set;
     }
 
-    private int countIndexesByProperties( PrimitiveIntCollection properties )
+    private int countIndexesByProperties( PrimitiveIntSet properties )
     {
         int count = 0;
         for ( PrimitiveIntIterator iterator = properties.iterator(); iterator.hasNext(); )

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.kernel.impl.api.index;
 
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
+import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.function.ThrowingFunction;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
@@ -100,7 +100,7 @@ public Iterable<IndexProxy> getAllIndexProxies()
     }
 
     public Iterable<LabelSchemaDescriptor> getRelatedIndexes(
-            long[] changedLabels, long[] unchangedLabels, PrimitiveIntCollection properties )
+            long[] changedLabels, long[] unchangedLabels, PrimitiveIntSet properties )
     {
         return indexMap.getRelatedIndexes( changedLabels, unchangedLabels, properties );
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java
@@ -25,7 +25,6 @@
 
 import org.neo4j.collection.primitive.Primitive;
 import org.neo4j.collection.primitive.PrimitiveArrays;
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveIntObjectMap;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
@@ -37,6 +36,7 @@
 
 import static java.lang.String.format;
 import static java.util.Arrays.binarySearch;
+import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
 import static org.neo4j.kernel.impl.api.index.NodeUpdates.PropertyValueType.Changed;
 import static org.neo4j.kernel.impl.api.index.NodeUpdates.PropertyValueType.NoValue;
 
@@ -138,11 +138,11 @@ long[] labelsUnchanged()
         return PrimitiveArrays.intersect( labelsBefore, labelsAfter );
     }
 
-    PrimitiveIntCollection propertiesChanged()
+    PrimitiveIntSet propertiesChanged()
     {
         assert !hasLoadedAdditionalProperties : "Calling propertiesChanged() is not valid after non-changed " +
                                                 "properties have already been loaded.";
-        return knownProperties;
+        return asSet( knownProperties.iterator() );
     }
 
     @Override

diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java
@@ -19,7 +19,6 @@
  */
 package org.neo4j.kernel.impl.api.operations;
 
-import org.neo4j.collection.primitive.PrimitiveIntCollection;
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.collection.primitive.PrimitiveLongIterator;
@@ -106,15 +105,15 @@ Cursor<RelationshipItem> nodeGetRelationships( KernelStatement statement, NodeIt
 
     boolean nodeHasProperty( KernelStatement statement, NodeItem node, int propertyKeyId );
 
-    PrimitiveIntCollection nodeGetPropertyKeys( KernelStatement statement, NodeItem node );
+    PrimitiveIntSet nodeGetPropertyKeys( KernelStatement statement, NodeItem node );
 
     Cursor<PropertyItem> relationshipGetProperties( KernelStatement statement, RelationshipItem relationship );
 
     Value relationshipGetProperty( KernelStatement statement, RelationshipItem relationship, int propertyKeyId );
 
     boolean relationshipHasProperty( KernelStatement statement, RelationshipItem relationship, int propertyKeyId );
 
-    PrimitiveIntCollection relationshipGetPropertyKeys( KernelStatement statement, RelationshipItem relationship );
+    PrimitiveIntSet relationshipGetPropertyKeys( KernelStatement statement, RelationshipItem relationship );
 
     long nodesGetCount( KernelStatement statement );