Updating EvaluatorImplementer to add generated evaluators for MvContains

x-pack/plugin/esql/compute/ann/src/main/java/org/elasticsearch/compute/ann/Evaluator.java

@@ -42,4 +42,9 @@
      * into a warning and turn into a null value.
      */
     Class<? extends Exception>[] warnExceptions() default {};
+
+    /**
+     * if we evaluate to null if all blocks are null
+     */
+    boolean allNullsIsNull() default true;
 }

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorImplementer.java

@@ -51,13 +51,15 @@ public class EvaluatorImplementer {
     private final ProcessFunction processFunction;
     private final ClassName implementation;
     private final boolean processOutputsMultivalued;
+    private final boolean allNullsIsNull;
 
     public EvaluatorImplementer(
         Elements elements,
         javax.lang.model.util.Types types,
         ExecutableElement processFunction,
         String extraName,
-        List<TypeMirror> warnExceptions
+        List<TypeMirror> warnExceptions,
+        boolean allNullsIsNull
     ) {
         this.declarationType = (TypeElement) processFunction.getEnclosingElement();
         this.processFunction = new ProcessFunction(types, processFunction, warnExceptions);
@@ -66,7 +68,8 @@ public EvaluatorImplementer(
             elements.getPackageOf(declarationType).toString(),
             declarationType.getSimpleName() + extraName + "Evaluator"
         );
-        this.processOutputsMultivalued = this.processFunction.hasBlockType && (this.processFunction.builderArg != null);
+        this.processOutputsMultivalued = this.processFunction.hasBlockType;
+        this.allNullsIsNull = allNullsIsNull;
     }
 
     public JavaFile sourceFile() {
@@ -199,7 +202,7 @@ private MethodSpec realEval(boolean blockStyle) {
 
             builder.beginControlFlow("position: for (int p = 0; p < positionCount; p++)");
             {
-                if (blockStyle) {
+                if (blockStyle && allNullsIsNull) {
                     if (processOutputsMultivalued == false) {
                         processFunction.args.stream().forEach(a -> a.skipNull(builder));
                     } else {
@@ -223,15 +226,21 @@ private MethodSpec realEval(boolean blockStyle) {
                 args.add(declarationType);
                 args.add(processFunction.function.getSimpleName());
                 processFunction.args.stream().forEach(a -> {
-                    if (args.size() > 2) {
+                    if (pattern.subSequence(pattern.length() - 1, pattern.length()).equals("(") == false) {
                         pattern.append(", ");
                     }
                     a.buildInvocation(pattern, args, blockStyle);
                 });
                 pattern.append(")");
                 String builtPattern;
                 if (processFunction.builderArg == null) {
-                    builtPattern = vectorize ? "result.$L(p, " + pattern + ")" : "result.$L(" + pattern + ")";
+                    if (vectorize) {
+                        builtPattern = "result.$L(p, " + pattern + ")";
+                    } else if (processOutputsMultivalued) {
+                        builtPattern = "result.beginPositionEntry().$L(" + pattern + ").endPositionEntry()";
+                    } else {
+                        builtPattern = "result.$L(" + pattern + ")";
+                    }
                     args.add(0, processFunction.appendMethod());
                 } else {
                     builtPattern = pattern.toString();

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java

@@ -82,7 +82,8 @@ public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnv
                                 env.getTypeUtils(),
                                 (ExecutableElement) evaluatorMethod,
                                 evaluatorAnn.extraName(),
-                                warnExceptionsTypes
+                                warnExceptionsTypes,
+                                evaluatorAnn.allNullsIsNull()
                             ).sourceFile(),
                             env
                         );