Skip to content

Fix dimension values aggregator #137410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnhatn merged 1 commit into from
Oct 31, 2025
Merged

Fix dimension values aggregator #137410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,6 @@ tests:
- class: org.elasticsearch.readiness.ReadinessClusterIT
method: testReadinessDuringRestartsNormalOrder
issue: https://github.com/elastic/elasticsearch/issues/136955
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.DimensionValuesByteRefGroupingAggregatorFunctionTests
method: testSimple
issue: https://github.com/elastic/elasticsearch/issues/137378
- class: org.elasticsearch.xpack.ilm.TimeSeriesDataStreamsIT
method: testSearchableSnapshotAction
issue: https://github.com/elastic/elasticsearch/issues/137167
Expand Down
5 changes: 3 additions & 2 deletions ...g/elasticsearch/compute/aggregation/DimensionValuesByteRefGroupingAggregatorFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,17 @@ public void addIntermediateInput(int positionOffset, IntVector groups, Page page
@Override
public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) {
int positionCount = selected.getPositionCount();
boolean allSelected = positionCount == maxGroupId + 1;
boolean allSelected = positionCount > maxGroupId;
if (allSelected) {
for (int i = 0; i < selected.getPositionCount(); i++) {
if (selected.getInt(i) == i) {
if (selected.getInt(i) != i) {
allSelected = false;
break;
}
}
}
if (allSelected) {
fillNullsUpTo(positionCount);
blocks[offset] = builder.build();
return;
}
Expand Down
17 changes: 10 additions & 7 deletions .../expression/function/aggregate/DimensionValuesByteRefGroupingAggregatorFunctionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,17 @@ public void testSimple() {
randomFrom(AggregatorMode.INITIAL, AggregatorMode.SINGLE),
List.of(0)
);
final List<BlockHash.GroupSpec> groupSpecs;
if (randomBoolean()) {
// Use IntBlockHash; reserves 0 for null values
groupSpecs = List.of(new BlockHash.GroupSpec(1, ElementType.INT));
} else {
// Use PackedValuesBlockHash; does not reserve 0 for null values
groupSpecs = List.of(new BlockHash.GroupSpec(1, ElementType.INT), new BlockHash.GroupSpec(1, ElementType.INT));
}
HashAggregationOperator hashAggregationOperator = new HashAggregationOperator(
List.of(aggregatorFactory),
() -> BlockHash.build(
List.of(new BlockHash.GroupSpec(1, ElementType.INT)),
driverContext.blockFactory(),
randomIntBetween(1, 1024),
randomBoolean()
),
() -> BlockHash.build(groupSpecs, driverContext.blockFactory(), randomIntBetween(1, 1024), randomBoolean()),
driverContext
);
List<Page> outputPages = new ArrayList<>();
Expand All @@ -99,7 +102,7 @@ public void testSimple() {
Map<Integer, List<BytesRef>> actualValues = new HashMap<>();
for (Page out : outputPages) {
IntBlock groups = out.getBlock(0);
BytesRefBlock valuesBlock = out.getBlock(1);
BytesRefBlock valuesBlock = out.getBlock(groupSpecs.size());
for (int p = 0; p < out.getPositionCount(); p++) {
int group = groups.getInt(p);
int valueCount = valuesBlock.getValueCount(p);
Expand Down