Skip to content

Commit 652066d

Browse files
authored
ESQL: Entirely drop version field (#109169)
This field is no longer supported.
1 parent 66e0b00 commit 652066d

File tree

3 files changed

+13
-34
lines changed

3 files changed

+13
-34
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/RequestXContent.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ final class RequestXContent {
4646
PARAM_PARSER.declareString(constructorArg(), TYPE);
4747
}
4848

49-
static final ParseField ESQL_VERSION_FIELD = new ParseField("version");
5049
static final ParseField QUERY_FIELD = new ParseField("query");
5150
private static final ParseField COLUMNAR_FIELD = new ParseField("columnar");
5251
private static final ParseField FILTER_FIELD = new ParseField("filter");
@@ -73,7 +72,6 @@ static EsqlQueryRequest parseAsync(XContentParser parser) {
7372
}
7473

7574
private static void objectParserCommon(ObjectParser<EsqlQueryRequest, ?> parser) {
76-
parser.declareString((str, consumer) -> {}, ESQL_VERSION_FIELD);
7775
parser.declareString(EsqlQueryRequest::query, QUERY_FIELD);
7876
parser.declareBoolean(EsqlQueryRequest::columnar, COLUMNAR_FIELD);
7977
parser.declareObject(EsqlQueryRequest::filter, (p, c) -> AbstractQueryBuilder.parseTopLevelQuery(p), FILTER_FIELD);

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryRequestTests.java

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -149,41 +149,10 @@ public void testRejectUnknownFields() {
149149
}""", "unknown field [asdf]");
150150
}
151151

152-
public void testAnyVersionIsValid() throws IOException {
153-
String validVersionString = randomAlphaOfLength(5);
154-
155-
String json = String.format(Locale.ROOT, """
156-
{
157-
"version": "%s",
158-
"query": "ROW x = 1"
159-
}
160-
""", validVersionString);
161-
162-
EsqlQueryRequest request = parseEsqlQueryRequest(json, randomBoolean());
163-
assertNull(request.validate());
164-
165-
request = parseEsqlQueryRequestAsync(json);
166-
assertNull(request.validate());
167-
}
168-
169-
public void testMissingVersionIsValid() throws IOException {
170-
String missingVersion = randomBoolean() ? "" : ", \"version\": \"\"";
171-
String json = String.format(Locale.ROOT, """
172-
{
173-
"columnar": true,
174-
"query": "row x = 1"
175-
%s
176-
}""", missingVersion);
177-
178-
EsqlQueryRequest request = parseEsqlQueryRequest(json, randomBoolean());
179-
assertNull(request.validate());
180-
}
181-
182152
public void testMissingQueryIsNotValid() throws IOException {
183153
String json = """
184154
{
185-
"columnar": true,
186-
"version": "snapshot"
155+
"columnar": true
187156
}""";
188157
EsqlQueryRequest request = parseEsqlQueryRequest(json, randomBoolean());
189158
assertNotNull(request.validate());

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,15 @@ setup:
333333
- match: {values.0: ["1",2.0,null,true,123,123]}
334334
- match: {values.1: ["1",2.0,null,true,123,123]}
335335
- match: {values.2: ["1",2.0,null,true,123,123]}
336+
337+
---
338+
version is not allowed:
339+
- requires:
340+
cluster_features: ["gte_v8.14.0"]
341+
reason: version allowed in 8.13.latest
342+
- do:
343+
catch: /unknown field \[version\]/
344+
esql.query:
345+
body:
346+
query: 'from test'
347+
version: cat

0 commit comments

Comments
 (0)