Store relationship id contexts as list

Author: soerenreichardt

cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/storageengine/InMemoryRelationshipCursor.java

@@ -34,12 +34,13 @@
 import org.neo4j.token.TokenHolders;
 
 import java.util.Arrays;
+import java.util.List;
 
 public abstract class InMemoryRelationshipCursor extends RelationshipRecord implements RelationshipVisitor<RuntimeException>, StorageRelationshipCursor {
 
     protected final CypherGraphStore graphStore;
     protected final TokenHolders tokenHolders;
-    private final RelationshipIds.RelationshipIdContext[] relationshipIdContexts;
+    private final List<RelationshipIds.RelationshipIdContext> relationshipIdContexts;
     private final AdjacencyCursor[] adjacencyCursorCache;
     private final PropertyCursor[][] propertyCursorCache;
 
@@ -59,11 +60,11 @@ public InMemoryRelationshipCursor(CypherGraphStore graphStore, TokenHolders toke
         this.graphStore = graphStore;
         this.tokenHolders = tokenHolders;
         this.relationshipIdContexts = this.graphStore.relationshipIds().relationshipIdContexts();
-        this.adjacencyCursorCache = Arrays.stream(relationshipIdContexts)
+        this.adjacencyCursorCache = relationshipIdContexts.stream()
             .map(context -> context.adjacencyList().rawAdjacencyCursor())
             .toArray(AdjacencyCursor[]::new);
 
-        this.propertyCursorCache = Arrays.stream(relationshipIdContexts)
+        this.propertyCursorCache = relationshipIdContexts.stream()
             .map(context -> Arrays
                 .stream(context.adjacencyProperties())
                 .map(AdjacencyProperties::rawPropertyCursor)
@@ -96,7 +97,7 @@ public long targetNodeReference() {
 
     @Override
     public boolean hasProperties() {
-        return relationshipIdContexts[relationshipContextIndex].graph().hasRelationshipProperty();
+        return relationshipIdContexts.get(relationshipContextIndex).graph().hasRelationshipProperty();
     }
 
     @Override
@@ -160,15 +161,15 @@ public void properties(StoragePropertyCursor propertyCursor, InMemoryPropertySel
     private boolean progressToNextContext() {
         relationshipContextIndex++;
 
-        if (relationshipContextIndex >= relationshipIdContexts.length) {
+        if (relationshipContextIndex >= relationshipIdContexts.size()) {
             return false;
         }
 
         if (relationshipContextIndex > 0) {
-            relationshipTypeOffset += relationshipIdContexts[relationshipContextIndex - 1].relationshipCount();
+            relationshipTypeOffset += relationshipIdContexts.get(relationshipContextIndex - 1).relationshipCount();
         }
 
-        var context = relationshipIdContexts[relationshipContextIndex];
+        var context = relationshipIdContexts.get(relationshipContextIndex);
 
         if (!selection.test(context.relationshipTypeId())) {
             return progressToNextContext();

cypher/cypher-core/src/main/java/org/neo4j/gds/core/cypher/RelationshipIds.java

@@ -19,7 +19,6 @@
  */
 package org.neo4j.gds.core.cypher;
 
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.immutables.value.Value;
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.annotation.ValueClass;
@@ -32,18 +31,18 @@
 import org.neo4j.gds.core.utils.paged.HugeLongArray;
 import org.neo4j.token.TokenHolders;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
 public final class RelationshipIds {
 
-    private final RelationshipIdContext[] relationshipIdContexts;
+    private final List<RelationshipIdContext> relationshipIdContexts;
 
     static RelationshipIds fromGraphStore(GraphStore graphStore, TokenHolders tokenHolders) {
-        var relationshipIdContexts = new RelationshipIdContext[graphStore.relationshipTypes().size()];
-        var index = new MutableInt(0);
+        var relationshipIdContexts = new ArrayList<RelationshipIdContext>(graphStore.relationshipTypes().size());
 
         graphStore.relationshipTypes().forEach(relType -> {
             var relCount = graphStore.relationshipCount(relType);
@@ -68,16 +67,16 @@ static RelationshipIds fromGraphStore(GraphStore graphStore, TokenHolders tokenH
                 .map(relationshipProperty -> relationshipProperty.values().propertiesList())
                 .toArray(AdjacencyProperties[]::new);
 
-            relationshipIdContexts[index.getAndIncrement()] = ImmutableRelationshipIdContext.of(relType, relTypeId, relCount, graph, offsets, propertyIds, adjacencyProperties);
+            relationshipIdContexts.add(ImmutableRelationshipIdContext.of(relType, relTypeId, relCount, graph, offsets, propertyIds, adjacencyProperties));
         });
         return new RelationshipIds(relationshipIdContexts);
     }
 
-    private RelationshipIds(RelationshipIdContext[] relationshipIdContexts) {
+    private RelationshipIds(List<RelationshipIdContext> relationshipIdContexts) {
         this.relationshipIdContexts = relationshipIdContexts;
     }
 
-    public RelationshipIdContext[] relationshipIdContexts() {
+    public List<RelationshipIdContext> relationshipIdContexts() {
         return relationshipIdContexts;
     }