Merge pull request #6412 from knutwalker/cypher-agg-faster

Lower abstraction for CypherAggregation

Author: knutwalker

annotations/src/main/java/org/neo4j/gds/core/ConfigKeyValidation.java

@@ -32,9 +32,14 @@ public final class ConfigKeyValidation {
 
     private ConfigKeyValidation() {}
 
-    public static void requireOnlyKeysFrom(Collection<String> allowedKeys, Collection<String> configKeys) {
+    public static void requireOnlyKeysFrom(Collection<String> allowedKeys, Iterable<String> configKeys) {
         var unexpectedKeys = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-        unexpectedKeys.addAll(configKeys);
+        if (configKeys instanceof Collection<?>) {
+            unexpectedKeys.addAll((Collection<String>) configKeys);
+        } else {
+            configKeys.forEach(unexpectedKeys::add);
+        }
+
 
         // We are doing the equivalent of `removeAll` here.
         // As of jdk16, TreeSet does not have a specialized removeAll implementation and reverts to use
@@ -54,15 +59,25 @@ public static void requireOnlyKeysFrom(Collection<String> allowedKeys, Collectio
         List<String> suggestions = unexpectedKeys.stream()
             .map(invalid -> {
                 List<String> candidates = StringSimilarity.similarStringsIgnoreCase(invalid, allowedKeys);
-                candidates.removeAll(configKeys);
+                if (configKeys instanceof Collection<?>) {
+                    candidates.removeAll((Collection<String>) configKeys);
+                } else {
+                    configKeys.forEach(candidates::remove);
+                }
+
 
                 if (candidates.isEmpty()) {
                     return invalid;
                 }
                 if (candidates.size() == 1) {
                     return String.format(Locale.ENGLISH, "%s (Did you mean [%s]?)", invalid, candidates.get(0));
                 }
-                return String.format(Locale.ENGLISH, "%s (Did you mean one of [%s]?)", invalid, String.join(", ", candidates));
+                return String.format(
+                    Locale.ENGLISH,
+                    "%s (Did you mean one of [%s]?)",
+                    invalid,
+                    String.join(", ", candidates)
+                );
             })
             .collect(Collectors.toList());
 

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

@@ -21,7 +21,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.neo4j.gds.api.nodeproperties.ValueType;
-import org.neo4j.kernel.impl.util.ValueUtils;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.storable.ArrayValue;
 import org.neo4j.values.storable.DoubleArray;
@@ -59,10 +58,6 @@ public static ValueType valueType(Value value) {
         }
     }
 
-    public static Value toValue(@NotNull Object valueObject) {
-        return toValue(ValueUtils.of(valueObject));
-    }
-
     public static Value toValue(@NotNull AnyValue value) {
         if (value.isSequenceValue()) {
             return castToNumericArrayOrFail(value);

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

@@ -19,7 +19,9 @@
  */
 package org.neo4j.gds.core.loading.construction;
 
+import org.neo4j.gds.core.loading.ValueConverter;
 import org.neo4j.values.storable.Value;
+import org.neo4j.values.storable.Values;
 import org.neo4j.values.virtual.MapValue;
 
 import java.util.Map;
@@ -67,8 +69,8 @@ private CypherPropertyValues(MapValue properties) {
         @Override
         public void forEach(BiConsumer<String, Value> consumer) {
             this.properties.foreach((k, v) -> {
-                if (v instanceof Value) {
-                    consumer.accept(k, (Value) v);
+                if (v != Values.NO_VALUE) {
+                    consumer.accept(k, ValueConverter.toValue(v));
                 }
             });
         }

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.projection;
+
+import org.neo4j.values.ValueMapper;
+import org.neo4j.values.virtual.VirtualNodeValue;
+import org.neo4j.values.virtual.VirtualPathValue;
+import org.neo4j.values.virtual.VirtualRelationshipValue;
+
+public final class AsJavaObject extends ValueMapper.JavaMapper {
+
+    private static final AsJavaObject INSTANCE = new AsJavaObject();
+
+    public static AsJavaObject instance() {
+        return INSTANCE;
+    }
+
+    private AsJavaObject() {
+    }
+
+    public Object mapPath(VirtualPathValue value) {
+        throw new UnsupportedOperationException("Cannot map paths to Java object");
+    }
+
+    public Object mapNode(VirtualNodeValue value) {
+        throw new UnsupportedOperationException("Cannot map nodes to Java object");
+    }
+
+    public Object mapRelationship(VirtualRelationshipValue value) {
+        throw new UnsupportedOperationException("Cannot map relationships to Java object");
+    }
+}