From 9cdae44a6943c204f8f3abf1254fbcc40b0efcf8 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Fri, 28 Nov 2025 14:43:37 +0000 Subject: [PATCH 1/5] Check FeatureFlag for skipper tests in MapperTestCase --- .../main/java/org/elasticsearch/index/mapper/MapperTestCase.java | 1 + 1 file changed, 1 insertion(+) diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java index ae1df6578e876..c3bee6b01fd0e 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java @@ -1853,6 +1853,7 @@ protected boolean supportsDocValuesSkippers() { public void testDocValuesSkippers() throws IOException { assumeTrue("Mapper does not support doc values skippers", supportsDocValuesSkippers()); + assumeTrue("FeatureFlag disabled", IndexSettings.DOC_VALUES_SKIPPER); IndexVersion preSkipperVersion = IndexVersionUtils.randomPreviousCompatibleVersion( random(), From c3b5a3ff9340abcd7bf5bd4c87b45ecc10f547fb Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Fri, 28 Nov 2025 15:26:00 +0000 Subject: [PATCH 2/5] Gate cluster feature as well --- .../java/org/elasticsearch/index/mapper/MapperFeatures.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java index a0992a114dce1..a29113827d496 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java @@ -11,6 +11,7 @@ import org.elasticsearch.features.FeatureSpecification; import org.elasticsearch.features.NodeFeature; +import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.codec.vectors.es93.ES93GenericFlatVectorsFormat; import java.util.HashSet; @@ -111,13 +112,16 @@ public Set getTestFeatures() { BASE64_DENSE_VECTORS, FIX_DENSE_VECTOR_WRONG_FIELDS, BBQ_DISK_STATS_SUPPORT, - SKIPPERS_ON_UNINDEXED_FIELDS, STORED_FIELDS_SPEC_MERGE_BUG ); if (ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()) { features = new HashSet<>(features); features.add(GENERIC_VECTOR_FORMAT); } + if (IndexSettings.DOC_VALUES_SKIPPER) { + features = new HashSet<>(features); + features.add(SKIPPERS_ON_UNINDEXED_FIELDS); + } return features; } } From 0530c4437bfa4ae65e11206eac2063e5700a0144 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Fri, 28 Nov 2025 16:10:20 +0000 Subject: [PATCH 3/5] iter --- .../elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java | 1 + .../test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java | 1 + 2 files changed, 2 insertions(+) diff --git a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java index f517e52ce423a..44c40d03fa29e 100644 --- a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java +++ b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java @@ -97,6 +97,7 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase { .setting("xpack.license.self_generated.type", "trial") .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.SYNTHETIC_VECTORS) + .feature(FeatureFlag.DOC_VALUES_SKIPPER) .feature(FeatureFlag.GENERIC_VECTOR_FORMAT); private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local() diff --git a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java index 7d1ed9d92238a..c55b346740e04 100644 --- a/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java +++ b/qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java @@ -97,6 +97,7 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase { .feature(FeatureFlag.TIME_SERIES_MODE) .feature(FeatureFlag.SYNTHETIC_VECTORS) .feature(FeatureFlag.GENERIC_VECTOR_FORMAT) + .feature(FeatureFlag.DOC_VALUES_SKIPPER) .user("test_admin", "x-pack-test-password"); private static ElasticsearchCluster fulfillingCluster = ElasticsearchCluster.local() From 2d3ee5a4f8d854ba5133c6525a2c45127dcae1a5 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Fri, 28 Nov 2025 16:13:43 +0000 Subject: [PATCH 4/5] bleh --- .../java/org/elasticsearch/index/mapper/MapperFeatures.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java index a29113827d496..a0992a114dce1 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java @@ -11,7 +11,6 @@ import org.elasticsearch.features.FeatureSpecification; import org.elasticsearch.features.NodeFeature; -import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.codec.vectors.es93.ES93GenericFlatVectorsFormat; import java.util.HashSet; @@ -112,16 +111,13 @@ public Set getTestFeatures() { BASE64_DENSE_VECTORS, FIX_DENSE_VECTOR_WRONG_FIELDS, BBQ_DISK_STATS_SUPPORT, + SKIPPERS_ON_UNINDEXED_FIELDS, STORED_FIELDS_SPEC_MERGE_BUG ); if (ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()) { features = new HashSet<>(features); features.add(GENERIC_VECTOR_FORMAT); } - if (IndexSettings.DOC_VALUES_SKIPPER) { - features = new HashSet<>(features); - features.add(SKIPPERS_ON_UNINDEXED_FIELDS); - } return features; } } From 42e1914bf53f24feabf673c659d0090e74b6c1ae Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Fri, 28 Nov 2025 16:52:02 +0000 Subject: [PATCH 5/5] more --- .../searchablesnapshots/SearchableSnapshotsIntegTests.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java index 2ca01a5367157..1e9983134caf0 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java @@ -687,6 +687,9 @@ public void testSnapshotMountedIndexLeavesBlobsUntouched() throws Exception { } public void testSnapshotMountedIndexWithTimestampsRecordsTimestampRangeInIndexMetadata() throws Exception { + + assumeTrue("Skipper feature flag disabled", IndexSettings.DOC_VALUES_SKIPPER); + final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); int numShards = between(1, 3);