Skip to content

ES|QL: fix validation in generative tests #142638

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
luigidellaquila merged 2 commits into from
Feb 18, 2026
Merged

ES|QL: fix validation in generative tests #142638

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
7fc1eee
ES|QL: fix validation in generative tests
luigidellaquila Feb 18, 2026
98f1717
Merge branch 'main' into esql/fix_generative_validation
luigidellaquila Feb 18, 2026
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
4 changes: 2 additions & 2 deletions ...ver/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeRestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,14 @@ public void test() throws IOException {
var exec = new EsqlQueryGenerator.Executor() {
@Override
public void run(CommandGenerator generator, CommandGenerator.CommandDescription current) {
previousCommands.add(current);
final String command = current.commandString();

final QueryExecuted result = previousResult == null
? execute(command, 0)
: execute(previousResult.query() + command, previousResult.depth());

final boolean hasException = result.exception() != null;
if (hasException || checkResults(List.of(), generator, current, previousResult, result).success() == false) {
if (hasException || checkResults(previousCommands, generator, current, previousResult, result).success() == false) {
if (hasException) {
checkException(result);
}
Expand All @@ -192,6 +191,7 @@ public void run(CommandGenerator generator, CommandGenerator.CommandDescription
continueExecuting = true;
currentSchema = result.outputSchema();
}
previousCommands.add(current);
previousResult = result;
}

Expand Down
11 changes: 10 additions & 1 deletion ...xtures/src/main/java/org/elasticsearch/xpack/esql/generator/command/CommandGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.elasticsearch.xpack.esql.CsvTestsDataLoader;
import org.elasticsearch.xpack.esql.generator.Column;
import org.elasticsearch.xpack.esql.generator.EsqlQueryGenerator;
import org.elasticsearch.xpack.esql.generator.FunctionGenerator;
import org.elasticsearch.xpack.esql.generator.LookupIdx;
import org.elasticsearch.xpack.esql.generator.QueryExecutor;

Expand Down Expand Up @@ -119,7 +120,15 @@ static ValidationResult expectSameRowCount(
return VALIDATION_OK;
}

static ValidationResult expectSameColumns(List<Column> previousColumns, List<Column> columns) {
static ValidationResult expectSameColumns(
List<CommandDescription> previousCommands,
List<Column> previousColumns,
List<Column> columns
) {

if (FunctionGenerator.isUnmappedFieldsEnabled(previousCommands)) {
return VALIDATION_OK;
}
Comment on lines +123 to +131
Copy link
Copy Markdown
Contributor

@ivancea ivancea Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM as a temporary fix, but the method now doesn't do what it says it will, and it doesn't feel good.
In theory, unmapped fields should be detected in the expectation an increase the expected column count (I think it's possible?).
But I think it's fine to have it as a continuation or an issue. Specially with unmapped field being very new


if (previousColumns.stream().anyMatch(x -> x.name().contains("<all-fields-projected>"))) {
return VALIDATION_OK; // known bug
Expand Down
4 changes: 3 additions & 1 deletion ...ures/src/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/EvalGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import org.elasticsearch.xpack.esql.generator.Column;
import org.elasticsearch.xpack.esql.generator.EsqlQueryGenerator;
import org.elasticsearch.xpack.esql.generator.FunctionGenerator;
import org.elasticsearch.xpack.esql.generator.QueryExecutor;
import org.elasticsearch.xpack.esql.generator.command.CommandGenerator;

Expand Down Expand Up @@ -89,7 +90,8 @@ public ValidationResult validateOutput(
List<String> expectedColumns = (List<String>) commandDescription.context().get(NEW_COLUMNS);
List<String> resultColNames = columns.stream().map(Column::name).toList();
List<String> lastColumns = resultColNames.subList(resultColNames.size() - expectedColumns.size(), resultColNames.size());
if (columns.size() < expectedColumns.size() || lastColumns.equals(expectedColumns) == false) {
if (FunctionGenerator.isUnmappedFieldsEnabled(previousCommands) == false
&& (columns.size() < expectedColumns.size() || lastColumns.equals(expectedColumns) == false)) {
return new ValidationResult(
false,
"Expecting the following as last columns ["
Expand Down
2 changes: 1 addition & 1 deletion ...res/src/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/LimitGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ public ValidationResult validateOutput(
if (output.size() > limit) {
return new ValidationResult(false, "Expecting at most [" + limit + "] records, got [" + output.size() + "]");
}
return CommandGenerator.expectSameColumns(previousColumns, columns);
return CommandGenerator.expectSameColumns(previousCommands, previousColumns, columns);
}
}
6 changes: 3 additions & 3 deletions ...rc/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/LookupJoinGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public CommandDescription generate(
}
}
String cmdString = stringBuilder.toString();
return new CommandDescription(LOOKUP_JOIN, this, cmdString, Map.of());
return new CommandDescription(LOOKUP_JOIN, this, cmdString, Map.of("nKeys", keyNames.size()));
}

@Override
Expand All @@ -107,8 +107,8 @@ public ValidationResult validateOutput(
return VALIDATION_OK;
}

// the -1 is for the additional RENAME, that could drop one column
int prevCols = previousColumns.size() - 1;
// this is for the additional RENAME, that could drop columns
int prevCols = previousColumns.size() - (Integer) commandDescription.context().get("nKeys");

if (previousColumns.stream().anyMatch(x -> x.name().equals("<all-fields-projected>"))) {
// known bug https://github.com/elastic/elasticsearch/issues/121741
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/MvExpandGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public ValidationResult validateOutput(
if (commandDescription == EMPTY_DESCRIPTION) {
return VALIDATION_OK;
}
return CommandGenerator.expectSameColumns(previousColumns, columns);
return CommandGenerator.expectSameColumns(previousCommands, previousColumns, columns);
}

}
2 changes: 1 addition & 1 deletion ...es/src/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/SampleGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ public ValidationResult validateOutput(
List<Column> columns,
List<List<Object>> output
) {
return CommandGenerator.expectSameColumns(previousColumns, columns);
return CommandGenerator.expectSameColumns(previousCommands, previousColumns, columns);
}
}
2 changes: 1 addition & 1 deletion ...ures/src/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/SortGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ public ValidationResult validateOutput(
List<Column> columns,
List<List<Object>> output
) {
return CommandGenerator.expectSameColumns(previousColumns, columns);
return CommandGenerator.expectSameColumns(previousCommands, previousColumns, columns);
}
}
2 changes: 1 addition & 1 deletion ...res/src/main/java/org/elasticsearch/xpack/esql/generator/command/pipe/WhereGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ public ValidationResult validateOutput(
List<Column> columns,
List<List<Object>> output
) {
return CommandGenerator.expectSameColumns(previousColumns, columns);
return CommandGenerator.expectSameColumns(previousCommands, previousColumns, columns);
}
}