elastic · nik9000 · May 6, 2024 · May 6, 2024
diff --git a/docs/reference/esql/metadata-fields.asciidoc b/docs/reference/esql/metadata-fields.asciidoc
@@ -34,11 +34,11 @@ like other index fields:
 
 [source.merge.styled,esql]
 ----
-include::{esql-specs}/metadata-IT_tests_only.csv-spec[tag=multipleIndices]
+include::{esql-specs}/metadata.csv-spec[tag=multipleIndices]
 ----
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-include::{esql-specs}/metadata-IT_tests_only.csv-spec[tag=multipleIndices-result]
+include::{esql-specs}/metadata.csv-spec[tag=multipleIndices-result]
 |===
 
 Similar to index fields, once an aggregation is performed, a
@@ -47,9 +47,9 @@ used as a grouping field:
 
 [source.merge.styled,esql]
 ----
-include::{esql-specs}/metadata-IT_tests_only.csv-spec[tag=metaIndexInAggs]
+include::{esql-specs}/metadata.csv-spec[tag=metaIndexInAggs]
 ----
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-include::{esql-specs}/metadata-IT_tests_only.csv-spec[tag=metaIndexInAggs-result]
+include::{esql-specs}/metadata.csv-spec[tag=metaIndexInAggs-result]
 |===
diff --git a/...resources/metadata-IT_tests_only.csv-spec → ...ures/src/main/resources/metadata.csv-spec b/...resources/metadata-IT_tests_only.csv-spec → ...ures/src/main/resources/metadata.csv-spec
@@ -1,30 +1,32 @@
-
-simpleKeep#[skip:-8.12.99]
+simpleKeep
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | sort emp_no | limit 2 | keep emp_no, _index, _version;
 
 emp_no:integer |_index:keyword |_version:long
 10001          |employees      |1
 10002          |employees      |1
 ;
 
-aliasWithSameName#[skip:-8.12.99]
+aliasWithSameName
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | sort emp_no | limit 2 | eval _index = _index, _version = _version | keep emp_no, _index, _version;
 
 emp_no:integer |_index:keyword |_version:long
 10001          |employees      |1
 10002          |employees      |1
 ;
 
-inComparison#[skip:-8.12.99]
+inComparison
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | sort emp_no | where _index == "employees" | where _version == 1 | keep emp_no | limit 2;
 
-
 emp_no:integer
 10001
 10002
 ;
 
-metaIndexInAggs#[skip:-8.12.99]
+metaIndexInAggs
+required_feature: esql.metadata_fields
 // tag::metaIndexInAggs[]
 FROM employees METADATA _index, _id
 | STATS max = MAX(emp_no) BY _index
@@ -37,73 +39,83 @@ max:integer |_index:keyword
 // end::metaIndexInAggs-result[]
 ;
 
-metaIndexAliasedInAggs#[skip:-8.12.99]
+metaIndexAliasedInAggs
+required_feature: esql.metadata_fields
 from employees metadata _index | eval _i = _index | stats max = max(emp_no) by _i;
 
 
 max:integer |_i:keyword
 10100       |employees
 ;
 
-metaVersionInAggs#[skip:-8.12.99]
+metaVersionInAggs
+required_feature: esql.metadata_fields
 from employees metadata _version | stats min = min(emp_no) by _version;
 
 min:integer |_version:long
 10001       |1
 ;
 
-metaVersionAliasedInAggs#[skip:-8.12.99]
+metaVersionAliasedInAggs
+required_feature: esql.metadata_fields
 from employees metadata _version | eval _v = _version | stats min = min(emp_no) by _v;
 
 min:integer |_v:long
 10001       |1
 ;
 
-inAggsAndAsGroups#[skip:-8.12.99]
+inAggsAndAsGroups
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | stats max = max(_version) by _index;
 
 max:long |_index:keyword
 1        |employees
 ;
 
