Move tupled version of GraphStore#relationshipPropertyKeys to call site

Co-authored-by: Mats Rydberg <[email protected]>
Co-authored-by: Jonatan Jäderberg <[email protected]>

Author: 3 people

compatibility/3.5/neo4j-export-adapter/src/main/java/org/neo4j/graphalgo/core/utils/export/GraphStoreInput.java

@@ -20,6 +20,7 @@
 package org.neo4j.graphalgo.core.utils.export;
 
 import org.eclipse.collections.api.tuple.Pair;
+import org.eclipse.collections.impl.tuple.Tuples;
 import org.neo4j.graphalgo.api.Graph;
 import org.neo4j.graphalgo.api.RelationshipIterator;
 import org.neo4j.graphalgo.core.loading.GraphStore;
@@ -42,6 +43,7 @@
 import java.util.Set;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class GraphStoreInput implements Input {
 
@@ -139,13 +141,17 @@ static class RelationshipImporter extends GraphImporter {
 
         RelationshipImporter(GraphStore graphStore, long nodeCount, int batchSize) {
             super(nodeCount, batchSize);
-            relationships = graphStore
-                .relationshipPropertyKeys()
-                .stream()
-                .collect(Collectors.toMap(
-                    relTypeAndProperty -> relTypeAndProperty,
-                    relTypeAndProperty -> graphStore.getGraph(relTypeAndProperty.getOne(), relTypeAndProperty.getTwo())
-                ));
+            relationships = graphStore.relationshipTypes().stream().flatMap(relType -> {
+                Set<String> relProperties = graphStore.relationshipPropertyKeys(relType);
+                if (relProperties.isEmpty()) {
+                    return Stream.of(Tuples.pair(relType, Optional.<String>empty()));
+                } else {
+                    return relProperties.stream().map(propertyKey -> Tuples.pair(relType, Optional.of(propertyKey)));
+                }
+            }).collect(Collectors.toMap(
+                relTypeAndProperty -> relTypeAndProperty,
+                relTypeAndProperty -> graphStore.getGraph(relTypeAndProperty.getOne(), relTypeAndProperty.getTwo())
+            ));
         }
 
         @Override

compatibility/4.0/neo4j-export-adapter/src/main/java/org/neo4j/graphalgo/core/utils/export/GraphStoreInput.java

@@ -20,6 +20,7 @@
 package org.neo4j.graphalgo.core.utils.export;
 
 import org.eclipse.collections.api.tuple.Pair;
+import org.eclipse.collections.impl.tuple.Tuples;
 import org.neo4j.graphalgo.api.Graph;
 import org.neo4j.graphalgo.api.RelationshipIterator;
 import org.neo4j.graphalgo.core.loading.GraphStore;
@@ -41,6 +42,7 @@
 import java.util.Set;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class GraphStoreInput implements Input {
 
@@ -139,13 +141,17 @@ static class RelationshipImporter extends GraphImporter {
 
         RelationshipImporter(GraphStore graphStore, long nodeCount, int batchSize) {
             super(nodeCount, batchSize);
-            relationships = graphStore
-                .relationshipPropertyKeys()
-                .stream()
-                .collect(Collectors.toMap(
-                    relTypeAndProperty -> relTypeAndProperty,
-                    relTypeAndProperty -> graphStore.getGraph(relTypeAndProperty.getOne(), relTypeAndProperty.getTwo())
-                ));
+            relationships = graphStore.relationshipTypes().stream().flatMap(relType -> {
+                Set<String> relProperties = graphStore.relationshipPropertyKeys(relType);
+                if (relProperties.isEmpty()) {
+                    return Stream.of(Tuples.pair(relType, Optional.<String>empty()));
+                } else {
+                    return relProperties.stream().map(propertyKey -> Tuples.pair(relType, Optional.of(propertyKey)));
+                }
+            }).collect(Collectors.toMap(
+                relTypeAndProperty -> relTypeAndProperty,
+                relTypeAndProperty -> graphStore.getGraph(relTypeAndProperty.getOne(), relTypeAndProperty.getTwo())
+            ));
         }
 
         @Override

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

@@ -20,8 +20,6 @@
 package org.neo4j.graphalgo.core.loading;
 
 import com.carrotsearch.hppc.BitSet;
-import org.eclipse.collections.api.tuple.Pair;
-import org.eclipse.collections.impl.tuple.Tuples;
 import org.neo4j.graphalgo.ElementIdentifier;
 import org.neo4j.graphalgo.api.Graph;
 import org.neo4j.graphalgo.api.IdMapping;
@@ -180,30 +178,16 @@ public long relationshipPropertyCount() {
             .sum();
     }
 
-    public Set<String> availableRelationshipPropertyKeys() {
+    public Set<String> relationshipPropertyKeys() {
         return relationshipProperties
             .values()
             .stream()
             .flatMap(properties -> properties.keySet().stream())
             .collect(Collectors.toSet());
     }
 
-    public Set<Pair<String, Optional<String>>> relationshipPropertyKeys() {
-        return this.relationshipTypes().stream().flatMap(relType -> {
-            if (relationshipProperties.containsKey(relType)) {
-                return relationshipProperties
-                    .get(relType)
-                    .keySet()
-                    .stream()
-                    .map(propertyKey -> Tuples.pair(relType, Optional.of(propertyKey)));
-            } else {
-                return Stream.of(Tuples.pair(relType, Optional.<String>empty()));
-            }
-        }).collect(Collectors.toSet());
-    }
-
     public Set<String> relationshipPropertyKeys(String relationshipType) {
-        return relationshipProperties.get(relationshipType).keySet();
+        return relationshipProperties.getOrDefault(relationshipType, Collections.emptyMap()).keySet();
     }
 
     public synchronized void addRelationshipType(String relationshipType, Optional<String> relationshipProperty, HugeGraph.Relationships relationships) {

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

@@ -286,7 +286,7 @@ private void validate(GraphStoreWithConfig graphStoreWithConfig, CONFIG config)
             }
         }
         if (config instanceof RelationshipWeightConfig) {
-            Set<String> properties = graphStore.availableRelationshipPropertyKeys();
+            Set<String> properties = graphStore.relationshipPropertyKeys();
 
             String weightProperty = ((RelationshipWeightConfig) config).relationshipWeightProperty();
             if (weightProperty != null && !properties.contains(weightProperty)) {