Fix script translation

Author: elasticsearchmachine

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/Hamming.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.expression.function.scalar.BinaryScalarFunction;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
@@ -21,6 +22,7 @@
 import org.elasticsearch.xpack.esql.expression.function.Param;
 
 import java.io.IOException;
+import java.util.List;
 
 public class Hamming extends VectorSimilarityFunction {
 
@@ -90,4 +92,14 @@ public static float calculateSimilarity(float[] leftScratch, float[] rightScratc
     protected String scriptFunctionName() {
         return "hamming";
     }
+
+    @Override
+    protected String queryVectorAsScript(Expression queryVector) {
+        // Need to convert to bytes so the appropriate method is called from script
+        @SuppressWarnings("unchecked")
+        List<Number> vector = (List<Number>) ((Literal) queryVector).value();
+        List<Integer> intList = vector.stream().map(Number::intValue).toList();
+
+        return intList.toString();
+    }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/Magnitude.java

@@ -18,6 +18,7 @@
 import org.elasticsearch.compute.operator.DriverContext;
 import org.elasticsearch.compute.operator.EvalOperator;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
 import org.elasticsearch.xpack.esql.core.expression.FoldContext;
 import org.elasticsearch.xpack.esql.core.expression.TypeResolutions;
 import org.elasticsearch.xpack.esql.core.expression.function.scalar.UnaryScalarFunction;
@@ -134,7 +135,12 @@ public String toString() {
 
     @Override
     public PushableOptions pushableOptions() {
-        return PushableOptions.PREFERRED;
+        return field() instanceof FieldAttribute ? PushableOptions.PREFERRED : PushableOptions.NOT_SUPPORTED;
+    }
+
+    @Override
+    public String asScript() {
+        return "doc['" + ((FieldAttribute) field()).name() + "'].magnitude";
     }
 
     private record ScalarEvaluator(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/VectorSimilarityFunction.java

@@ -89,15 +89,19 @@ public PushableOptions pushableOptions() {
         // Can only push if one of the arguments is a literal, and the other a field name
         return left().foldable() && left().dataType() != NULL && right() instanceof FieldAttribute
             || right().foldable() && right().dataType() != NULL && left() instanceof FieldAttribute
-            ? PushableOptions.PREFERRED
-            : PushableOptions.NOT_SUPPORTED;
+                ? PushableOptions.PREFERRED
+                : PushableOptions.NOT_SUPPORTED;
     }
 
     @Override
     public final String asScript() {
-        String queryVector = left().foldable() ? left().asScript() : right().asScript();
-        String fieldName = left().foldable() ? ((FieldAttribute) right()).name() : ((FieldAttribute) left()).name();
-        return "return doc['" + fieldName + "'].size() == 0 ? 0 : " + scriptFunctionName() + "(" + queryVector + ", '" + fieldName + "')";
+        String queryVector = left().foldable() ? queryVectorAsScript(left()) : queryVectorAsScript(right());
+        String fieldName = ((FieldAttribute) (left().foldable() ? right() : left())).name();
+        return "doc['" + fieldName + "'].size() == 0 ? 0 : " + scriptFunctionName() + "(" + queryVector + ", '" + fieldName + "')";
+    }
+
+    protected String queryVectorAsScript(Expression queryVector) {
+        return queryVector.asScript();
     }
 
     protected abstract String scriptFunctionName();

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/PushTopNToSource.java

@@ -220,7 +220,7 @@ && canPushLimit(topNExec, plannerSettings)) {
                             Alias expressionAlias = (Alias) pushableExpressions.get(resolvedAttribute.id());
 
                             // Create a script from the expression
-                            String scriptText = expressionAlias.child().asScript();
+                            String scriptText = "return " + expressionAlias.child().asScript();
                             Script script = new Script(scriptText);
 
                             // Create a script sort that computes the value