-inAggsAndAsGroupsAliased#[skip:-8.12.99]
+inAggsAndAsGroupsAliased
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | eval _i = _index, _v = _version | stats max = max(_v) by _i;
 
 max:long |_i:keyword
 1        |employees
 ;
 
-inFunction#[skip:-8.12.99]
+inFunction
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | sort emp_no | where length(_index) == length("employees") | where abs(_version) == 1 | keep emp_no | limit 2;
 
 emp_no:integer
 10001
 10002
 ;
 
-inArithmetics#[skip:-8.12.99]
+inArithmetics
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | eval i = _version + 2 | stats min = min(emp_no) by i;
 
 min:integer |i:long
 10001       |3
 ;
 
-inSort#[skip:-8.12.99]
+inSort
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | sort _version, _index, emp_no | keep emp_no, _version, _index | limit 2;
 
 emp_no:integer |_version:long |_index:keyword
 10001          |1             |employees
 10002          |1             |employees
 ;
 
-withMvFunction#[skip:-8.12.99]
+withMvFunction
+required_feature: esql.metadata_fields
 from employees metadata _version | eval i = mv_avg(_version) + 2 | stats min = min(emp_no) by i;
 
 min:integer |i:double
 10001       |3.0
 ;
 
-overwritten#[skip:-8.12.99]
+overwritten
+required_feature: esql.metadata_fields
 from employees metadata _index, _version | sort emp_no | eval _index = 3, _version = "version" | keep emp_no, _index, _version | limit 3;
 
 emp_no:integer |_index:integer |_version:keyword
@@ -112,7 +124,8 @@ emp_no:integer |_index:integer |_version:keyword
 10003          |3              |version
 ;
 
-multipleIndices#[skip:-8.12.99]
+multipleIndices
+required_feature: esql.metadata_fields
 // tag::multipleIndices[]
 FROM ul_logs, apps METADATA _index, _version
 | WHERE id IN (13, 14) AND _version == 1

diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlFeatures.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlFeatures.java
@@ -110,6 +110,11 @@ public class EsqlFeatures implements FeatureSpecification {
      */
     public static final NodeFeature BASE64_DECODE_ENCODE = new NodeFeature("esql.base64_decode_encode");
 
+    /**
+     * Support for metadata fields.
+     */
+    public static final NodeFeature METADATA_FIELDS = new NodeFeature("esql.metadata_fields");
+
     @Override
     public Set<NodeFeature> getFeatures() {
         return Set.of(
@@ -126,7 +131,8 @@ public Set<NodeFeature> getFeatures() {
             ST_INTERSECTS,
             ST_CONTAINS_WITHIN,
             ST_DISJOINT,
-            STRING_LITERAL_AUTO_CASTING
+            STRING_LITERAL_AUTO_CASTING,
+            METADATA_FIELDS
         );
     }
 

diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
@@ -72,6 +72,7 @@
 import org.elasticsearch.xpack.esql.planner.Mapper;
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
 import org.elasticsearch.xpack.esql.planner.TestPhysicalOperationProviders;
+import org.elasticsearch.xpack.esql.plugin.EsqlFeatures;
 import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.session.EsqlConfiguration;
 import org.elasticsearch.xpack.esql.stats.DisabledSearchStats;
@@ -216,11 +217,13 @@ public CsvTests(String fileName, String groupName, String testName, Integer line
 
     public final void test() throws Throwable {
         try {
+            assumeTrue("Test " + testName + " is not enabled", isEnabled(testName, Version.CURRENT));
+
             /*
-             * We're intentionally not NodeFeatures here because we expect all
-             * of the features to be supported in this unit test.
+             * The csv tests support all but a few features. The unsupported features
+             * are tested in integration tests.
              */
-            assumeTrue("Test " + testName + " is not enabled", isEnabled(testName, Version.CURRENT));
+            assumeFalse("metadata fields aren't supported", testCase.requiredFeatures.contains(EsqlFeatures.METADATA_FIELDS.id()));
             doTest();
         } catch (Throwable th) {
             throw reworkException(th);