Fix double to long conversions

Author: soerenreichardt

proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphProjectSubgraphProcTest.java

@@ -45,7 +45,7 @@
 class GraphProjectSubgraphProcTest extends BaseProcTest {
 
     @Neo4jGraph
-    public static final String DB = "CREATE (a:A)-[:REL { weight: 42.0 }]->(b:B)";
+    public static final String DB = "CREATE (a:A { prop: 1337 })-[:REL { weight: 42.0 }]->(b:B { prop: 0 })";
 
     @BeforeEach
     void setup() throws Exception {
@@ -55,6 +55,7 @@ void setup() throws Exception {
             .graphProject()
             .withNodeLabel("A")
             .withNodeLabel("B")
+            .withNodeProperty("prop")
             .withRelationshipType("REL")
             .withRelationshipProperty("weight")
             .yields()
@@ -117,7 +118,7 @@ void executeProc() {
             "subgraph"
         ).graphStore();
 
-        assertGraphEquals(fromGdl("(:A)"), subgraphStore.getUnion());
+        assertGraphEquals(fromGdl("(:A { prop: 1337 })"), subgraphStore.getUnion());
     }
 
     @Test
@@ -185,4 +186,21 @@ void shouldResolveParameters(String operator, int expectedRelationships) {
         var graphStore = GraphStoreCatalog.get("", db.databaseId(), "subgraph").graphStore();
         assertThat(graphStore.relationshipCount()).isEqualTo(expectedRelationships);
     }
+
+    @ParameterizedTest
+    @CsvSource({
+        ">=, 2",
+        ">, 1"
+    })
+    void shouldResolveParametersWhenPassedAsConstants(String operator, int expectedNodes) {
+        var subGraphQuery = formatWithLocale(
+            "CALL gds.beta.graph.project.subgraph('subgraph', 'graph', 'n.prop %s $threshold', 'true', { parameters: { threshold: 0 } })",
+            operator
+        );
+
+        runQuery(subGraphQuery);
+
+        var graphStore = GraphStoreCatalog.get("", db.databaseId(), "subgraph").graphStore();
+        assertThat(graphStore.nodeCount()).isEqualTo(expectedNodes);
+    }
 }

subgraph-filtering/src/main/java/org/neo4j/gds/beta/filter/expression/EvaluationContext.java

@@ -38,8 +38,8 @@ protected EvaluationContext(Map<String, Object> parameterMap) {
         this.parameterMap = parameterMap;
     }
 
-    double resolveParameter(String parameterName) {
-        return ((Number) this.parameterMap.get(parameterName)).doubleValue();
+    Number resolveParameter(String parameterName) {
+        return (Number) this.parameterMap.get(parameterName);
     }
 
     abstract double getProperty(String propertyKey, ValueType propertyType);

subgraph-filtering/src/main/java/org/neo4j/gds/beta/filter/expression/Expression.java

@@ -205,10 +205,19 @@ interface NewParameter extends UnaryExpression {
             @Override
             LeafExpression.Variable in();
 
+            @Override
+            default ValueType valueType() {
+                return ValueType.UNKNOWN;
+            }
+
             @Value.Derived
             @Override
             default double evaluate(EvaluationContext context) {
-                return context.resolveParameter(in().name());
+                var resolvedParameter = context.resolveParameter(in().name());
+                if (resolvedParameter instanceof Long) {
+                    return resolvedParameter.longValue();
+                }
+                return resolvedParameter.doubleValue();
             }
 
             @Override
@@ -278,7 +287,10 @@ default double evaluate(EvaluationContext context) {
                 // It is sufficient to check one of the input types
                 // as validation made sure that the types are equal.
                 if (lhs().valueType() == ValueType.LONG) {
-                    return evaluateLong(Double.doubleToRawLongBits(lhsValue), Double.doubleToRawLongBits(rhsValue));
+                    long convertedRhsValue = rhs().valueType() == ValueType.UNKNOWN
+                        ? (long) rhsValue
+                        : Double.doubleToRawLongBits(rhsValue);
+                    return evaluateLong(Double.doubleToRawLongBits(lhsValue), convertedRhsValue);
                 }
 
                 return evaluateDouble(lhsValue, rhsValue);

subgraph-filtering/src/main/java/org/neo4j/gds/beta/filter/expression/GdsAstFactory.java

@@ -46,7 +46,7 @@ public Expression.LeafExpression.Variable newVariable(InputPosition p, String na
     public Expression newParameter(
         InputPosition p, Expression.LeafExpression.Variable v
     ) {
-        return ImmutableNewParameter.of(v.valueType(), v);
+        return ImmutableNewParameter.of(v);
     }
 
     @Override