Merge pull request #1424 from jjaderberg/is-multi-graph-fix

Fix isMultiGraph check in two places

Author: DarthMax

core/src/main/java/org/neo4j/graphalgo/core/loading/HugeGraphUtil.java

@@ -248,7 +248,7 @@ public HugeGraph.Relationships build() {
             return HugeGraph.Relationships.of(
                 importedRelationships,
                 orientation,
-                !Aggregation.equivalentToNone(aggregation),
+                Aggregation.equivalentToNone(aggregation),
                 relationshipsBuilder.adjacencyList(),
                 relationshipsBuilder.globalAdjacencyOffsets(),
                 loadRelationshipProperty ? relationshipsBuilder.properties() : null,

proc/common/src/main/java/org/neo4j/graphalgo/AlgoBaseProc.java

@@ -356,7 +356,7 @@ protected void warnOnGraphWithParallelRelationships(GraphCreateConfig graphCreat
             storeConfig.relationshipProjections().projections().entrySet().stream()
                 .filter(entry -> config.relationshipTypes().equals(Collections.singletonList(PROJECT_ALL)) ||
                                  config.relationshipTypes().contains(entry.getKey().name()))
-                .filter(entry -> !entry.getValue().isMultiGraph())
+                .filter(entry -> entry.getValue().isMultiGraph())
                 .forEach(entry -> log.warn(
                     "Procedure runs optimal with relationship aggregation." +
                     " Projection for `%s` does not aggregate relationships." +

proc/community/src/test/java/org/neo4j/graphalgo/triangle/LocalClusteringCoefficientBaseProcTest.java

@@ -39,6 +39,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.neo4j.graphalgo.config.GraphCreateFromCypherConfig.ALL_RELATIONSHIPS_UNDIRECTED_QUERY;
 import static org.neo4j.graphalgo.config.GraphCreateFromStoreConfig.RELATIONSHIP_PROJECTION_KEY;
@@ -148,7 +149,14 @@ public String seedPropertyKeyOverride() {
     @Test
     void warnOnNoneAggregatedGraph() {
         var graphName = "nonagg";
-        runQuery("CALL gds.graph.create($graphName, '*', '*')", Map.of("graphName", graphName));
+        runQuery("CALL gds.graph.create(" +
+                 " $graphName," +
+                 " '*', {" +
+                 "    ALL: {" +
+                 "        type: '*'," +
+                 "        orientation: 'UNDIRECTED'" +
+                 "    }" +
+                 " })", Map.of("graphName", graphName));
 
         CypherMapWrapper config = createMinimalConfig(CypherMapWrapper.empty());
 
@@ -160,18 +168,17 @@ void warnOnNoneAggregatedGraph() {
                 .filter(procMethod -> !getProcedureMethodName(procMethod).endsWith(".estimate"))
                 .forEach(noneEstimateMethod -> {
                     try {
-                        noneEstimateMethod.invoke(proc, "g", config.toMap());
+                        noneEstimateMethod.invoke(proc, "nonagg", config.toMap());
                     } catch (IllegalAccessException | InvocationTargetException e) {
                         fail(e);
                     }
                 });
         });
 
-        testLog.containsMessage(
-            "warn",
-            "Procedure runs optimal with relationship aggregation. " +
-            "Projection for `*` does not aggregate relationships. " +
-            "You might experience a slowdown in the procedure execution."
-        );
+        String expected = "Procedure runs optimal with relationship aggregation. " +
+                          "Projection for `ALL` does not aggregate relationships. " +
+                          "You might experience a slowdown in the procedure execution.";
+        String actual = testLog.getMessages("warn").get(0);
+        assertEquals(expected, actual);
     }
 }

test-utils/src/main/java/org/neo4j/graphalgo/TestGraph.java

@@ -104,7 +104,7 @@ public boolean isUndirected() {
 
     @Override
     public boolean isMultiGraph() {
-        return false;
+        return true;
     }
 
     @Override