remove esql legacy feature

martijnvg · Oct 30, 2024 · 1f7d29b · 1f7d29b
1 parent 95aa2fd
commit 1f7d29b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/...rade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java b/...rade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java
@@ -72,10 +72,7 @@ public LogsdbIndexingRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes)
     }
 
     public void testIndexing() throws Exception {
-        assumeTrue(
-            "Logsdb is tech preview since 8.15.0",
-            getOldClusterTestVersion().onOrAfter("8.15.0")
-        );
+        assumeTrue("Logsdb is tech preview since 8.15.0", getOldClusterTestVersion().onOrAfter("8.15.0"));
         String dataStreamName = "logs-bwc-test";
         if (isOldCluster()) {
             startTrial();

diff --git a/...pgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TsdbIndexingRollingUpgradeIT.java b/...pgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TsdbIndexingRollingUpgradeIT.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.client.Request;
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.test.rest.ObjectPath;
-import org.elasticsearch.test.rest.RestTestLegacyFeatures;
 
 import java.time.Instant;
 import java.util.Locale;
@@ -43,7 +42,7 @@ public TsdbIndexingRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
     }
 
     public void testIndexing() throws Exception {
-        assumeTrue("test relies in es|ql", oldClusterHasFeature(RestTestLegacyFeatures.ES_QL_GA));
+        assumeTrue("test relies in es|ql", getOldClusterTestVersion().onOrAfter("8.14.0"));
         String dataStreamName = "k9s";
         if (isOldCluster()) {
             startTrial();

diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java b/test/framework/src/main/java/org/elasticsearch/test/rest/RestTestLegacyFeatures.java
@@ -126,8 +126,6 @@ public class RestTestLegacyFeatures implements FeatureSpecification {
     @UpdateForV9
     public static final NodeFeature ML_NLP_SUPPORTED = new NodeFeature("ml.nlp_supported");
 
-    public static final NodeFeature ES_QL_GA = new NodeFeature("esql.ga");
-
     /*
      * Starting with 8.11, cluster state has minimum system index mappings versions (#99307) and the system index mappings upgrade service
      * started using them to determine when to update mappings for system indices. See https://github.com/elastic/elasticsearch/pull/99668
@@ -186,8 +184,7 @@ public Map<NodeFeature, Version> getHistoricalFeatures() {
             entry(NEW_DATA_STREAMS_INDEX_NAME_FORMAT, Version.V_7_11_0),
             entry(DISABLE_FIELD_NAMES_FIELD_REMOVED, Version.V_8_0_0),
             entry(ML_NLP_SUPPORTED, Version.V_8_0_0),
-            entry(MAPPINGS_UPGRADE_SERVICE_USES_MAPPINGS_VERSION, Version.V_8_11_0),
-            entry(ES_QL_GA, Version.V_8_14_0)
+            entry(MAPPINGS_UPGRADE_SERVICE_USES_MAPPINGS_VERSION, Version.V_8_11_0)
         );
     }
 }