Skip to content
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

Jump to bottom

Unmute ValuesTests and reduce strings memory usage #111455

Merged
merged 3 commits into from
Jul 31, 2024
Merged

Unmute ValuesTests and reduce strings memory usage #111455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648a521
Unmute ValuesTests and reduce strings memory usage
ivancea Jul 30, 2024
bcef0d5
Merge branch 'main' into unmute-values-tests
ivancea Jul 31, 2024
5d3c49c
Removed unused comment
ivancea Jul 31, 2024
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
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,6 @@ tests:
issue: https://github.com/elastic/elasticsearch/issues/111280
- class: org.elasticsearch.xpack.repositories.metering.azure.AzureRepositoriesMeteringIT
issue: https://github.com/elastic/elasticsearch/issues/111307
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.ValuesTests
method: testGroupingAggregate {TestCase=<long unicode TEXTs>}
issue: https://github.com/elastic/elasticsearch/issues/111429
- class: org.elasticsearch.xpack.esql.expression.function.aggregate.ValuesTests
method: testGroupingAggregate {TestCase=<long unicode KEYWORDs>}
issue: https://github.com/elastic/elasticsearch/issues/111428
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
method: testSingleDoc {cluster=OLD}
issue: https://github.com/elastic/elasticsearch/issues/111430
Expand Down
83 changes: 54 additions & 29 deletions .../test/java/org/elasticsearch/xpack/esql/expression/function/MultiRowTestCaseSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,36 +469,61 @@ public static List<TypedDataSupplier> cartesianPointCases(int minRows, int maxRo
}

public static List<TypedDataSupplier> stringCases(int minRows, int maxRows, DataType type) {
return List.of(
new TypedDataSupplier("<empty " + type + "s>", () -> randomList(minRows, maxRows, () -> new BytesRef("")), type, false, true),
new TypedDataSupplier(
"<short alpha " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef(ESTestCase.randomAlphaOfLengthBetween(1, 30))),
type,
false,
true
),
new TypedDataSupplier(
"<long alpha " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef(ESTestCase.randomAlphaOfLengthBetween(300, 3000))),
type,
false,
true
),
new TypedDataSupplier(
"<short unicode " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef(ESTestCase.randomRealisticUnicodeOfLengthBetween(1, 30))),
type,
false,
true
),
new TypedDataSupplier(
"<long unicode " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef(ESTestCase.randomRealisticUnicodeOfLengthBetween(300, 3000))),
type,
false,
true
List<TypedDataSupplier> cases = new ArrayList<>();

cases.addAll(
List.of(
new TypedDataSupplier(
"<empty " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef("")),
type,
false,
true
),
new TypedDataSupplier(
"<short alpha " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef(ESTestCase.randomAlphaOfLengthBetween(1, 30))),
type,
false,
true
),
new TypedDataSupplier(
"<short unicode " + type + "s>",
() -> randomList(minRows, maxRows, () -> new BytesRef(ESTestCase.randomRealisticUnicodeOfLengthBetween(1, 30))),
type,
false,
true
)
)
);

if (minRows <= 100) {
var longStringsMaxRows = Math.min(maxRows, 100);

cases.addAll(
List.of(
new TypedDataSupplier(
"<long alpha " + type + "s>",
() -> randomList(minRows, longStringsMaxRows, () -> new BytesRef(ESTestCase.randomAlphaOfLengthBetween(300, 1000))),
type,
false,
true
),
new TypedDataSupplier(
"<long unicode " + type + "s>",
() -> randomList(
minRows,
longStringsMaxRows,
() -> new BytesRef(ESTestCase.randomRealisticUnicodeOfLengthBetween(300, 1000))
),
type,
false,
true
)
)
);
}

return cases;
}
}
5 changes: 2 additions & 3 deletions ...t/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountDistinctTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ public static Iterable<Object[]> parameters() {
MultiRowTestCaseSupplier.booleanCases(1, 1000),
MultiRowTestCaseSupplier.ipCases(1, 1000),
MultiRowTestCaseSupplier.versionCases(1, 1000),
// Lower values for strings, as they take more space and may trigger the circuit breaker
MultiRowTestCaseSupplier.stringCases(1, 100, DataType.KEYWORD),
MultiRowTestCaseSupplier.stringCases(1, 100, DataType.TEXT)
MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.KEYWORD),
MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.TEXT)
).flatMap(List::stream).forEach(fieldCaseSupplier -> {
// With precision
for (var precisionCaseSupplier : precisionSuppliers) {
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/CountTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public static Iterable<Object[]> parameters() {
MultiRowTestCaseSupplier.geoPointCases(1, 1000, true),
MultiRowTestCaseSupplier.cartesianPointCases(1, 1000, true),
// Lower values for strings, as they take more space and may trigger the circuit breaker
MultiRowTestCaseSupplier.stringCases(1, 100, DataType.KEYWORD),
MultiRowTestCaseSupplier.stringCases(1, 100, DataType.TEXT)
MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.KEYWORD),
MultiRowTestCaseSupplier.stringCases(1, 1000, DataType.TEXT)
).flatMap(List::stream).map(CountTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers));

// No rows
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ValuesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public static Iterable<Object[]> parameters() {
MultiRowTestCaseSupplier.ipCases(1, 1000),
MultiRowTestCaseSupplier.versionCases(1, 1000),
// Lower values for strings, as they take more space and may trigger the circuit breaker
MultiRowTestCaseSupplier.stringCases(1, 100, DataType.KEYWORD),
MultiRowTestCaseSupplier.stringCases(1, 100, DataType.TEXT)
MultiRowTestCaseSupplier.stringCases(1, 20, DataType.KEYWORD),
MultiRowTestCaseSupplier.stringCases(1, 20, DataType.TEXT)
).flatMap(List::stream).map(ValuesTests::makeSupplier).collect(Collectors.toCollection(() -> suppliers));

return parameterSuppliersFromTypedDataWithDefaultChecks(suppliers);
Expand Down