Store relationship cursor caches as list

Author: soerenreichardt

cypher/api/storage-engine-adapter/src/main/java/org/neo4j/gds/compat/AbstractInMemoryRelationshipPropertyCursor.java

@@ -19,6 +19,7 @@
  */
 package org.neo4j.gds.compat;
 
+import org.eclipse.collections.api.list.primitive.DoubleList;
 import org.neo4j.gds.core.cypher.CypherGraphStore;
 import org.neo4j.token.TokenHolders;
 import org.neo4j.values.storable.Value;
@@ -30,7 +31,7 @@ public abstract class AbstractInMemoryRelationshipPropertyCursor extends Abstrac
     protected final CypherGraphStore graphStore;
     protected final TokenHolders tokenHolders;
     protected InMemoryPropertySelection selection;
-    private double[] propertyValues;
+    private DoubleList propertyValues;
     private int[] propertyIds;
     private int index;
 
@@ -41,7 +42,7 @@ protected AbstractInMemoryRelationshipPropertyCursor(CypherGraphStore graphStore
         reset();
     }
 
-    public void initRelationshipPropertyCursor(long id, int[] propertyIds, double[] propertyValues, InMemoryPropertySelection selection) {
+    public void initRelationshipPropertyCursor(long id, int[] propertyIds, DoubleList propertyValues, InMemoryPropertySelection selection) {
         setId(id);
         setRelId(id);
         this.index = -1;
@@ -82,7 +83,7 @@ public ValueGroup propertyType() {
     @Override
     public Value propertyValue() {
         if (getRelId() != NO_ID && this.index < propertyIds.length) {
-            return Values.doubleValue(propertyValues[this.index]);
+            return Values.doubleValue(propertyValues.get(this.index));
         }
         throw new IllegalStateException("Property cursor is not initialized.");
     }

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

@@ -19,6 +19,8 @@
  */
 package org.neo4j.gds.storageengine;
 
+import org.eclipse.collections.api.list.primitive.MutableDoubleList;
+import org.eclipse.collections.impl.list.mutable.primitive.DoubleArrayList;
 import org.neo4j.gds.api.AdjacencyCursor;
 import org.neo4j.gds.api.AdjacencyProperties;
 import org.neo4j.gds.api.PropertyCursor;
@@ -35,22 +37,23 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public abstract class InMemoryRelationshipCursor extends RelationshipRecord implements RelationshipVisitor<RuntimeException>, StorageRelationshipCursor {
 
     protected final CypherGraphStore graphStore;
     protected final TokenHolders tokenHolders;
     private final List<RelationshipIds.RelationshipIdContext> relationshipIdContexts;
-    private final AdjacencyCursor[] adjacencyCursorCache;
-    private final PropertyCursor[][] propertyCursorCache;
+    private final List<AdjacencyCursor> adjacencyCursorCache;
+    private final List<PropertyCursor[]> propertyCursorCache;
+    private final MutableDoubleList propertyValuesCache;
 
     protected long sourceId;
     protected long targetId;
     protected RelationshipSelection selection;
 
     private AdjacencyCursor adjacencyCursor;
     private PropertyCursor[] propertyCursors;
-    private final double[] propertyValuesCache;
     private int relationshipTypeOffset;
     private int relationshipContextIndex;
     private int[] propertyIds;
@@ -62,18 +65,18 @@ public InMemoryRelationshipCursor(CypherGraphStore graphStore, TokenHolders toke
         this.relationshipIdContexts = this.graphStore.relationshipIds().relationshipIdContexts();
         this.adjacencyCursorCache = relationshipIdContexts.stream()
             .map(context -> context.adjacencyList().rawAdjacencyCursor())
-            .toArray(AdjacencyCursor[]::new);
+            .collect(Collectors.toList());
 
         this.propertyCursorCache = relationshipIdContexts.stream()
             .map(context -> Arrays
                 .stream(context.adjacencyProperties())
                 .map(AdjacencyProperties::rawPropertyCursor)
                 .toArray(PropertyCursor[]::new)
             )
-            .toArray(PropertyCursor[][]::new);
+            .collect(Collectors.toList());
 
-        var maxPropertySize = Arrays.stream(propertyCursorCache).mapToInt(a -> a.length).max().orElse(0);
-        this.propertyValuesCache = new double[maxPropertySize];
+        var maxPropertySize = propertyCursorCache.stream().mapToInt(a -> a.length).max().orElse(0);
+        this.propertyValuesCache = new DoubleArrayList(new double[maxPropertySize]);
     }
 
     @Override
@@ -117,7 +120,7 @@ public boolean next() {
                 setId(getId() + 1);
 
                 for (int i = 0; i < propertyCursors.length; i++) {
-                    propertyValuesCache[i] = Double.longBitsToDouble(propertyCursors[i].nextLong());
+                    propertyValuesCache.set(i, Double.longBitsToDouble(propertyCursors[i].nextLong()));
                 }
 
                 return true;
@@ -178,14 +181,14 @@ private boolean progressToNextContext() {
         setType(context.relationshipTypeId());
 
         // initialize the adjacency cursor
-        var reuseCursor = adjacencyCursorCache[relationshipContextIndex];
+        var reuseCursor = adjacencyCursorCache.get(relationshipContextIndex);
         this.adjacencyCursor = context
             .adjacencyList()
             .adjacencyCursor(reuseCursor, this.sourceId);
 
         // initialize the property cursors
         this.propertyIds = context.propertyIds();
-        this.propertyCursors = propertyCursorCache[relationshipContextIndex];
+        this.propertyCursors = propertyCursorCache.get(relationshipContextIndex);
         var adjacencyProperties = context.adjacencyProperties();
         for (int i = 0; i < propertyCursors.length; i++) {
                 adjacencyProperties[i].propertyCursor(propertyCursors[i], this.sourceId);