Skip to content

Fix generative tests #129833

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 2 commits into from
Jun 23, 2025
Merged

Fix generative tests #129833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3dbf44
Fix generative tests
luigidellaquila Jun 23, 2025
4ee0107
Merge branch 'main' into esql/fix_generative_tests_20250623
luigidellaquila Jun 23, 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
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 @@ -574,9 +574,6 @@ tests:
- class: org.elasticsearch.search.query.RescoreKnnVectorQueryIT
method: testKnnRetriever
issue: https://github.com/elastic/elasticsearch/issues/129818
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
method: test
issue: https://github.com/elastic/elasticsearch/issues/129819
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
method: testAbortingOrRunningMergeTaskHoldsUpBudget
issue: https://github.com/elastic/elasticsearch/issues/129823
Expand Down
2 changes: 1 addition & 1 deletion ...ver/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/EsqlQueryGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public static String agg(List<Column> previousOutput) {
};
}
// all types
name = randomName(previousOutput);
name = randomBoolean() ? randomStringField(previousOutput) : randomNumericOrDateField(previousOutput);
if (name == null) {
return "count(*)";
}
Expand Down
11 changes: 9 additions & 2 deletions ...ava/org/elasticsearch/xpack/esql/qa/rest/generative/command/pipe/LookupJoinGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,15 @@ public ValidationResult validateOutput(
}

// the -1 is for the additional RENAME, that could drop one column
if (previousColumns.size() - 1 > columns.size()) {
return new ValidationResult(false, "Expecting at least [" + previousColumns.size() + "] columns, got [" + columns.size() + "]");
int prevCols = previousColumns.size() - 1;

if (previousColumns.stream().anyMatch(x -> x.name().equals("<all-fields-projected>"))) {
// known bug https://github.com/elastic/elasticsearch/issues/121741
prevCols--;
}

if (prevCols > columns.size()) {
return new ValidationResult(false, "Expecting at least [" + prevCols + "] columns, got [" + columns.size() + "]");
}
return VALIDATION_OK;
}
Expand Down