Skip to content

Commit 77ae632

Browse files
committed
skip <8.16
And fix release tests
1 parent d831a9f commit 77ae632

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

x-pack/plugin/esql/qa/server/mixed-cluster/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/mixed/FieldExtractorIT.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.elasticsearch.index.mapper.MappedFieldType;
1313
import org.elasticsearch.test.TestClustersThreadFilter;
1414
import org.elasticsearch.test.cluster.ElasticsearchCluster;
15+
import org.elasticsearch.test.cluster.util.Version;
1516
import org.elasticsearch.xpack.esql.qa.rest.FieldExtractorTestCase;
1617
import org.hamcrest.Matcher;
1718
import org.junit.ClassRule;
@@ -40,4 +41,9 @@ protected Matcher<Integer> pidMatcher() {
4041
return preference == MappedFieldType.FieldExtractPreference.STORED ? anyOf(equalTo(111), nullValue()) : nullValue(Integer.class);
4142
}
4243

44+
@Override
45+
protected void canUsePragmasOk() {
46+
Version oldVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
47+
assumeTrue("pragma ok not supported", oldVersion.onOrAfter("8.16.0"));
48+
}
4349
}

x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/FieldExtractorIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,9 @@ public FieldExtractorIT(MappedFieldType.FieldExtractPreference preference) {
2828
protected String getTestRestCluster() {
2929
return cluster.getHttpAddresses();
3030
}
31+
32+
@Override
33+
protected void canUsePragmasOk() {
34+
// always ok
35+
}
3136
}

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/FieldExtractorIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,9 @@ public FieldExtractorIT(MappedFieldType.FieldExtractPreference preference) {
2828
protected String getTestRestCluster() {
2929
return cluster.getHttpAddresses();
3030
}
31+
32+
@Override
33+
protected void canUsePragmasOk() {
34+
// always can use
35+
}
3136
}

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/FieldExtractorTestCase.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,11 +1750,14 @@ private String deyaml(String err) {
17501750
private Map<String, Object> runEsql(String query) throws IOException {
17511751
RestEsqlTestCase.RequestObjectBuilder request = new RestEsqlTestCase.RequestObjectBuilder().query(query);
17521752
if (preference != null) {
1753+
canUsePragmasOk();
17531754
request = request.pragmas(
17541755
Settings.builder().put(QueryPragmas.FIELD_EXTRACT_PREFERENCE.getKey(), preference.toString()).build()
17551756
);
17561757
request.pragmasOk();
17571758
}
17581759
return runEsqlSync(request);
17591760
}
1761+
1762+
protected abstract void canUsePragmasOk();
17601763
}

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ setup:
218218
- gt: {esql.functions.to_long: $functions_to_long}
219219
- match: {esql.functions.coalesce: $functions_coalesce}
220220
- gt: {esql.functions.categorize: $functions_categorize}
221-
- length: {esql.functions: 131} # check the "sister" test above for a likely update to the same esql.functions length check
221+
- length: {esql.functions: 132} # check the "sister" test above for a likely update to the same esql.functions length check
222222

223223
---
224224
took:

0 commit comments

Comments
 (0)