Skip to content

ES|QL: Fix generative tests - exclude unsupported fields (#132708) #132791

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 1 commit into from
Aug 13, 2025
Merged

ES|QL: Fix generative tests - exclude unsupported fields (#132708) #132791

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions ...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 @@ -38,7 +38,11 @@

public class EsqlQueryGenerator {

public record Column(String name, String type) {}
public static final String COLUMN_NAME = "name";
public static final String COLUMN_TYPE = "type";
public static final String COLUMN_ORIGINAL_TYPES = "original_types";

public record Column(String name, String type, List<String> originalTypes) {}

public record QueryExecuted(String query, int depth, List<Column> outputSchema, List<List<Object>> result, Exception exception) {}

Expand Down Expand Up @@ -290,7 +294,8 @@ public static boolean fieldCanBeUsed(Column field) {
// this is a known pathological case, no need to test it for now
|| field.name().equals("<no-fields>")
// no dense vectors for now, they are not supported in most commands
|| field.type().contains("vector")) == false;
|| field.type().contains("vector")
|| field.originalTypes.stream().anyMatch(x -> x.contains("vector"))) == false;
}

public static String unquote(String colName) {
Expand Down
20 changes: 17 additions & 3 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 @@ -29,6 +29,9 @@
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.ENRICH_POLICIES;
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.availableDatasetsForEs;
import static org.elasticsearch.xpack.esql.CsvTestsDataLoader.loadDataSetIntoEs;
import static org.elasticsearch.xpack.esql.qa.rest.generative.EsqlQueryGenerator.COLUMN_NAME;
import static org.elasticsearch.xpack.esql.qa.rest.generative.EsqlQueryGenerator.COLUMN_ORIGINAL_TYPES;
import static org.elasticsearch.xpack.esql.qa.rest.generative.EsqlQueryGenerator.COLUMN_TYPE;

public abstract class GenerativeRestTest extends ESRestTestCase {

Expand Down Expand Up @@ -194,12 +197,23 @@ private EsqlQueryGenerator.QueryExecuted execute(String command, int depth) {
}

@SuppressWarnings("unchecked")
private List<EsqlQueryGenerator.Column> outputSchema(Map<String, Object> a) {
List<Map<String, String>> cols = (List<Map<String, String>>) a.get("columns");
private static List<EsqlQueryGenerator.Column> outputSchema(Map<String, Object> a) {
List<Map<String, ?>> cols = (List<Map<String, ?>>) a.get("columns");
if (cols == null) {
return null;
}
return cols.stream().map(x -> new EsqlQueryGenerator.Column(x.get("name"), x.get("type"))).collect(Collectors.toList());
return cols.stream()
.map(x -> new EsqlQueryGenerator.Column((String) x.get(COLUMN_NAME), (String) x.get(COLUMN_TYPE), originalTypes(x)))
.collect(Collectors.toList());
}

@SuppressWarnings("unchecked")
private static List<String> originalTypes(Map<String, ?> x) {
List<String> originalTypes = (List<String>) x.get(COLUMN_ORIGINAL_TYPES);
if (originalTypes == null) {
return List.of();
}
return originalTypes;
}

private List<String> availableIndices() throws IOException {
Expand Down