ESQL: Remove extra block calls in evaluators and aggregators

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

@@ -428,7 +428,8 @@ private MethodSpec addRawBlock(boolean masked) {
                 builder.beginControlFlow("if (mask.getBoolean(p) == false)").addStatement("continue").endControlFlow();
             }
             for (AggregationParameter p : aggParams) {
-                builder.beginControlFlow("if ($L.isNull(p))", p.blockName());
+                builder.addStatement("int $LValueCount = $L.getValueCount(p)", p.name(), p.blockName());
+                builder.beginControlFlow("if ($LValueCount == 0)", p.name());
                 builder.addStatement("continue");
                 builder.endControlFlow();
             }
@@ -447,7 +448,7 @@ private MethodSpec addRawBlock(boolean masked) {
                 }
                 for (AggregationParameter p : aggParams) {
                     builder.addStatement("int $L = $L.getFirstValueIndex(p)", p.startName(), p.blockName());
-                    builder.addStatement("int $L = $L + $L.getValueCount(p)", p.endName(), p.startName(), p.blockName());
+                    builder.addStatement("int $L = $L + $LValueCount", p.endName(), p.startName(), p.name());
                     builder.beginControlFlow(
                         "for (int $L = $L; $L < $L; $L++)",
                         p.offsetName(),

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

@@ -148,25 +148,23 @@ public void sumBaseRamBytesUsed(MethodSpec.Builder builder) {
     }
 
     static void skipNull(MethodSpec.Builder builder, String value) {
-        builder.beginControlFlow("if ($N.isNull(p))", value);
+        builder.beginControlFlow("switch ($N.getValueCount(p))", value);
         {
-            builder.addStatement("result.appendNull()");
-            builder.addStatement("continue position");
-        }
-        builder.endControlFlow();
-        builder.beginControlFlow("if ($N.getValueCount(p) != 1)", value);
-        {
-            builder.beginControlFlow("if ($N.getValueCount(p) > 1)", value);
-            {
-                builder.addStatement(
-                    // TODO: reflection on SingleValueQuery.MULTI_VALUE_WARNING?
-                    "warnings().registerException(new $T(\"single-value function encountered multi-value\"))",
-                    IllegalArgumentException.class
-                );
-            }
-            builder.endControlFlow();
-            builder.addStatement("result.appendNull()");
-            builder.addStatement("continue position");
+            builder.addCode("case 0:\n");
+            builder.addStatement("    result.appendNull()");
+            builder.addStatement("    continue position");
+
+            builder.addCode("case 1:\n");
+            builder.addStatement("    break");
+
+            builder.addCode("default:\n");
+            builder.addStatement(
+                // TODO: try to use SingleValueQuery.MULTI_VALUE_WARNING?
+                "    warnings().registerException(new $T(\"single-value function encountered multi-value\"))",
+                IllegalArgumentException.class
+            );
+            builder.addStatement("    result.appendNull()");
+            builder.addStatement("    continue position");
         }
         builder.endControlFlow();
     }