[ESQL] Shortcircuit grouping aggs on null value

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

@@ -22,6 +22,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -411,10 +412,16 @@ private MethodSpec addRawInputLoop(TypeName groupsType, TypeName valuesType) {
 
         builder.beginControlFlow("for (int groupPosition = 0; groupPosition < groups.getPositionCount(); groupPosition++)");
         {
-            if (groupsIsBlock) {
-                builder.beginControlFlow("if (groups.isNull(groupPosition))");
+            if (groupsIsBlock || valuesIsBlock) {
+                String conditions = Stream.of(
+                    groupsIsBlock ? "groups.isNull(groupPosition)" : null,
+                    valuesIsBlock ? "values.isNull(groupPosition + positionOffset)" : null
+                ).filter(Objects::nonNull).collect(Collectors.joining(" || "));
+                builder.beginControlFlow("if (" + conditions + ")");
                 builder.addStatement("continue");
                 builder.endControlFlow();
+            }
+            if (groupsIsBlock) {
                 builder.addStatement("int groupStart = groups.getFirstValueIndex(groupPosition)");
                 builder.addStatement("int groupEnd = groupStart + groups.getValueCount(groupPosition)");
                 builder.beginControlFlow("for (int g = groupStart; g < groupEnd; g++)");
@@ -430,9 +437,6 @@ private MethodSpec addRawInputLoop(TypeName groupsType, TypeName valuesType) {
             }
 
             if (valuesIsBlock) {
-                builder.beginControlFlow("if (values.isNull(groupPosition + positionOffset))");
-                builder.addStatement("continue");
-                builder.endControlFlow();
                 builder.addStatement("int valuesStart = values.getFirstValueIndex(groupPosition + positionOffset)");
                 builder.addStatement("int valuesEnd = valuesStart + values.getValueCount(groupPosition + positionOffset)");
                 if (aggParam.isArray()) {