Set missing config keys to NULL when forwarding from alpha

Author: neo-walker

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

@@ -43,7 +43,7 @@ public class AlphaGraphAggregator extends GraphAggregator {
     @Override
     public void update(AnyValue[] input) throws ProcedureException {
         try {
-            var nodesConfig = input[3];
+            var nodesConfig = nodeConfigMap(input[3]);
             var relationshipsConfig = relationshipConfigMap(input[4]);
             AnyValue dataConfig = NoValue.NO_VALUE;
             dataConfig = mergeMaps(dataConfig, nodesConfig);
@@ -67,12 +67,36 @@ public void update(AnyValue[] input) throws ProcedureException {
         }
     }
 
+    private static AnyValue nodeConfigMap(AnyValue nodeConfig) {
+        if (nodeConfig == NoValue.NO_VALUE) {
+            return NoValue.NO_VALUE;
+        }
+
+        var config = (MapValue) nodeConfig;
+
+        if (config.containsKey(SOURCE_NODE_LABELS) && !config.containsKey(TARGET_NODE_LABELS)) {
+            config = config.updatedWith(TARGET_NODE_LABELS, NoValue.NO_VALUE);
+        }
+        if (config.containsKey(TARGET_NODE_LABELS) && !config.containsKey(SOURCE_NODE_LABELS)) {
+            config = config.updatedWith(SOURCE_NODE_LABELS, NoValue.NO_VALUE);
+        }
+
+        if (config.containsKey(SOURCE_NODE_PROPERTIES) && !config.containsKey(TARGET_NODE_PROPERTIES)) {
+            config = config.updatedWith(TARGET_NODE_PROPERTIES, NoValue.NO_VALUE);
+        }
+        if (config.containsKey(TARGET_NODE_PROPERTIES) && !config.containsKey(SOURCE_NODE_PROPERTIES)) {
+            config = config.updatedWith(SOURCE_NODE_PROPERTIES, NoValue.NO_VALUE);
+        }
+
+        return config;
+    }
+
     private static AnyValue relationshipConfigMap(AnyValue relationshipConfig) {
         if (relationshipConfig == NoValue.NO_VALUE) {
             return NoValue.NO_VALUE;
         }
 
-        var config = ((MapValue) relationshipConfig);
+        var config = (MapValue) relationshipConfig;
 
         if (config.containsKey(ALPHA_RELATIONSHIP_PROPERTIES) && !config.containsKey(RELATIONSHIP_PROPERTIES)) {
             return config

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

@@ -55,10 +55,10 @@
 
 abstract class GraphAggregator implements CompatUserAggregator {
 
-    private static final String SOURCE_NODE_PROPERTIES = "sourceNodeProperties";
-    private static final String SOURCE_NODE_LABELS = "sourceNodeLabels";
-    private static final String TARGET_NODE_PROPERTIES = "targetNodeProperties";
-    private static final String TARGET_NODE_LABELS = "targetNodeLabels";
+    static final String SOURCE_NODE_PROPERTIES = "sourceNodeProperties";
+    static final String SOURCE_NODE_LABELS = "sourceNodeLabels";
+    static final String TARGET_NODE_PROPERTIES = "targetNodeProperties";
+    static final String TARGET_NODE_LABELS = "targetNodeLabels";
     static final String ALPHA_RELATIONSHIP_PROPERTIES = "properties";
     static final String RELATIONSHIP_PROPERTIES = "relationshipProperties";
     private static final String RELATIONSHIP_TYPE = "relationshipType";

cypher-aggregation/src/test/java/org/neo4j/gds/projection/CypherAggregationTest.java

@@ -799,6 +799,62 @@ void testAlphaForwarding() {
         TestSupport.assertGraphEquals(g1, g2);
     }
 
+    @Test
+    void testAlphaForwardingWithMissingTargetConfigKeys() {
+        runQuery(
+            "MATCH (s:B)-[r:REL]-(t:B) " +
+                "RETURN gds.alpha.graph.project('g1', s, t," +
+                "  { sourceNodeLabels: labels(s)," +
+                "    targetNodeProperties: t { .prop1 } }," +
+                "  NULL," +
+                "  {}" +
+                ");"
+        );
+
+        runQuery(
+            "MATCH (s:B)-[r:REL]-(t:B) " +
+                "RETURN gds.graph.project('g2', s, t," +
+                "  { sourceNodeLabels: labels(s), targetNodeLabels: NULL," +
+                "    sourceNodeProperties: NULL, targetNodeProperties: t { .prop1 } }" +
+                ");"
+        );
+
+        assertThat(GraphStoreCatalog.exists("", db.databaseName(), "g1")).isTrue();
+        assertThat(GraphStoreCatalog.exists("", db.databaseName(), "g2")).isTrue();
+        var g1 = GraphStoreCatalog.get("", db.databaseName(), "g1").graphStore().getUnion();
+        var g2 = GraphStoreCatalog.get("", db.databaseName(), "g2").graphStore().getUnion();
+
+        TestSupport.assertGraphEquals(g1, g2);
+    }
+
+    @Test
+    void testAlphaForwardingWithMissingSourceConfigKeys() {
+        runQuery(
+            "MATCH (s:B)-[r:REL]-(t:B) " +
+                "RETURN gds.alpha.graph.project('g1', s, t," +
+                "  { targetNodeLabels: labels(s)," +
+                "    sourceNodeProperties: t { .prop1 } }," +
+                "  NULL," +
+                "  {}" +
+                ");"
+        );
+
+        runQuery(
+            "MATCH (s:B)-[r:REL]-(t:B) " +
+                "RETURN gds.graph.project('g2', s, t," +
+                "  { targetNodeLabels: labels(s), sourceNodeLabels: NULL," +
+                "    targetNodeProperties: NULL, sourceNodeProperties: t { .prop1 } }" +
+                ");"
+        );
+
+        assertThat(GraphStoreCatalog.exists("", db.databaseName(), "g1")).isTrue();
+        assertThat(GraphStoreCatalog.exists("", db.databaseName(), "g2")).isTrue();
+        var g1 = GraphStoreCatalog.get("", db.databaseName(), "g1").graphStore().getUnion();
+        var g2 = GraphStoreCatalog.get("", db.databaseName(), "g2").graphStore().getUnion();
+
+        TestSupport.assertGraphEquals(g1, g2);
+    }
+
     @ParameterizedTest
     @CsvSource({"42, Long", "13.37, Double"})
     void testInvalidLabel(String label, String type) {