Skip to content

[8.x] [ESQL] Make sure we built consistent OrdinalBytesRefBlock in BlockHashRandomizedTests (#115081) #115270

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
elasticsearchmachine merged 1 commit into from
Oct 21, 2024
Merged

[8.x] [ESQL] Make sure we built consistent OrdinalBytesRefBlock in BlockHashRandomizedTests (#115081) #115270

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
19 changes: 10 additions & 9 deletions ...c/test/java/org/elasticsearch/compute/aggregation/blockhash/BlockHashRandomizedTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,17 +475,14 @@ public ElementType elementType() {

@Override
public BasicBlockTests.RandomBlock randomBlock(int positionCount, int maxValuesPerPosition, int dups) {
List<Map.Entry<String, Integer>> dictionary = new ArrayList<>();
Map<String, Integer> dictionary = new HashMap<>();
Set<String> keys = dictionary(maxValuesPerPosition);
List<List<Object>> values = new ArrayList<>(positionCount);
try (
IntBlock.Builder ordinals = TestBlockFactory.getNonBreakingInstance()
.newIntBlockBuilder(positionCount * maxValuesPerPosition);
BytesRefVector.Builder bytes = TestBlockFactory.getNonBreakingInstance().newBytesRefVectorBuilder(maxValuesPerPosition);
) {
for (String value : dictionary(maxValuesPerPosition)) {
bytes.appendBytesRef(new BytesRef(value));
dictionary.add(Map.entry(value, dictionary.size()));
}
for (int p = 0; p < positionCount; p++) {
int valueCount = between(1, maxValuesPerPosition);
int dupCount = between(0, dups);
Expand All @@ -497,10 +494,14 @@ public BasicBlockTests.RandomBlock randomBlock(int positionCount, int maxValuesP
ordinals.beginPositionEntry();
}
for (int v = 0; v < valueCount; v++) {
Map.Entry<String, Integer> value = randomFrom(dictionary);
valuesAtPosition.add(new BytesRef(value.getKey()));
ordinals.appendInt(value.getValue());
ordsAtPosition.add(value.getValue());
String key = randomFrom(keys);
int ordinal = dictionary.computeIfAbsent(key, k -> {
bytes.appendBytesRef(new BytesRef(k));
return dictionary.size();
});
valuesAtPosition.add(new BytesRef(key));
ordinals.appendInt(ordinal);
ordsAtPosition.add(ordinal);
}
for (int v = 0; v < dupCount; v++) {
ordinals.appendInt(randomFrom(ordsAtPosition));
Expand Down