fix after merges

Author: dnhatn

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

@@ -58,6 +58,7 @@
 import static org.elasticsearch.compute.gen.Types.INTERMEDIATE_STATE_DESC;
 import static org.elasticsearch.compute.gen.Types.INT_ARRAY_BLOCK;
 import static org.elasticsearch.compute.gen.Types.INT_BIG_ARRAY_BLOCK;
+import static org.elasticsearch.compute.gen.Types.INT_BLOCK;
 import static org.elasticsearch.compute.gen.Types.INT_VECTOR;
 import static org.elasticsearch.compute.gen.Types.LIST_AGG_FUNC_DESC;
 import static org.elasticsearch.compute.gen.Types.LIST_INTEGER;
@@ -615,7 +616,8 @@ private MethodSpec addIntermediateInput(TypeName groupsType) {
             requireName("combineIntermediate"),
             requireArgs(
                 Stream.concat(
-                    Stream.of(aggState.declaredType(), TypeName.INT, INT_VECTOR), // aggState, positionOffset, groupIds
+                    // aggState, positionOffset, groupIds
+                    Stream.of(aggState.declaredType(), TypeName.INT, groupsIsBlock ? INT_BLOCK : INT_VECTOR),
                     intermediateState.stream().map(AggregatorImplementer.IntermediateStateDesc::combineArgType)
                 ).map(Methods::requireType).toArray(Methods.TypeMatcher[]::new)
             )
@@ -626,7 +628,9 @@ private MethodSpec addIntermediateInput(TypeName groupsType) {
                 .collect(Collectors.joining(", "));
             builder.addStatement("$T.combineIntermediate(state, positionOffset, groups, " + states + ")", declarationType);
         } else {
-            if (intermediateState.stream().map(AggregatorImplementer.IntermediateStateDesc::elementType).anyMatch(n -> n.equals("BYTES_REF"))) {
+            if (intermediateState.stream()
+                .map(AggregatorImplementer.IntermediateStateDesc::elementType)
+                .anyMatch(n -> n.equals("BYTES_REF"))) {
                 builder.addStatement("$T scratch = new $T()", BYTES_REF, BYTES_REF);
             }
             builder.beginControlFlow("for (int groupPosition = 0; groupPosition < groups.getPositionCount(); groupPosition++)");

x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregator.java

@@ -222,4 +222,32 @@ static void combineIntermediateInputValues(
             }
         }
     }
+
+    static void combineIntermediateInputValues(
+        ValuesBytesRefAggregator.GroupingState state,
+        int positionOffset,
+        IntBlock groupIds,
+        BytesRefBlock values
+    ) {
+        final BytesRef scratch = new BytesRef();
+        for (int groupPosition = 0; groupPosition < groupIds.getPositionCount(); groupPosition++) {
+            if (groupIds.isNull(groupPosition)) {
+                continue;
+            }
+            int groupStart = groupIds.getFirstValueIndex(groupPosition);
+            int groupEnd = groupStart + groupIds.getValueCount(groupPosition);
+            for (int g = groupStart; g < groupEnd; g++) {
+                if (values.isNull(groupPosition + positionOffset)) {
+                    continue;
+                }
+                int groupId = groupIds.getInt(g);
+                int valuesStart = values.getFirstValueIndex(groupPosition + positionOffset);
+                int valuesEnd = valuesStart + values.getValueCount(groupPosition + positionOffset);
+                for (int v = valuesStart; v < valuesEnd; v++) {
+                    var bytes = values.getBytesRef(v, scratch);
+                    state.addValue(groupId, bytes);
+                }
+            }
+        }
+    }
 }

x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java

@@ -118,6 +118,10 @@ $if(BytesRef)$
         ValuesBytesRefAggregators.combineIntermediateInputValues(state, positionOffset, groups, values);
     }
 
+    public static void combineIntermediate(GroupingState state, int positionOffset, IntBlock groups, $Type$Block values) {
+        ValuesBytesRefAggregators.combineIntermediateInputValues(state, positionOffset, groups, values);
+    }
+
 $else$
     public static void combineIntermediate(GroupingState state, int groupId, $Type$Block values, int valuesPosition) {
         int start = values.getFirstValueIndex(valuesPosition);