Skip to content

Flaky MetricAggregatorTests #18331

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
merged 6 commits into from
May 22, 2025
Merged

Flaky MetricAggregatorTests #18331

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33d077b
flaky test repo
ajleong623 May 19, 2025
501fbcb
spotless
ajleong623 May 19, 2025
d8d7a58
cleaned up code with methods, changed how keyword terms are handles i…
ajleong623 May 20, 2025
148772b
small changes
ajleong623 May 20, 2025
e73ce8c
nonconsequential change
ajleong623 May 20, 2025
eb7f003
revert recent change
ajleong623 May 20, 2025
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
27 changes: 18 additions & 9 deletions server/src/test/java/org/opensearch/search/aggregations/startree/MetricAggregatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ protected Codec getCodec(
return new Composite101Codec(Lucene101Codec.Mode.BEST_SPEED, mapperService, testLogger);
}

@AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/18110")
public void testStarTreeDocValues() throws IOException {
final List<Supplier<Integer>> MAX_LEAF_DOC_VARIATIONS = List.of(
() -> 1,
Expand Down Expand Up @@ -555,26 +554,36 @@ public QueryBuilder getTermsQueryBuilder() {
}

public QueryBuilder getRangeQueryBuilder() {
return new RangeQueryBuilder(fieldName).from(valueSupplier.get())
RangeQueryBuilder qb = new RangeQueryBuilder(fieldName).from(valueSupplier.get())
.to(valueSupplier.get())
.includeLower(randomBoolean())
.includeUpper(randomBoolean());
return qb;
}

public QueryBuilder getBoolQueryBuilder() {
// MUST only
BoolQueryBuilder mustOnly = new BoolQueryBuilder().must(getTermQueryBuilder()).must(getRangeQueryBuilder());
BoolQueryBuilder mustOnly = new BoolQueryBuilder().must(getTermQueryBuilder());
// Keyword terms are not always supported for range queries.
if (fieldType.equals(DimensionTypes.KEYWORD.name().toLowerCase(Locale.ROOT))) {
mustOnly.must(getTermQueryBuilder());
} else {
mustOnly.must(getRangeQueryBuilder());
}

// MUST with nested SHOULD on same dimension
BoolQueryBuilder mustWithShould = new BoolQueryBuilder().must(getTermQueryBuilder())
.must(
new BoolQueryBuilder().should(new TermQueryBuilder(fieldName, valueSupplier.get()))
.should(new TermQueryBuilder(fieldName, valueSupplier.get()))
);
.must(new BoolQueryBuilder().should(getTermQueryBuilder()).should(getTermQueryBuilder()));

// SHOULD only on same dimension
BoolQueryBuilder shouldOnly = new BoolQueryBuilder().should(new TermQueryBuilder(fieldName, valueSupplier.get()))
.should(new RangeQueryBuilder(fieldName).from(valueSupplier.get()).to(valueSupplier.get()));
BoolQueryBuilder shouldOnly = new BoolQueryBuilder().should(getTermQueryBuilder());

// Keyword terms are not always supported for range queries.
if (fieldType.equals(DimensionTypes.KEYWORD.name().toLowerCase(Locale.ROOT))) {
shouldOnly.should(getTermQueryBuilder());
} else {
shouldOnly.should(getRangeQueryBuilder());
}

return randomFrom(mustOnly, mustWithShould, shouldOnly);
}
Expand Down
Loading