Merge pull request #10002 from soerenreichardt/remove-cypher-aggregation-extension

Remove cypher aggregation extension

Author: soerenreichardt

cypher-aggregation/src/main/java/org/neo4j/gds/projection/CypherAggregation.java

@@ -46,7 +46,7 @@
 public class CypherAggregation implements CallableUserAggregationFunction {
 
     // NOTE: keep in sync with `procedureSyntax`
-    static final QualifiedName FUNCTION_NAME = new QualifiedName(
+    public static final QualifiedName FUNCTION_NAME = new QualifiedName(
         new String[]{"gds", "graph"},
         "project"
     );

cypher-aggregation/src/main/java/org/neo4j/gds/projection/CypherAggregationExtension.java

@@ -21,6 +21,7 @@ dependencies {
     implementation project(':core')
     implementation project(':core-utils')
     implementation project(':core-write')
+    implementation project(':cypher-aggregation')
     implementation project(':defaults-and-limits-configuration')
     implementation project(':executor')
     implementation project(':graph-store-catalog-applications')

procedures/extension/build.gradle

@@ -35,6 +35,8 @@
 import org.neo4j.gds.procedures.integration.DefaultExportLocation;
 import org.neo4j.gds.procedures.integration.LogAccessor;
 import org.neo4j.gds.procedures.integration.OpenGraphDataScienceExtensionBuilder;
+import org.neo4j.gds.projection.AlphaCypherAggregation;
+import org.neo4j.gds.projection.CypherAggregation;
 import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.kernel.extension.ExtensionFactory;
 import org.neo4j.kernel.extension.context.ExtensionContext;
@@ -78,6 +80,9 @@ public Lifecycle newInstance(ExtensionContext extensionContext, Dependencies dep
         var modelRepository = new OpenModelRepository(); // no model storing in OpenGDS
         var poolSizes = new OpenGdsPoolSizes(); // limited to four
 
+        var cypherAggregation = new CypherAggregation();
+        var alphaCypherAggregation = new AlphaCypherAggregation();
+
         var graphDataScienceExtensionBuilderAndAssociatedProducts = OpenGraphDataScienceExtensionBuilder.create(
             log,
             dependencySatisfier,
@@ -95,6 +100,8 @@ public Lifecycle newInstance(ExtensionContext extensionContext, Dependencies dep
             modelCatalog,
             modelRepository,
             poolSizes,
+            cypherAggregation,
+            alphaCypherAggregation,
             Optional.empty(), // no extra checks in OpenGDS
             Optional.empty(), // no extra checks in OpenGDS
             Optional.empty() // no extra checks in OpenGDS

procedures/extension/src/main/java/org/neo4j/gds/extension/OpenGraphDataScienceExtension.java

@@ -22,6 +22,7 @@ dependencies {
     implementation project(':config-api')
     implementation project(':core')
     implementation project(':core-write')
+    implementation project(':cypher-aggregation')
     implementation project(':defaults-and-limits-configuration')
     implementation project(':executor')
     implementation project(':graph-store-catalog-applications')

procedures/integration/build.gradle

@@ -50,8 +50,11 @@
 import org.neo4j.gds.procedures.UserAccessor;
 import org.neo4j.gds.procedures.UserLogServices;
 import org.neo4j.gds.procedures.memory.MemoryFacade;
+import org.neo4j.gds.projection.AlphaCypherAggregation;
+import org.neo4j.gds.projection.CypherAggregation;
 import org.neo4j.gds.settings.GdsSettings;
 import org.neo4j.graphdb.config.Configuration;
+import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.procedure.GlobalProcedures;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.kernel.lifecycle.Lifecycle;
@@ -61,6 +64,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
+import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
+
 /**
  * The GraphDataScience component has a certain contract,
  * in terms of the components it registers and the lifecycles it spawns.
@@ -135,6 +140,8 @@ public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactorySe
         ModelCatalog modelCatalog,
         ModelRepository modelRepository,
         PoolSizes poolSizes,
+        CypherAggregation cypherAggregation,
+        AlphaCypherAggregation alphaCypherAggregation,
         Optional<Function<AlgorithmProcessingTemplate, AlgorithmProcessingTemplate>> algorithmProcessingTemplateDecorator,
         Optional<Function<GraphCatalogApplications, GraphCatalogApplications>> graphCatalogApplicationsDecorator,
         Optional<Function<ModelCatalogApplications, ModelCatalogApplications>> modelCatalogApplicationsDecorator
@@ -184,6 +191,8 @@ public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactorySe
            return new MemoryFacade(user,memoryTracker);
         });
 
+        registerCypherAggregation(globalProcedures, cypherAggregation, alphaCypherAggregation, log);
+
         var graphDataScienceProviderFactory = new GraphDataScienceProceduresProviderFactory(
             log,
             neo4jConfiguration,
@@ -218,6 +227,15 @@ public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactorySe
         return Triple.of(graphDataScienceExtensionBuilder, taskRegistryFactoryService, taskStoreService);
     }
 
+    private static void registerCypherAggregation(GlobalProcedures globalProcedures, CypherAggregation cypherAggregation, AlphaCypherAggregation alphaCypherAggregation, Log log) {
+        try {
+            globalProcedures.register(cypherAggregation);
+            globalProcedures.register(alphaCypherAggregation);
+        } catch (ProcedureException e) {
+            log.warn(formatWithLocale("`%s` is not available", CypherAggregation.FUNCTION_NAME), e);
+        }
+    }
+
     /**
      * At this point we have all the bits ready, so we assemble and register them with Neo4j.
      * There are some legacy bits that are still part of the contract, they will disappear gradually,

procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/OpenGraphDataScienceExtensionBuilder.java

@@ -30,7 +30,6 @@ dependencies {
     implementation project(':logging')
     implementation project(':memory-usage')
     implementation project(':neo4j-log-adapter')
-    implementation project(':proc-common')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')