Always pre-aggregate

Author: s1ck

core/src/main/java/org/neo4j/gds/core/loading/AdjacencyBuffer.java

@@ -67,7 +67,6 @@ public final class AdjacencyBuffer {
     private final double[] defaultValues;
     private final Aggregation[] aggregations;
     private final boolean atLeastOnePropertyToLoad;
-    private final boolean preAggregate;
 
     public static MemoryEstimation memoryEstimation(
         RelationshipType relationshipType,
@@ -110,8 +109,7 @@ public static MemoryEstimation memoryEstimation(
     public static AdjacencyBuffer of(
         SingleTypeRelationshipImporter.ImportMetaData importMetaData,
         AdjacencyCompressorFactory adjacencyCompressorFactory,
-        ImportSizing importSizing,
-        boolean preAggregate
+        ImportSizing importSizing
     ) {
         var numPages = importSizing.numberOfPages();
         var pageSize = importSizing.pageSize();
@@ -140,8 +138,7 @@ public static AdjacencyBuffer of(
             adjacencyCompressorFactory, localBuilders,
             compressedAdjacencyLists,
             paging,
-            atLeastOnePropertyToLoad,
-            preAggregate
+            atLeastOnePropertyToLoad
         );
     }
 
@@ -151,8 +148,7 @@ private AdjacencyBuffer(
         ThreadLocalRelationshipsBuilder[] localBuilders,
         ChunkedAdjacencyLists[] chunkedAdjacencyLists,
         AdjacencyBufferPaging paging,
-        boolean atLeastOnePropertyToLoad,
-        boolean preAggregate
+        boolean atLeastOnePropertyToLoad
     ) {
         this.adjacencyCompressorFactory = adjacencyCompressorFactory;
         this.localBuilders = localBuilders;
@@ -163,7 +159,6 @@ private AdjacencyBuffer(
         this.defaultValues = importMetaData.defaultValues();
         this.aggregations = importMetaData.aggregations();
         this.atLeastOnePropertyToLoad = atLeastOnePropertyToLoad;
-        this.preAggregate = preAggregate;
     }
 
     /**
@@ -216,7 +211,7 @@ void addAll(
                 if (propertyValues == null) {
                     compressedTargets.add(localId, targets, startOffset, endOffset, targetsToImport);
                 } else {
-                    if (preAggregate && aggregations[0] != Aggregation.NONE) {
+                    if (aggregations[0] != Aggregation.NONE) {
                         targetsToImport = preAggregate(targets, propertyValues, startOffset, endOffset, aggregations);
                     }
                     compressedTargets.add(localId, targets, propertyValues, startOffset, endOffset, targetsToImport);

core/src/main/java/org/neo4j/gds/core/loading/SingleTypeRelationshipImporter.java

@@ -54,8 +54,7 @@ public static SingleTypeRelationshipImporter of(
         ImportMetaData importMetaData,
         LongSupplier nodeCountSupplier,
         boolean validateRelationships,
-        ImportSizing importSizing,
-        Optional<Boolean> preAggregate
+        ImportSizing importSizing
     ) {
         var adjacencyCompressorFactory = AdjacencyListBehavior.asConfigured(
             nodeCountSupplier,
@@ -67,7 +66,6 @@ public static SingleTypeRelationshipImporter of(
             .importMetaData(importMetaData)
             .importSizing(importSizing)
             .adjacencyCompressorFactory(adjacencyCompressorFactory)
-            .preAggregate(preAggregate.orElse(false))
             .build();
 
         return new SingleTypeRelationshipImporter(

core/src/main/java/org/neo4j/gds/core/loading/construction/GraphFactory.java

@@ -206,8 +206,7 @@ static RelationshipsBuilder relationshipsBuilder(
         Optional<Aggregation> aggregation,
         Optional<Boolean> validateRelationships,
         Optional<Integer> concurrency,
-        Optional<ExecutorService> executorService,
-        Optional<Boolean> preAggregate
+        Optional<ExecutorService> executorService
     ) {
         var loadRelationshipProperties = !propertyConfigs.isEmpty();
 
@@ -267,7 +266,6 @@ static RelationshipsBuilder relationshipsBuilder(
             .nodeCountSupplier(() -> nodes.rootNodeCount().orElse(0L))
             .importSizing(importSizing)
             .validateRelationships(validateRelationships.orElse(false))
-            .preAggregate(preAggregate.orElse(false))
             .build();
 
         return new RelationshipsBuilder(

test-utils/src/main/java/org/neo4j/gds/core/loading/AdjacencyListBuilderBaseTest.java

@@ -63,7 +63,6 @@ void adjacencyListTest(Optional<Long> idOffset) {
             .adjacencyCompressorFactory(adjacencyCompressorFactory)
             .importMetaData(importMetaData)
             .importSizing(ImportSizing.of(1, nodeCount))
-            .preAggregate(false)
             .build();
 
         DirectIdMap idMap = new DirectIdMap(nodeCount);