diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java index b82ea84cd0766..042de44d7ebe3 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java @@ -207,7 +207,6 @@ private TypeSpec type() { } builder.addMethod(selectedMayContainUnseenGroups()); builder.addMethod(addIntermediateInput()); - builder.addMethod(addIntermediateRowInput()); builder.addMethod(evaluateIntermediate()); builder.addMethod(evaluateFinal()); builder.addMethod(toStringMethod()); @@ -670,38 +669,6 @@ private MethodSpec addIntermediateInput() { return builder.build(); } - private MethodSpec addIntermediateRowInput() { - MethodSpec.Builder builder = MethodSpec.methodBuilder("addIntermediateRowInput"); - builder.addAnnotation(Override.class).addModifiers(Modifier.PUBLIC); - builder.addParameter(int.class, "groupId").addParameter(GROUPING_AGGREGATOR_FUNCTION, "input").addParameter(int.class, "position"); - builder.beginControlFlow("if (input.getClass() != getClass())"); - { - builder.addStatement("throw new IllegalArgumentException($S + getClass() + $S + input.getClass())", "expected ", "; got "); - } - builder.endControlFlow(); - builder.addStatement("$T inState = (($T) input).state", aggState.type(), implementation); - builder.addStatement("state.enableGroupIdTracking(new $T.Empty())", SEEN_GROUP_IDS); - if (aggState.declaredType().isPrimitive()) { - builder.beginControlFlow("if (inState.hasValue(position))"); - builder.addStatement("state.set(groupId, $T.combine(state.getOrDefault(groupId), inState.get(position)))", declarationType); - builder.endControlFlow(); - } else { - requireStaticMethod( - declarationType, - requireVoidType(), - requireName("combineStates"), - requireArgs( - requireType(aggState.declaredType()), - requireType(TypeName.INT), - requireType(aggState.declaredType()), - requireType(TypeName.INT) - ) - ); - builder.addStatement("$T.combineStates(state, groupId, inState, position)", declarationType); - } - return builder.build(); - } - private MethodSpec evaluateIntermediate() { MethodSpec.Builder builder = MethodSpec.methodBuilder("evaluateIntermediate"); builder.addAnnotation(Override.class) diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleAggregator.java index 50b00c998a8af..3c3ca7f6cb2d9 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleAggregator.java @@ -56,14 +56,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeFloatAggregator.java index 69ad3c6eb3db5..407c6f9d2ff6d 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeFloatAggregator.java @@ -56,14 +56,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeIntAggregator.java index 134af879b1d04..d006907f1800e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeIntAggregator.java @@ -56,14 +56,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeLongAggregator.java index b052f43e3aff4..62f9a46ef9ed7 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/FirstOverTimeLongAggregator.java @@ -54,14 +54,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java index 77aafed555519..91373a508784c 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeDoubleAggregator.java @@ -56,14 +56,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java index d55cbfc09dc12..4bb863ad6474f 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeFloatAggregator.java @@ -56,14 +56,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeIntAggregator.java index 5ea8cc7f27bd7..ee2cc6f3049b2 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeIntAggregator.java @@ -56,14 +56,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeLongAggregator.java index 781c52a627649..d32144ef1fc19 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/LastOverTimeLongAggregator.java @@ -54,14 +54,6 @@ public static void combineIntermediate( } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateDoubleAggregator.java index 15d4c0b060440..92f8886712d35 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateDoubleAggregator.java @@ -24,8 +24,6 @@ import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; -import java.util.Arrays; - /** * A rate grouping aggregation definition for double. * This class is generated. Edit `X-RateAggregator.java.st` instead. @@ -60,15 +58,6 @@ public static void combineIntermediate( current.combine(groupId, timestamps, values, sampleCount, reset, otherPosition); } - public static void combineStates( - DoubleRateGroupingState current, - int currentGroupId, // make the stylecheck happy - DoubleRateGroupingState otherState, - int otherGroupId - ) { - current.combineState(currentGroupId, otherState, otherGroupId); - } - public static Block evaluateFinal(DoubleRateGroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } @@ -217,25 +206,6 @@ void merge(DoubleRateState curr, DoubleRateState dst, int firstIndex, int rightC } } - void combineState(int groupId, DoubleRateGroupingState otherState, int otherGroupId) { - var other = otherGroupId < otherState.states.size() ? otherState.states.get(otherGroupId) : null; - if (other == null) { - return; - } - ensureCapacity(groupId); - var curr = states.get(groupId); - if (curr == null) { - var len = other.entries(); - adjustBreaker(DoubleRateState.bytesUsed(len)); - curr = new DoubleRateState(Arrays.copyOf(other.timestamps, len), Arrays.copyOf(other.values, len)); - curr.reset = other.reset; - curr.sampleCount = other.sampleCount; - states.set(groupId, curr); - } else { - states.set(groupId, mergeState(curr, other)); - } - } - DoubleRateState mergeState(DoubleRateState s1, DoubleRateState s2) { var newLen = s1.entries() + s2.entries(); adjustBreaker(DoubleRateState.bytesUsed(newLen)); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateFloatAggregator.java index f19b4a91596eb..eb8d6a194e6e5 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateFloatAggregator.java @@ -25,8 +25,6 @@ import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; -import java.util.Arrays; - /** * A rate grouping aggregation definition for float. * This class is generated. Edit `X-RateAggregator.java.st` instead. @@ -61,15 +59,6 @@ public static void combineIntermediate( current.combine(groupId, timestamps, values, sampleCount, reset, otherPosition); } - public static void combineStates( - FloatRateGroupingState current, - int currentGroupId, // make the stylecheck happy - FloatRateGroupingState otherState, - int otherGroupId - ) { - current.combineState(currentGroupId, otherState, otherGroupId); - } - public static Block evaluateFinal(FloatRateGroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } @@ -218,25 +207,6 @@ void merge(FloatRateState curr, FloatRateState dst, int firstIndex, int rightCou } } - void combineState(int groupId, FloatRateGroupingState otherState, int otherGroupId) { - var other = otherGroupId < otherState.states.size() ? otherState.states.get(otherGroupId) : null; - if (other == null) { - return; - } - ensureCapacity(groupId); - var curr = states.get(groupId); - if (curr == null) { - var len = other.entries(); - adjustBreaker(FloatRateState.bytesUsed(len)); - curr = new FloatRateState(Arrays.copyOf(other.timestamps, len), Arrays.copyOf(other.values, len)); - curr.reset = other.reset; - curr.sampleCount = other.sampleCount; - states.set(groupId, curr); - } else { - states.set(groupId, mergeState(curr, other)); - } - } - FloatRateState mergeState(FloatRateState s1, FloatRateState s2) { var newLen = s1.entries() + s2.entries(); adjustBreaker(FloatRateState.bytesUsed(newLen)); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateIntAggregator.java index fcb744720a3db..fdacd473264a6 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateIntAggregator.java @@ -25,8 +25,6 @@ import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; -import java.util.Arrays; - /** * A rate grouping aggregation definition for int. * This class is generated. Edit `X-RateAggregator.java.st` instead. @@ -61,15 +59,6 @@ public static void combineIntermediate( current.combine(groupId, timestamps, values, sampleCount, reset, otherPosition); } - public static void combineStates( - IntRateGroupingState current, - int currentGroupId, // make the stylecheck happy - IntRateGroupingState otherState, - int otherGroupId - ) { - current.combineState(currentGroupId, otherState, otherGroupId); - } - public static Block evaluateFinal(IntRateGroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } @@ -218,25 +207,6 @@ void merge(IntRateState curr, IntRateState dst, int firstIndex, int rightCount, } } - void combineState(int groupId, IntRateGroupingState otherState, int otherGroupId) { - var other = otherGroupId < otherState.states.size() ? otherState.states.get(otherGroupId) : null; - if (other == null) { - return; - } - ensureCapacity(groupId); - var curr = states.get(groupId); - if (curr == null) { - var len = other.entries(); - adjustBreaker(IntRateState.bytesUsed(len)); - curr = new IntRateState(Arrays.copyOf(other.timestamps, len), Arrays.copyOf(other.values, len)); - curr.reset = other.reset; - curr.sampleCount = other.sampleCount; - states.set(groupId, curr); - } else { - states.set(groupId, mergeState(curr, other)); - } - } - IntRateState mergeState(IntRateState s1, IntRateState s2) { var newLen = s1.entries() + s2.entries(); adjustBreaker(IntRateState.bytesUsed(newLen)); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateLongAggregator.java index 39eba21a7be7d..ea9f7802656fb 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/RateLongAggregator.java @@ -24,8 +24,6 @@ import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; -import java.util.Arrays; - /** * A rate grouping aggregation definition for long. * This class is generated. Edit `X-RateAggregator.java.st` instead. @@ -60,15 +58,6 @@ public static void combineIntermediate( current.combine(groupId, timestamps, values, sampleCount, reset, otherPosition); } - public static void combineStates( - LongRateGroupingState current, - int currentGroupId, // make the stylecheck happy - LongRateGroupingState otherState, - int otherGroupId - ) { - current.combineState(currentGroupId, otherState, otherGroupId); - } - public static Block evaluateFinal(LongRateGroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } @@ -217,25 +206,6 @@ void merge(LongRateState curr, LongRateState dst, int firstIndex, int rightCount } } - void combineState(int groupId, LongRateGroupingState otherState, int otherGroupId) { - var other = otherGroupId < otherState.states.size() ? otherState.states.get(otherGroupId) : null; - if (other == null) { - return; - } - ensureCapacity(groupId); - var curr = states.get(groupId); - if (curr == null) { - var len = other.entries(); - adjustBreaker(LongRateState.bytesUsed(len)); - curr = new LongRateState(Arrays.copyOf(other.timestamps, len), Arrays.copyOf(other.values, len)); - curr.reset = other.reset; - curr.sampleCount = other.sampleCount; - states.set(groupId, curr); - } else { - states.set(groupId, mergeState(curr, other)); - } - } - LongRateState mergeState(LongRateState s1, LongRateState s2) { var newLen = s1.entries() + s2.entries(); adjustBreaker(LongRateState.bytesUsed(newLen)); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBooleanAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBooleanAggregator.java index 7ef2b2c52f685..6017256910e44 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBooleanAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBooleanAggregator.java @@ -84,10 +84,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return stripWeights(driverContext, state.toBlock(driverContext.blockFactory(), selected)); } @@ -150,10 +146,6 @@ public void add(int groupId, boolean value) { bytesRefBuilder.clear(); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -185,10 +177,6 @@ public void add(boolean value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBytesRefAggregator.java index c9e42350dd060..2917efbff7ad1 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBytesRefAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleBytesRefAggregator.java @@ -84,10 +84,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return stripWeights(driverContext, state.toBlock(driverContext.blockFactory(), selected)); } @@ -150,10 +146,6 @@ public void add(int groupId, BytesRef value) { bytesRefBuilder.clear(); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -185,10 +177,6 @@ public void add(BytesRef value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleDoubleAggregator.java index f526c54c6ddff..14578b7c2c15d 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleDoubleAggregator.java @@ -84,10 +84,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return stripWeights(driverContext, state.toBlock(driverContext.blockFactory(), selected)); } @@ -150,10 +146,6 @@ public void add(int groupId, double value) { bytesRefBuilder.clear(); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -185,10 +177,6 @@ public void add(double value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleIntAggregator.java index d6172006e46df..6d25d4005f100 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleIntAggregator.java @@ -84,10 +84,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return stripWeights(driverContext, state.toBlock(driverContext.blockFactory(), selected)); } @@ -150,10 +146,6 @@ public void add(int groupId, int value) { bytesRefBuilder.clear(); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -185,10 +177,6 @@ public void add(int value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleLongAggregator.java index cd97db7155d58..680b513f5d01b 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/SampleLongAggregator.java @@ -84,10 +84,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return stripWeights(driverContext, state.toBlock(driverContext.blockFactory(), selected)); } @@ -150,10 +146,6 @@ public void add(int groupId, long value) { bytesRefBuilder.clear(); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -185,10 +177,6 @@ public void add(long value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevDoubleAggregator.java index 3a1185d34fa23..cb2550d1ce726 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevDoubleAggregator.java @@ -52,10 +52,6 @@ public static void combine(StdDevStates.GroupingState current, int groupId, doub current.add(groupId, value); } - public static void combineStates(StdDevStates.GroupingState current, int groupId, StdDevStates.GroupingState state, int statePosition) { - current.combine(groupId, state.getOrNull(statePosition)); - } - public static void combineIntermediate(StdDevStates.GroupingState state, int groupId, double mean, double m2, long count) { state.combine(groupId, mean, m2, count); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevFloatAggregator.java index 51c22e7e29c1e..8ac7a21817abe 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevFloatAggregator.java @@ -52,10 +52,6 @@ public static void combine(StdDevStates.GroupingState current, int groupId, floa current.add(groupId, value); } - public static void combineStates(StdDevStates.GroupingState current, int groupId, StdDevStates.GroupingState state, int statePosition) { - current.combine(groupId, state.getOrNull(statePosition)); - } - public static void combineIntermediate(StdDevStates.GroupingState state, int groupId, double mean, double m2, long count) { state.combine(groupId, mean, m2, count); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevIntAggregator.java index 24eae35cb3249..991382560269a 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevIntAggregator.java @@ -52,10 +52,6 @@ public static void combine(StdDevStates.GroupingState current, int groupId, int current.add(groupId, value); } - public static void combineStates(StdDevStates.GroupingState current, int groupId, StdDevStates.GroupingState state, int statePosition) { - current.combine(groupId, state.getOrNull(statePosition)); - } - public static void combineIntermediate(StdDevStates.GroupingState state, int groupId, double mean, double m2, long count) { state.combine(groupId, mean, m2, count); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevLongAggregator.java index 888ace30a0c8e..5df0e5ae061a4 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/StdDevLongAggregator.java @@ -52,10 +52,6 @@ public static void combine(StdDevStates.GroupingState current, int groupId, long current.add(groupId, value); } - public static void combineStates(StdDevStates.GroupingState current, int groupId, StdDevStates.GroupingState state, int statePosition) { - current.combine(groupId, state.getOrNull(statePosition)); - } - public static void combineIntermediate(StdDevStates.GroupingState state, int groupId, double mean, double m2, long count) { state.combine(groupId, mean, m2, count); } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBooleanAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBooleanAggregator.java index a2e86b3b09340..1b683b99c9df5 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBooleanAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBooleanAggregator.java @@ -65,10 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, Boolean } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -84,10 +80,6 @@ public void add(int groupId, boolean value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -119,10 +111,6 @@ public void add(boolean value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBytesRefAggregator.java index 0a965899c0775..5ec303500451a 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBytesRefAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopBytesRefAggregator.java @@ -69,10 +69,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -90,10 +86,6 @@ public void add(int groupId, BytesRef value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -125,10 +117,6 @@ public void add(BytesRef value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopDoubleAggregator.java index 6a20ed99bc236..ac833dee81922 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopDoubleAggregator.java @@ -65,10 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, DoubleB } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -84,10 +80,6 @@ public void add(int groupId, double value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -119,10 +111,6 @@ public void add(double value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopFloatAggregator.java index cf6ad0f9017de..50e652d0af6f0 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopFloatAggregator.java @@ -65,10 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, FloatBl } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -84,10 +80,6 @@ public void add(int groupId, float value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -119,10 +111,6 @@ public void add(float value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIntAggregator.java index f4ac83c438063..d0d93b2d971f5 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIntAggregator.java @@ -65,10 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, IntBloc } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -84,10 +80,6 @@ public void add(int groupId, int value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -119,10 +111,6 @@ public void add(int value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIpAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIpAggregator.java index 292dd539edeb5..16a26c5f01f52 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIpAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopIpAggregator.java @@ -68,10 +68,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -87,10 +83,6 @@ public void add(int groupId, BytesRef value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -122,10 +114,6 @@ public void add(BytesRef value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopLongAggregator.java index c5af92956bec1..754a4e513eaab 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/TopLongAggregator.java @@ -65,10 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, LongBlo } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -84,10 +80,6 @@ public void add(int groupId, long value) { sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -119,10 +111,6 @@ public void add(long value) { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregator.java index cb0dff8a86dc5..337c8cde768f9 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregator.java @@ -89,19 +89,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - if (statePosition > state.maxGroupId) { - return; - } - var sorted = state.sortedForOrdinalMerging(current); - var start = statePosition > 0 ? sorted.counts[statePosition - 1] : 0; - var end = sorted.counts[statePosition]; - for (int i = start; i < end; i++) { - int id = sorted.ids[i]; - current.addValueOrdinal(currentGroupId, id); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -148,8 +135,6 @@ public void close() { * and then use it to iterate over the values in order. * * @param ids positions of the {@link GroupingState#values} to read. - * If built from {@link GroupingState#sortedForOrdinalMerging(GroupingState)}, - * these are ordinals referring to the {@link GroupingState#bytes} in the target state. */ private record Sorted(Releasable releasable, int[] counts, int[] ids) implements Releasable { @Override @@ -171,8 +156,6 @@ public static class GroupingState implements GroupingAggregatorState { private final LongLongHash values; BytesRefHash bytes; - private Sorted sortedForOrdinalMerging = null; - private GroupingState(DriverContext driverContext) { this.blockFactory = driverContext.blockFactory(); LongLongHash _values = null; @@ -312,34 +295,6 @@ private Sorted buildSorted(IntVector selected) { } } - private Sorted sortedForOrdinalMerging(GroupingState other) { - if (sortedForOrdinalMerging == null) { - try (var selected = IntVector.range(0, maxGroupId + 1, blockFactory)) { - sortedForOrdinalMerging = buildSorted(selected); - // hash all the bytes to the destination to avoid hashing them multiple times - BytesRef scratch = new BytesRef(); - final int totalValue = Math.toIntExact(bytes.size()); - blockFactory.adjustBreaker((long) totalValue * Integer.BYTES); - try { - final int[] mappedIds = new int[totalValue]; - for (int i = 0; i < totalValue; i++) { - var v = bytes.get(i, scratch); - mappedIds[i] = Math.toIntExact(BlockHash.hashOrdToGroup(other.bytes.add(v))); - } - // no longer need the bytes - bytes.close(); - bytes = null; - for (int i = 0; i < sortedForOrdinalMerging.ids.length; i++) { - sortedForOrdinalMerging.ids[i] = mappedIds[Math.toIntExact(values.getKey2(sortedForOrdinalMerging.ids[i]))]; - } - } finally { - blockFactory.adjustBreaker(-(long) totalValue * Integer.BYTES); - } - } - } - return sortedForOrdinalMerging; - } - Block buildOutputBlock(BlockFactory blockFactory, IntVector selected, int[] selectedCounts, int[] ids) { /* * Insert the ids in order. @@ -416,7 +371,7 @@ public void enableGroupIdTracking(SeenGroupIds seen) { @Override public void close() { - Releasables.closeExpectNoException(values, bytes, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values, bytes); } } } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesDoubleAggregator.java index 3c0dcd58c29ee..5f01ad586976f 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesDoubleAggregator.java @@ -66,19 +66,6 @@ public static void combineIntermediate(GroupingState state, int groupId, DoubleB } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - if (statePosition > state.maxGroupId) { - return; - } - var sorted = state.sortedForOrdinalMerging(current); - var start = statePosition > 0 ? sorted.counts[statePosition - 1] : 0; - var end = sorted.counts[statePosition]; - for (int i = start; i < end; i++) { - int id = sorted.ids[i]; - current.addValue(currentGroupId, state.getValue(id)); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -144,8 +131,6 @@ public static class GroupingState implements GroupingAggregatorState { private final BlockFactory blockFactory; private final LongLongHash values; - private Sorted sortedForOrdinalMerging = null; - private GroupingState(DriverContext driverContext) { this.blockFactory = driverContext.blockFactory(); values = new LongLongHash(1, driverContext.bigArrays()); @@ -263,15 +248,6 @@ private Sorted buildSorted(IntVector selected) { } } - private Sorted sortedForOrdinalMerging(GroupingState other) { - if (sortedForOrdinalMerging == null) { - try (var selected = IntVector.range(0, maxGroupId + 1, blockFactory)) { - sortedForOrdinalMerging = buildSorted(selected); - } - } - return sortedForOrdinalMerging; - } - Block buildOutputBlock(BlockFactory blockFactory, IntVector selected, int[] selectedCounts, int[] ids) { /* * Insert the ids in order. @@ -310,7 +286,7 @@ public void enableGroupIdTracking(SeenGroupIds seen) { @Override public void close() { - Releasables.closeExpectNoException(values, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values); } } } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesFloatAggregator.java index a25d69b712538..9acaaccd80a85 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesFloatAggregator.java @@ -65,19 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, FloatBl } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - if (statePosition > state.maxGroupId) { - return; - } - var sorted = state.sortedForOrdinalMerging(current); - var start = statePosition > 0 ? sorted.counts[statePosition - 1] : 0; - var end = sorted.counts[statePosition]; - for (int i = start; i < end; i++) { - int id = sorted.ids[i]; - current.addValue(currentGroupId, state.getValue(id)); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -143,8 +130,6 @@ public static class GroupingState implements GroupingAggregatorState { private final BlockFactory blockFactory; private final LongHash values; - private Sorted sortedForOrdinalMerging = null; - private GroupingState(DriverContext driverContext) { this.blockFactory = driverContext.blockFactory(); values = new LongHash(1, driverContext.bigArrays()); @@ -268,15 +253,6 @@ private Sorted buildSorted(IntVector selected) { } } - private Sorted sortedForOrdinalMerging(GroupingState other) { - if (sortedForOrdinalMerging == null) { - try (var selected = IntVector.range(0, maxGroupId + 1, blockFactory)) { - sortedForOrdinalMerging = buildSorted(selected); - } - } - return sortedForOrdinalMerging; - } - Block buildOutputBlock(BlockFactory blockFactory, IntVector selected, int[] selectedCounts, int[] ids) { /* * Insert the ids in order. @@ -316,7 +292,7 @@ public void enableGroupIdTracking(SeenGroupIds seen) { @Override public void close() { - Releasables.closeExpectNoException(values, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values); } } } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesIntAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesIntAggregator.java index 2c8c0f409dd5b..3690df739552b 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesIntAggregator.java @@ -65,19 +65,6 @@ public static void combineIntermediate(GroupingState state, int groupId, IntBloc } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - if (statePosition > state.maxGroupId) { - return; - } - var sorted = state.sortedForOrdinalMerging(current); - var start = statePosition > 0 ? sorted.counts[statePosition - 1] : 0; - var end = sorted.counts[statePosition]; - for (int i = start; i < end; i++) { - int id = sorted.ids[i]; - current.addValue(currentGroupId, state.getValue(id)); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -143,8 +130,6 @@ public static class GroupingState implements GroupingAggregatorState { private final BlockFactory blockFactory; private final LongHash values; - private Sorted sortedForOrdinalMerging = null; - private GroupingState(DriverContext driverContext) { this.blockFactory = driverContext.blockFactory(); values = new LongHash(1, driverContext.bigArrays()); @@ -268,15 +253,6 @@ private Sorted buildSorted(IntVector selected) { } } - private Sorted sortedForOrdinalMerging(GroupingState other) { - if (sortedForOrdinalMerging == null) { - try (var selected = IntVector.range(0, maxGroupId + 1, blockFactory)) { - sortedForOrdinalMerging = buildSorted(selected); - } - } - return sortedForOrdinalMerging; - } - Block buildOutputBlock(BlockFactory blockFactory, IntVector selected, int[] selectedCounts, int[] ids) { /* * Insert the ids in order. @@ -316,7 +292,7 @@ public void enableGroupIdTracking(SeenGroupIds seen) { @Override public void close() { - Releasables.closeExpectNoException(values, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values); } } } diff --git a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesLongAggregator.java b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesLongAggregator.java index 2790a182d5041..9514e9147e05d 100644 --- a/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/aggregation/ValuesLongAggregator.java @@ -66,19 +66,6 @@ public static void combineIntermediate(GroupingState state, int groupId, LongBlo } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - if (statePosition > state.maxGroupId) { - return; - } - var sorted = state.sortedForOrdinalMerging(current); - var start = statePosition > 0 ? sorted.counts[statePosition - 1] : 0; - var end = sorted.counts[statePosition]; - for (int i = start; i < end; i++) { - int id = sorted.ids[i]; - current.addValue(currentGroupId, state.getValue(id)); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -144,8 +131,6 @@ public static class GroupingState implements GroupingAggregatorState { private final BlockFactory blockFactory; private final LongLongHash values; - private Sorted sortedForOrdinalMerging = null; - private GroupingState(DriverContext driverContext) { this.blockFactory = driverContext.blockFactory(); values = new LongLongHash(1, driverContext.bigArrays()); @@ -263,15 +248,6 @@ private Sorted buildSorted(IntVector selected) { } } - private Sorted sortedForOrdinalMerging(GroupingState other) { - if (sortedForOrdinalMerging == null) { - try (var selected = IntVector.range(0, maxGroupId + 1, blockFactory)) { - sortedForOrdinalMerging = buildSorted(selected); - } - } - return sortedForOrdinalMerging; - } - Block buildOutputBlock(BlockFactory blockFactory, IntVector selected, int[] selectedCounts, int[] ids) { /* * Insert the ids in order. @@ -310,7 +286,7 @@ public void enableGroupIdTracking(SeenGroupIds seen) { @Override public void close() { - Releasables.closeExpectNoException(values, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values); } } } diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java index b7e54531a40e8..5113d70c6e55e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - CountDistinctBooleanAggregator.GroupingState inState = ((CountDistinctBooleanGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - CountDistinctBooleanAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java index e25a822e568a9..f8d893db7e064 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java @@ -222,16 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - HllStates.GroupingState inState = ((CountDistinctBytesRefGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - CountDistinctBytesRefAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java index 427ca74566783..3c3952e4a41df 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - HllStates.GroupingState inState = ((CountDistinctDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - CountDistinctDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java index 9af558b45b771..1000f916d1e5f 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - HllStates.GroupingState inState = ((CountDistinctFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - CountDistinctFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java index 4a6f70e5a694b..0b89c3867d0cf 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java @@ -217,16 +217,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - HllStates.GroupingState inState = ((CountDistinctIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - CountDistinctIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java index 3dbd803132fbb..acdae1a648d78 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - HllStates.GroupingState inState = ((CountDistinctLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - CountDistinctLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleGroupingAggregatorFunction.java index 9252912f95bd2..b3fc1a93e2d3e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeDoubleGroupingAggregatorFunction.java @@ -234,16 +234,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - FirstOverTimeDoubleAggregator.GroupingState inState = ((FirstOverTimeDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - FirstOverTimeDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeFloatGroupingAggregatorFunction.java index e3b7138f317b5..61b8ba51a6a29 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeFloatGroupingAggregatorFunction.java @@ -234,16 +234,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - FirstOverTimeFloatAggregator.GroupingState inState = ((FirstOverTimeFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - FirstOverTimeFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeIntGroupingAggregatorFunction.java index b35be872ac903..f8959ef8c4014 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeIntGroupingAggregatorFunction.java @@ -233,16 +233,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - FirstOverTimeIntAggregator.GroupingState inState = ((FirstOverTimeIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - FirstOverTimeIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeLongGroupingAggregatorFunction.java index 1f92171d6b51d..d54cab4d0d853 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/FirstOverTimeLongGroupingAggregatorFunction.java @@ -232,16 +232,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - FirstOverTimeLongAggregator.GroupingState inState = ((FirstOverTimeLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - FirstOverTimeLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeDoubleGroupingAggregatorFunction.java index bb01e3770f36a..4530c5313fa2c 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeDoubleGroupingAggregatorFunction.java @@ -234,16 +234,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LastOverTimeDoubleAggregator.GroupingState inState = ((LastOverTimeDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - LastOverTimeDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeFloatGroupingAggregatorFunction.java index 3538fc8ca3e96..0e54c799320a9 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeFloatGroupingAggregatorFunction.java @@ -234,16 +234,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LastOverTimeFloatAggregator.GroupingState inState = ((LastOverTimeFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - LastOverTimeFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeIntGroupingAggregatorFunction.java index 033383d890fda..ae5ac000d00d1 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeIntGroupingAggregatorFunction.java @@ -233,16 +233,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LastOverTimeIntAggregator.GroupingState inState = ((LastOverTimeIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - LastOverTimeIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeLongGroupingAggregatorFunction.java index c6264740174f1..77cd4a6b3146c 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/LastOverTimeLongGroupingAggregatorFunction.java @@ -232,16 +232,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LastOverTimeLongAggregator.GroupingState inState = ((LastOverTimeLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - LastOverTimeLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java index 22db5c48a8bee..266c918e5c080 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java @@ -220,18 +220,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - BooleanArrayState inState = ((MaxBooleanGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MaxBooleanAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java index 9aeac5e96ffe4..67623ef20da16 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - MaxBytesRefAggregator.GroupingState inState = ((MaxBytesRefGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MaxBytesRefAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java index 63914d3188cfa..b4e080c882b7d 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - DoubleArrayState inState = ((MaxDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MaxDoubleAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java index 87beddaaaa1f9..f7b957312228b 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - FloatArrayState inState = ((MaxFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MaxFloatAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java index e8bc6b264fe1b..b5364e060f87e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java @@ -221,18 +221,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - IntArrayState inState = ((MaxIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MaxIntAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java index a1256aa99f6eb..4d01eda88bf14 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - MaxIpAggregator.GroupingState inState = ((MaxIpGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MaxIpAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java index e8b777d19bfac..928caefc40846 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LongArrayState inState = ((MaxLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MaxLongAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java index a2081a0bae7f1..02ec5aaacef70 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java @@ -215,16 +215,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((MedianAbsoluteDeviationDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MedianAbsoluteDeviationDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java index d204511b513a6..df542b6171bca 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java @@ -215,16 +215,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((MedianAbsoluteDeviationFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MedianAbsoluteDeviationFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java index 555af0c52222d..a389be2aea830 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java @@ -214,16 +214,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((MedianAbsoluteDeviationIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MedianAbsoluteDeviationIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java index ff316faafa2d7..00b4316cd6add 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java @@ -215,16 +215,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((MedianAbsoluteDeviationLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MedianAbsoluteDeviationLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java index ab78888279897..fc108b7417f56 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java @@ -220,18 +220,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - BooleanArrayState inState = ((MinBooleanGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MinBooleanAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java index 8a767e99d9247..f07fef1298d18 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - MinBytesRefAggregator.GroupingState inState = ((MinBytesRefGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MinBytesRefAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java index 28a14f61b70c3..4f85003bbb5e0 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - DoubleArrayState inState = ((MinDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MinDoubleAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java index 3b9ac103e3aab..14f83dd6a9af5 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - FloatArrayState inState = ((MinFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MinFloatAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java index fd78ec24db816..af555d4eedb63 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java @@ -221,18 +221,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - IntArrayState inState = ((MinIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MinIntAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java index 63fa88a13c952..51bd9e85fdcad 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - MinIpAggregator.GroupingState inState = ((MinIpGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - MinIpAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java index 80687f75cf70a..590ee9c440e43 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LongArrayState inState = ((MinLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, MinLongAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java index 6e6fe2b46feb5..7260e8fcd0546 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((PercentileDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - PercentileDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java index 9eb082f5d3897..dbff522fe6d12 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((PercentileFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - PercentileFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java index 20b0c91130574..d1d16b9938942 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java @@ -217,16 +217,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((PercentileIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - PercentileIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java index 800bb301361c5..b9221f27db944 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - QuantileStates.GroupingState inState = ((PercentileLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - PercentileLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java index ba8fd3d775aad..0e256a1ed0012 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java @@ -247,16 +247,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - RateDoubleAggregator.DoubleRateGroupingState inState = ((RateDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - RateDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java index 5a9ae19488edf..9c9da99547262 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java @@ -249,16 +249,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - RateFloatAggregator.FloatRateGroupingState inState = ((RateFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - RateFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java index 51bceb96d9894..60b33edb71b30 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java @@ -247,16 +247,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - RateIntAggregator.IntRateGroupingState inState = ((RateIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - RateIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java index d5202993410cd..69e8d04fe55c4 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java @@ -247,16 +247,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - RateLongAggregator.LongRateGroupingState inState = ((RateLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - RateLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBooleanGroupingAggregatorFunction.java index c7fe735c0bbe6..b52c485449f99 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBooleanGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBooleanGroupingAggregatorFunction.java @@ -217,16 +217,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SampleBooleanAggregator.GroupingState inState = ((SampleBooleanGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SampleBooleanAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBytesRefGroupingAggregatorFunction.java index 279692affcb76..555204535fe4f 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBytesRefGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleBytesRefGroupingAggregatorFunction.java @@ -222,16 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SampleBytesRefAggregator.GroupingState inState = ((SampleBytesRefGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SampleBytesRefAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleDoubleGroupingAggregatorFunction.java index 540fd8cddc400..610a292fe253e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleDoubleGroupingAggregatorFunction.java @@ -217,16 +217,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SampleDoubleAggregator.GroupingState inState = ((SampleDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SampleDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleIntGroupingAggregatorFunction.java index ee3966afbebb8..8d138067d4d6f 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleIntGroupingAggregatorFunction.java @@ -216,16 +216,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SampleIntAggregator.GroupingState inState = ((SampleIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SampleIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleLongGroupingAggregatorFunction.java index a2b80e6eb1ba7..73664865c1af8 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SampleLongGroupingAggregatorFunction.java @@ -217,16 +217,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SampleLongAggregator.GroupingState inState = ((SampleLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SampleLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevDoubleGroupingAggregatorFunction.java index 97fb73c14231d..fdbec04aaa8b6 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevDoubleGroupingAggregatorFunction.java @@ -226,16 +226,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - StdDevStates.GroupingState inState = ((StdDevDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - StdDevDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevFloatGroupingAggregatorFunction.java index fda99e5ac24fa..2a3bdae362f9d 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevFloatGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - StdDevStates.GroupingState inState = ((StdDevFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - StdDevFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevIntGroupingAggregatorFunction.java index fabe9c9f56bdd..05eae387ac49a 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevIntGroupingAggregatorFunction.java @@ -227,16 +227,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - StdDevStates.GroupingState inState = ((StdDevIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - StdDevIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevLongGroupingAggregatorFunction.java index dd19aca9df2bf..755eea896377b 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/StdDevLongGroupingAggregatorFunction.java @@ -226,16 +226,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - StdDevStates.GroupingState inState = ((StdDevLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - StdDevLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java index d3ca279b53a17..a3ffe05c41256 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java @@ -226,16 +226,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SumDoubleAggregator.GroupingSumState inState = ((SumDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SumDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java index f207360198df3..61dc158374e27 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SumDoubleAggregator.GroupingSumState inState = ((SumFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SumFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java index 43dffed46139a..c8b12478255d2 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java @@ -223,18 +223,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LongArrayState inState = ((SumIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, SumIntAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java index c51d30d8dcf2d..550f504e61c23 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java @@ -222,18 +222,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - LongArrayState inState = ((SumLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.set(groupId, SumLongAggregator.combine(state.getOrDefault(groupId), inState.get(position))); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java index b9111edb383f6..77c61fce3cc37 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopBooleanAggregator.GroupingState inState = ((TopBooleanGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopBooleanAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBytesRefGroupingAggregatorFunction.java index cb1a79ec461d5..02fbb1bda8383 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBytesRefGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBytesRefGroupingAggregatorFunction.java @@ -226,16 +226,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopBytesRefAggregator.GroupingState inState = ((TopBytesRefGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopBytesRefAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java index 58a6bb5b21daf..cf53719168731 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopDoubleAggregator.GroupingState inState = ((TopDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java index 79d0521f15721..30a8c5242c20a 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopFloatAggregator.GroupingState inState = ((TopFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java index d3e7c9a306863..1b7678fb3bd0e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java @@ -217,16 +217,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopIntAggregator.GroupingState inState = ((TopIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java index c2ca3dba11650..56a8de3d94d04 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java @@ -226,16 +226,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopIpAggregator.GroupingState inState = ((TopIpGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopIpAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java index 1ada21e48e006..74b9824739085 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java @@ -218,16 +218,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - TopLongAggregator.GroupingState inState = ((TopLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - TopLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java index 8229c4dd028ce..fe0c0632deba7 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java @@ -211,16 +211,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - ValuesBooleanAggregator.GroupingState inState = ((ValuesBooleanGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - ValuesBooleanAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java index b73a017eacc7c..e240452b3a18d 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java @@ -221,16 +221,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - ValuesBytesRefAggregator.GroupingState inState = ((ValuesBytesRefGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - ValuesBytesRefAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java index ce0b05882558c..8408526adb449 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java @@ -211,16 +211,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - ValuesDoubleAggregator.GroupingState inState = ((ValuesDoubleGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - ValuesDoubleAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java index d366c1fcd85e8..0be289943b38f 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java @@ -211,16 +211,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - ValuesFloatAggregator.GroupingState inState = ((ValuesFloatGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - ValuesFloatAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java index 6dd07b3c8b63c..f7a8b45d47c8e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java @@ -210,16 +210,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - ValuesIntAggregator.GroupingState inState = ((ValuesIntGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - ValuesIntAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java index f8f6196fe8920..b8793982223dc 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java @@ -211,16 +211,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - ValuesLongAggregator.GroupingState inState = ((ValuesLongGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - ValuesLongAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java index d85cd8f01b540..d2f1d88125321 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java @@ -242,16 +242,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - CentroidPointAggregator.GroupingCentroidState inState = ((SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialCentroidCartesianPointDocValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java index 15603415ec91c..7f1d838cda18c 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java @@ -251,16 +251,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - CentroidPointAggregator.GroupingCentroidState inState = ((SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialCentroidCartesianPointSourceValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java index 92f014628830a..5ba0a22f09c96 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java @@ -242,16 +242,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - CentroidPointAggregator.GroupingCentroidState inState = ((SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialCentroidGeoPointDocValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java index 8211713ed288f..f316218141411 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java @@ -251,16 +251,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - CentroidPointAggregator.GroupingCentroidState inState = ((SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialCentroidGeoPointSourceValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointDocValuesGroupingAggregatorFunction.java index ad5419caffd21..59b25a0e675ec 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointDocValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointDocValuesGroupingAggregatorFunction.java @@ -235,16 +235,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingState inState = ((SpatialExtentCartesianPointDocValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentCartesianPointDocValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointSourceValuesGroupingAggregatorFunction.java index ac4f1c565d287..c70eee3ae8803 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointSourceValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianPointSourceValuesGroupingAggregatorFunction.java @@ -242,16 +242,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingState inState = ((SpatialExtentCartesianPointSourceValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentCartesianPointSourceValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeDocValuesGroupingAggregatorFunction.java index cc7bf2ed5994b..386ac52e66288 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeDocValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeDocValuesGroupingAggregatorFunction.java @@ -216,16 +216,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingState inState = ((SpatialExtentCartesianShapeDocValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentCartesianShapeDocValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeSourceValuesGroupingAggregatorFunction.java index a9c3413b20182..61988aa3c06d9 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeSourceValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentCartesianShapeSourceValuesGroupingAggregatorFunction.java @@ -242,16 +242,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingState inState = ((SpatialExtentCartesianShapeSourceValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentCartesianShapeSourceValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointDocValuesGroupingAggregatorFunction.java index d1e79ea1bcb4f..3bf7f0cdf043e 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointDocValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointDocValuesGroupingAggregatorFunction.java @@ -247,16 +247,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingStateWrappedLongitudeState inState = ((SpatialExtentGeoPointDocValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentGeoPointDocValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointSourceValuesGroupingAggregatorFunction.java index 4ebb18432fd2c..16466431b6725 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointSourceValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoPointSourceValuesGroupingAggregatorFunction.java @@ -254,16 +254,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingStateWrappedLongitudeState inState = ((SpatialExtentGeoPointSourceValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentGeoPointSourceValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeDocValuesGroupingAggregatorFunction.java index 2ca46b3e6fff1..8e1da49050ff0 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeDocValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeDocValuesGroupingAggregatorFunction.java @@ -228,16 +228,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingStateWrappedLongitudeState inState = ((SpatialExtentGeoShapeDocValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentGeoShapeDocValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeSourceValuesGroupingAggregatorFunction.java index e481d6437adfd..0529db1776270 100644 --- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeSourceValuesGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGeoShapeSourceValuesGroupingAggregatorFunction.java @@ -254,16 +254,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - SpatialExtentGroupingStateWrappedLongitudeState inState = ((SpatialExtentGeoShapeSourceValuesGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - SpatialExtentGeoShapeSourceValuesAggregator.combineStates(state, groupId, inState, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregator.java index 218af8fcb705e..033ac62e45fd4 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregator.java @@ -50,10 +50,6 @@ public static void combine(GroupingState current, int groupId, boolean v) { current.collect(groupId, v); } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - current.combineStates(currentGroupId, state); - } - public static void combineIntermediate(GroupingState current, int groupId, boolean fbit, boolean tbit) { if (fbit) current.bits.set(groupId * 2); if (tbit) current.bits.set(groupId * 2 + 1); @@ -120,11 +116,6 @@ void collect(int groupId, boolean v) { trackGroupId(groupId); } - void combineStates(int currentGroupId, GroupingState state) { - bits.or(state.bits); - trackGroupId(currentGroupId); - } - /** Extracts an intermediate view of the contents of this state. */ @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregator.java index 13a9e00bb28ab..84b7f4558b9e9 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregator.java @@ -50,15 +50,6 @@ public static void combineIntermediate(HllStates.GroupingState current, int grou current.merge(groupId, inValue, 0); } - public static void combineStates( - HllStates.GroupingState current, - int currentGroupId, - HllStates.GroupingState state, - int statePosition - ) { - current.merge(currentGroupId, state.hll, statePosition); - } - public static Block evaluateFinal(HllStates.GroupingState state, IntVector selected, DriverContext driverContext) { try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(selected.getPositionCount())) { for (int i = 0; i < selected.getPositionCount(); i++) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregator.java index 46a0d24cec8c4..ef001408bdf63 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregator.java @@ -50,15 +50,6 @@ public static void combineIntermediate(HllStates.GroupingState current, int grou current.merge(groupId, inValue, 0); } - public static void combineStates( - HllStates.GroupingState current, - int currentGroupId, - HllStates.GroupingState state, - int statePosition - ) { - current.merge(currentGroupId, state.hll, statePosition); - } - public static Block evaluateFinal(HllStates.GroupingState state, IntVector selected, DriverContext driverContext) { try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(selected.getPositionCount())) { for (int i = 0; i < selected.getPositionCount(); i++) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregator.java index 2159f0864e1cf..e744bea7bf338 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregator.java @@ -50,15 +50,6 @@ public static void combineIntermediate(HllStates.GroupingState current, int grou current.merge(groupId, inValue, 0); } - public static void combineStates( - HllStates.GroupingState current, - int currentGroupId, - HllStates.GroupingState state, - int statePosition - ) { - current.merge(currentGroupId, state.hll, statePosition); - } - public static Block evaluateFinal(HllStates.GroupingState state, IntVector selected, DriverContext driverContext) { try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(selected.getPositionCount())) { for (int i = 0; i < selected.getPositionCount(); i++) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctIntAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctIntAggregator.java index 9c29eb98f2987..e87e9e5a593ab 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctIntAggregator.java @@ -50,15 +50,6 @@ public static void combineIntermediate(HllStates.GroupingState current, int grou current.merge(groupId, inValue, 0); } - public static void combineStates( - HllStates.GroupingState current, - int currentGroupId, - HllStates.GroupingState state, - int statePosition - ) { - current.merge(currentGroupId, state.hll, statePosition); - } - public static Block evaluateFinal(HllStates.GroupingState state, IntVector selected, DriverContext driverContext) { try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(selected.getPositionCount())) { for (int i = 0; i < selected.getPositionCount(); i++) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctLongAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctLongAggregator.java index 59570e2f5a7ef..ccdc1c289d5fe 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctLongAggregator.java @@ -50,15 +50,6 @@ public static void combineIntermediate(HllStates.GroupingState current, int grou current.merge(groupId, inValue, 0); } - public static void combineStates( - HllStates.GroupingState current, - int currentGroupId, - HllStates.GroupingState state, - int statePosition - ) { - current.merge(currentGroupId, state.hll, statePosition); - } - public static Block evaluateFinal(HllStates.GroupingState state, IntVector selected, DriverContext driverContext) { try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(selected.getPositionCount())) { for (int i = 0; i < selected.getPositionCount(); i++) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java index c04783eb938a1..d1de1eaad99a5 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java @@ -212,18 +212,6 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input.getClass() != getClass()) { - throw new IllegalArgumentException("expected " + getClass() + "; got " + input.getClass()); - } - final LongArrayState inState = ((CountGroupingAggregatorFunction) input).state; - state.enableGroupIdTracking(new SeenGroupIds.Empty()); - if (inState.hasValue(position)) { - state.increment(groupId, inState.get(position)); - } - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { state.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java index e502638011a69..5011d3d75816b 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java @@ -105,11 +105,6 @@ public void addIntermediateInput(int positionOffset, IntVector groupIdVector, Pa next.addIntermediateInput(positionOffset, groupIdVector, page); } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - next.addIntermediateRowInput(groupId, ((FilteredGroupingAggregatorFunction) input).next(), position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { next.evaluateIntermediate(blocks, offset, selected); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java index 8f6c0a8df63eb..4bc47839bcb4f 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java @@ -81,14 +81,6 @@ public void addIntermediateInput(int positionOffset, IntVector groupIdVector, Pa delegate.addIntermediateInput(positionOffset, groupIdVector, inputBlock.asPage()); } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input instanceof FromPartialGroupingAggregatorFunction toPartial) { - input = toPartial.delegate; - } - delegate.addIntermediateRowInput(groupId, input, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { Block[] partialBlocks = new Block[delegate.intermediateBlockCount()]; diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java index 4bc7d91ad6037..ff8bdab4dd803 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java @@ -128,12 +128,6 @@ default void add(int positionOffset, IntBlock groupIds) { */ void addIntermediateInput(int positionOffset, IntVector groupIdVector, Page page); - /** - * Add the position-th row from the intermediate output of the given aggregator function to the groupId - * TODO: Remove this method as the grouping operator has been removed - */ - void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position); - /** * Build the intermediate results for this aggregation. * @param selected the groupIds that have been selected to be included in diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/HllStates.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/HllStates.java index 64a970c2acc07..9ffea07121dd4 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/HllStates.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/HllStates.java @@ -168,10 +168,6 @@ long cardinality(int groupId) { return hll.cardinality(groupId); } - void merge(int groupId, AbstractHyperLogLogPlusPlus other, int otherGroup) { - hll.merge(groupId, other, otherGroup); - } - void merge(int groupId, BytesRef other, int otherGroup) { hll.merge(groupId, deserializeHLL(other), otherGroup); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxBytesRefAggregator.java index 049642c350917..7d731c1e9ac0c 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxBytesRefAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxBytesRefAggregator.java @@ -62,10 +62,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) { - state.combine(groupId, otherState, otherGroupId); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(selected, driverContext); } @@ -83,12 +79,6 @@ public void add(int groupId, BytesRef value) { } } - public void combine(int groupId, GroupingState otherState, int otherGroupId) { - if (otherState.internalState.hasValue(otherGroupId)) { - add(groupId, otherState.internalState.get(otherGroupId)); - } - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { internalState.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxIpAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxIpAggregator.java index 43b4a4a2fe0a1..d8c8146f09807 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxIpAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MaxIpAggregator.java @@ -58,10 +58,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) { - state.combine(groupId, otherState, otherGroupId); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(selected, driverContext); } @@ -80,12 +76,6 @@ public void add(int groupId, BytesRef value) { } } - public void combine(int groupId, GroupingState otherState, int otherGroupId) { - if (otherState.internalState.hasValue(otherGroupId)) { - add(groupId, otherState.internalState.get(otherGroupId, otherState.scratch)); - } - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { internalState.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregator.java index d1c21cef90f30..7a195613fdb08 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluateMedianAbsoluteDeviation(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregator.java index 743ed5d4ca5e1..2b07899174ebd 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregator.java @@ -48,15 +48,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluateMedianAbsoluteDeviation(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregator.java index 09f521eb7c0a0..f1482cba2949c 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluateMedianAbsoluteDeviation(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregator.java index 723959bb87827..7867a6ccebd21 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluateMedianAbsoluteDeviation(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinBytesRefAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinBytesRefAggregator.java index 677b38a9af3a7..142deb4058f3e 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinBytesRefAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinBytesRefAggregator.java @@ -62,10 +62,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) { - state.combine(groupId, otherState, otherGroupId); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(selected, driverContext); } @@ -83,12 +79,6 @@ public void add(int groupId, BytesRef value) { } } - public void combine(int groupId, GroupingState otherState, int otherGroupId) { - if (otherState.internalState.hasValue(otherGroupId)) { - add(groupId, otherState.internalState.get(otherGroupId)); - } - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { internalState.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinIpAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinIpAggregator.java index c4ee93db89cf8..c5cbdab2c68a5 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinIpAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/MinIpAggregator.java @@ -58,10 +58,6 @@ public static void combineIntermediate(GroupingState state, int groupId, BytesRe } } - public static void combineStates(GroupingState state, int groupId, GroupingState otherState, int otherGroupId) { - state.combine(groupId, otherState, otherGroupId); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(selected, driverContext); } @@ -80,12 +76,6 @@ public void add(int groupId, BytesRef value) { } } - public void combine(int groupId, GroupingState otherState, int otherGroupId) { - if (otherState.internalState.hasValue(otherGroupId)) { - add(groupId, otherState.internalState.get(otherGroupId, otherState.scratch)); - } - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { internalState.toIntermediate(blocks, offset, selected, driverContext); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileDoubleAggregator.java index dabdba38566ae..7b20903907806 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileDoubleAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluatePercentile(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileFloatAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileFloatAggregator.java index 6a0c7e40285a5..07feae7afa9bd 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileFloatAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileFloatAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluatePercentile(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileIntAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileIntAggregator.java index cf6e66ca9ca6c..f814b6d43d148 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileIntAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileIntAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selected, DriverContext driverContext) { return state.evaluatePercentile(selected, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileLongAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileLongAggregator.java index 2138033a80437..4814f3d25ac5c 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileLongAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/PercentileLongAggregator.java @@ -47,15 +47,6 @@ public static void combineIntermediate(QuantileStates.GroupingState state, int g state.add(groupId, inValue); } - public static void combineStates( - QuantileStates.GroupingState current, - int currentGroupId, - QuantileStates.GroupingState state, - int statePosition - ) { - current.add(currentGroupId, state.getOrNull(statePosition)); - } - public static Block evaluateFinal(QuantileStates.GroupingState state, IntVector selectedGroups, DriverContext driverContext) { return state.evaluatePercentile(selectedGroups, driverContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java index 5e46225a873f8..d3ad2c07ac7ef 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java @@ -69,12 +69,6 @@ public static void combine(GroupingSumState current, int groupId, double v) { current.add(v, groupId); } - public static void combineStates(GroupingSumState current, int groupId, GroupingSumState state, int statePosition) { - if (state.hasValue(statePosition)) { - current.add(state.values.get(statePosition), state.deltas.get(statePosition), groupId); - } - } - public static void combineIntermediate(GroupingSumState current, int groupId, double inValue, double inDelta, boolean seen) { if (seen) { current.add(inValue, inDelta, groupId); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java index adcee9462a0ee..e8748ad33c5c2 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java @@ -70,14 +70,6 @@ public void addIntermediateInput(int positionOffset, IntVector groupIdVector, Pa delegate.addIntermediateInput(positionOffset, groupIdVector, inputBlock.asPage()); } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - if (input instanceof ToPartialGroupingAggregatorFunction toPartial) { - input = toPartial.delegate; - } - delegate.addIntermediateRowInput(groupId, input, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { final Block[] partialBlocks = new Block[delegate.intermediateBlockCount()]; diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ValuesBooleanAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ValuesBooleanAggregator.java index e19d3107172e3..c070d02de627e 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ValuesBooleanAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ValuesBooleanAggregator.java @@ -66,19 +66,6 @@ public static void combineIntermediate(GroupingState state, int groupId, Boolean } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - long stateOffset = ((long) statePosition) << 1; - boolean seenFalse = state.values.get(stateOffset); - boolean seenTrue = state.values.get(stateOffset | 1); - - if (seenFalse) { - combine(current, currentGroupId, false); - } - if (seenTrue) { - combine(current, currentGroupId, true); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-RateAggregator.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-RateAggregator.java.st index 68accfd6ad3de..639c7d4ab1831 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-RateAggregator.java.st +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-RateAggregator.java.st @@ -29,8 +29,6 @@ import org.elasticsearch.compute.operator.DriverContext; import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; -import java.util.Arrays; - /** * A rate grouping aggregation definition for $type$. * This class is generated. Edit `X-RateAggregator.java.st` instead. @@ -65,15 +63,6 @@ public class Rate$Type$Aggregator { current.combine(groupId, timestamps, values, sampleCount, reset, otherPosition); } - public static void combineStates( - $Type$RateGroupingState current, - int currentGroupId, // make the stylecheck happy - $Type$RateGroupingState otherState, - int otherGroupId - ) { - current.combineState(currentGroupId, otherState, otherGroupId); - } - public static Block evaluateFinal($Type$RateGroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } @@ -222,25 +211,6 @@ public class Rate$Type$Aggregator { } } - void combineState(int groupId, $Type$RateGroupingState otherState, int otherGroupId) { - var other = otherGroupId < otherState.states.size() ? otherState.states.get(otherGroupId) : null; - if (other == null) { - return; - } - ensureCapacity(groupId); - var curr = states.get(groupId); - if (curr == null) { - var len = other.entries(); - adjustBreaker($Type$RateState.bytesUsed(len)); - curr = new $Type$RateState(Arrays.copyOf(other.timestamps, len), Arrays.copyOf(other.values, len)); - curr.reset = other.reset; - curr.sampleCount = other.sampleCount; - states.set(groupId, curr); - } else { - states.set(groupId, mergeState(curr, other)); - } - } - $Type$RateState mergeState($Type$RateState s1, $Type$RateState s2) { var newLen = s1.entries() + s2.entries(); adjustBreaker($Type$RateState.bytesUsed(newLen)); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-SampleAggregator.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-SampleAggregator.java.st index 90539cb9ecf68..46de952d5c7c5 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-SampleAggregator.java.st +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-SampleAggregator.java.st @@ -84,10 +84,6 @@ class Sample$Type$Aggregator { } } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return stripWeights(driverContext, state.toBlock(driverContext.blockFactory(), selected)); } @@ -150,10 +146,6 @@ class Sample$Type$Aggregator { bytesRefBuilder.clear(); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -185,10 +177,6 @@ class Sample$Type$Aggregator { internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-StdDevAggregator.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-StdDevAggregator.java.st index 510d770f90d62..4338b1e5aee9b 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-StdDevAggregator.java.st +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-StdDevAggregator.java.st @@ -52,10 +52,6 @@ public class StdDev$Type$Aggregator { current.add(groupId, value); } - public static void combineStates(StdDevStates.GroupingState current, int groupId, StdDevStates.GroupingState state, int statePosition) { - current.combine(groupId, state.getOrNull(statePosition)); - } - public static void combineIntermediate(StdDevStates.GroupingState state, int groupId, double mean, double m2, long count) { state.combine(groupId, mean, m2, count); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-TopAggregator.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-TopAggregator.java.st index 761b70791e946..839fc69c6645f 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-TopAggregator.java.st +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-TopAggregator.java.st @@ -90,10 +90,6 @@ $else$ $endif$ } - public static void combineStates(GroupingState current, int groupId, GroupingState state, int statePosition) { - current.merge(groupId, state, statePosition); - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -115,10 +111,6 @@ $endif$ sort.collect(value, groupId); } - public void merge(int groupId, GroupingState other, int otherGroupId) { - sort.merge(groupId, other.sort, otherGroupId); - } - @Override public void toIntermediate(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory(), selected); @@ -150,10 +142,6 @@ $endif$ internalState.add(0, value); } - public void merge(GroupingState other) { - internalState.merge(0, other, 0); - } - @Override public void toIntermediate(Block[] blocks, int offset, DriverContext driverContext) { blocks[offset] = toBlock(driverContext.blockFactory()); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValueOverTimeAggregator.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValueOverTimeAggregator.java.st index 13ebd58aa1023..31633b151fa39 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValueOverTimeAggregator.java.st +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValueOverTimeAggregator.java.st @@ -60,14 +60,6 @@ public class $Occurrence$OverTime$Type$Aggregator { } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState otherState, int otherGroupId) { - if (otherGroupId < otherState.timestamps.size() && otherState.hasValue(otherGroupId)) { - var timestamp = otherState.timestamps.get(otherGroupId); - var value = otherState.values.get(otherGroupId); - current.collectValue(currentGroupId, timestamp, value); - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, GroupingAggregatorEvaluationContext evalContext) { return state.evaluateFinal(selected, evalContext); } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValuesAggregator.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValuesAggregator.java.st index fa8ffecea052d..cc084644832ca 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValuesAggregator.java.st +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/X-ValuesAggregator.java.st @@ -128,23 +128,6 @@ $endif$ } } - public static void combineStates(GroupingState current, int currentGroupId, GroupingState state, int statePosition) { - if (statePosition > state.maxGroupId) { - return; - } - var sorted = state.sortedForOrdinalMerging(current); - var start = statePosition > 0 ? sorted.counts[statePosition - 1] : 0; - var end = sorted.counts[statePosition]; - for (int i = start; i < end; i++) { - int id = sorted.ids[i]; -$if(BytesRef)$ - current.addValueOrdinal(currentGroupId, id); -$else$ - current.addValue(currentGroupId, state.getValue(id)); -$endif$ - } - } - public static Block evaluateFinal(GroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(driverContext.blockFactory(), selected); } @@ -222,10 +205,6 @@ $endif$ * and then use it to iterate over the values in order. * * @param ids positions of the {@link GroupingState#values} to read. -$if(BytesRef)$ - * If built from {@link GroupingState#sortedForOrdinalMerging(GroupingState)}, - * these are ordinals referring to the {@link GroupingState#bytes} in the target state. -$endif$ */ private record Sorted(Releasable releasable, int[] counts, int[] ids) implements Releasable { @Override @@ -255,8 +234,6 @@ $elseif(int||float)$ private final LongHash values; $endif$ - private Sorted sortedForOrdinalMerging = null; - private GroupingState(DriverContext driverContext) { this.blockFactory = driverContext.blockFactory(); $if(long||double)$ @@ -436,36 +413,6 @@ $endif$ } } - private Sorted sortedForOrdinalMerging(GroupingState other) { - if (sortedForOrdinalMerging == null) { - try (var selected = IntVector.range(0, maxGroupId + 1, blockFactory)) { - sortedForOrdinalMerging = buildSorted(selected); -$if(BytesRef)$ - // hash all the bytes to the destination to avoid hashing them multiple times - BytesRef scratch = new BytesRef(); - final int totalValue = Math.toIntExact(bytes.size()); - blockFactory.adjustBreaker((long) totalValue * Integer.BYTES); - try { - final int[] mappedIds = new int[totalValue]; - for (int i = 0; i < totalValue; i++) { - var v = bytes.get(i, scratch); - mappedIds[i] = Math.toIntExact(BlockHash.hashOrdToGroup(other.bytes.add(v))); - } - // no longer need the bytes - bytes.close(); - bytes = null; - for (int i = 0; i < sortedForOrdinalMerging.ids.length; i++) { - sortedForOrdinalMerging.ids[i] = mappedIds[Math.toIntExact(values.getKey2(sortedForOrdinalMerging.ids[i]))]; - } - } finally { - blockFactory.adjustBreaker(-(long) totalValue * Integer.BYTES); - } -$endif$ - } - } - return sortedForOrdinalMerging; - } - Block buildOutputBlock(BlockFactory blockFactory, IntVector selected, int[] selectedCounts, int[] ids) { /* * Insert the ids in order. @@ -559,9 +506,9 @@ $endif$ @Override public void close() { $if(BytesRef)$ - Releasables.closeExpectNoException(values, bytes, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values, bytes); $else$ - Releasables.closeExpectNoException(values, sortedForOrdinalMerging); + Releasables.closeExpectNoException(values); $endif$ } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/CentroidPointAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/CentroidPointAggregator.java index c3b07d069cf11..b4df19cddae97 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/CentroidPointAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/CentroidPointAggregator.java @@ -44,10 +44,6 @@ public static void combine(CentroidState current, double xVal, double xDel, doub current.add(xVal, xDel, yVal, yDel, count); } - public static void combineStates(CentroidState current, CentroidState state) { - current.add(state); - } - public static void combineIntermediate(CentroidState state, double xIn, double dx, double yIn, double dy, long count) { if (count > 0) { combine(state, xIn, dx, yIn, dy, count); @@ -68,19 +64,6 @@ public static Block evaluateFinal(CentroidState state, DriverContext driverConte return state.toBlock(driverContext.blockFactory()); } - public static void combineStates(GroupingCentroidState current, int groupId, GroupingCentroidState state, int statePosition) { - if (state.hasValue(statePosition)) { - current.add( - state.xValues.get(statePosition), - state.xDeltas.get(statePosition), - state.yValues.get(statePosition), - state.yDeltas.get(statePosition), - state.counts.get(statePosition), - groupId - ); - } - } - public static void combineIntermediate( GroupingCentroidState current, int groupId, @@ -170,12 +153,6 @@ public void count(long count) { this.count = count; } - public void add(CentroidState other) { - xSum.add(other.xSum.value(), other.xSum.delta()); - ySum.add(other.ySum.value(), other.ySum.delta()); - count += other.count; - } - public void add(double x, double y) { xSum.add(x); ySum.add(y); diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentAggregator.java index 91e0f098d795e..ac32abac23898 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentAggregator.java @@ -29,8 +29,4 @@ public static Block evaluateFinal(SpatialExtentState state, DriverContext driver public static Block evaluateFinal(SpatialExtentGroupingState state, IntVector selected, DriverContext driverContext) { return state.toBlock(selected, driverContext); } - - public static void combineStates(SpatialExtentGroupingState current, int groupId, SpatialExtentGroupingState inState, int inPosition) { - current.add(groupId, inState, inPosition); - } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingState.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingState.java index 9fb548dceaad9..b2411d59ac298 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingState.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingState.java @@ -176,17 +176,4 @@ public Block toBlock(IntVector selected, DriverContext driverContext) { return builder.build(); } } - - public void add(int groupId, SpatialExtentGroupingState inState, int inPosition) { - ensureCapacity(groupId); - if (inState.hasValue(inPosition)) { - add( - groupId, - inState.minXs.get(inPosition), - inState.maxXs.get(inPosition), - inState.maxYs.get(inPosition), - inState.minYs.get(inPosition) - ); - } - } } diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingStateWrappedLongitudeState.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingStateWrappedLongitudeState.java index 9f8fca5236d14..5eadbc83435b0 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingStateWrappedLongitudeState.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentGroupingStateWrappedLongitudeState.java @@ -108,21 +108,6 @@ public void add(int groupId, Geometry geo) { } } - public void add(int groupId, SpatialExtentGroupingStateWrappedLongitudeState inState, int inPosition) { - ensureCapacity(groupId); - if (inState.hasValue(inPosition)) { - add( - groupId, - inState.tops.get(inPosition), - inState.bottoms.get(inPosition), - inState.negLefts.get(inPosition), - inState.negRights.get(inPosition), - inState.posLefts.get(inPosition), - inState.posRights.get(inPosition) - ); - } - } - /** * This method is used when the field is a geo_point or cartesian_point and is loaded from doc-values. * This optimization is enabled when the field has doc-values and is only used in a spatial aggregation. diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentLongitudeWrappingAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentLongitudeWrappingAggregator.java index 2d89ba78d1025..c15761d451f5b 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentLongitudeWrappingAggregator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/spatial/SpatialExtentLongitudeWrappingAggregator.java @@ -50,13 +50,4 @@ public static Block evaluateFinal( ) { return state.toBlock(selected, driverContext); } - - public static void combineStates( - SpatialExtentGroupingStateWrappedLongitudeState current, - int groupId, - SpatialExtentGroupingStateWrappedLongitudeState inState, - int inPosition - ) { - current.add(groupId, inState, inPosition); - } } diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java index 58ef30b7db266..f040b86850133 100644 --- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java +++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java @@ -772,11 +772,6 @@ public void addIntermediateInput(int positionOffset, IntVector groupIds, Page pa } } - @Override - public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) { - delegate.addIntermediateRowInput(groupId, input, position); - } - @Override public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) { delegate.evaluateIntermediate(blocks, offset, selected); diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/package-info.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/package-info.java index d353373453153..ce37e98b292f1 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/package-info.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/package-info.java @@ -121,7 +121,7 @@ * It is also possible to declare any number of arbitrary arguments that must be provided via generated Supplier. * *
  • - * {@code combine, combineStates, combineIntermediate, evaluateFinal} methods (see below) could be generated automatically + * {@code combine, combineIntermediate, evaluateFinal} methods (see below) could be generated automatically * when both input type I and mutable accumulator state AggregatorState and GroupingAggregatorState are primitive (DOUBLE, INT). *
    • *
  • @@ -167,10 +167,6 @@ * of the grouping aggregation state *
    • *
  • - * {@code void combineStates(GroupingAggregatorState targetState, int targetGroupId, GS otherState, int otherGroupId)} - * merges other grouped aggregation state into the first one - *
    • - *
  • * {@code void combineIntermediate(GroupingAggregatorState current, int groupId, intermediate states)} adds serialized * aggregation state to the current grouped aggregation state (used to combine results across different nodes) *