Skip to content

Commit 7d92634

Browse files
committed
Remove DOC_VALUES_SKIPPER feature flag
Removing this flag will enable skippers automatically on keyword, ip, boolean, date and numeric fields that have index=false. In addition, some fields in time_series and logsdb modes will default to using doc values skippers in place of points or terms indexes.
1 parent 1e8fcef commit 7d92634

File tree

9 files changed

+15
-126
lines changed

9 files changed

+15
-126
lines changed

modules/data-streams/src/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java

Lines changed: 12 additions & 113 deletions
Large diffs are not rendered by default.

qa/smoke-test-multinode/src/yamlRestTest/java/org/elasticsearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTe
3535
// The first node does not have the ingest role so we're sure ingest requests are forwarded:
3636
.node(0, n -> n.setting("node.roles", "[master,data,ml,remote_cluster_client,transform]"))
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
38-
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
3938
.feature(FeatureFlag.SYNTHETIC_VECTORS)
4039
.feature(FeatureFlag.RANDOM_SAMPLING)
4140
.feature(FeatureFlag.GENERIC_VECTOR_FORMAT)

rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3535
.module("health-shards-availability")
3636
.module("data-streams")
3737
.feature(FeatureFlag.TIME_SERIES_MODE)
38-
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
3938
.feature(FeatureFlag.SYNTHETIC_VECTORS)
4039
.feature(FeatureFlag.RANDOM_SAMPLING)
4140
.feature(FeatureFlag.GENERIC_VECTOR_FORMAT)

server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,10 @@ public void testSearchIdleStats() throws InterruptedException {
235235
}
236236

237237
public void testSearchIdleBoolQueryMatchOneIndex() throws InterruptedException {
238-
checkSearchIdleBoolQueryMatchOneIndex(IndexSettings.DOC_VALUES_SKIPPER);
238+
checkSearchIdleBoolQueryMatchOneIndex(true);
239239
}
240240

241241
public void testSearchIdleBoolQueryMatchOneIndexWithDocValuesSkipper() throws InterruptedException {
242-
assumeTrue("doc values skipper feature should be enabled", IndexSettings.DOC_VALUES_SKIPPER);
243242
checkSearchIdleBoolQueryMatchOneIndex(false);
244243
}
245244

server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
210210
IndexSettings.USE_TIME_SERIES_DOC_VALUES_FORMAT_SETTING,
211211
InferenceMetadataFieldsMapper.USE_LEGACY_SEMANTIC_TEXT_FORMAT,
212212
IndexSettings.USE_ES_812_POSTINGS_FORMAT,
213+
IndexSettings.USE_DOC_VALUES_SKIPPER,
213214

214215
// validate that built-in similarities don't get redefined
215216
Setting.groupSetting("index.similarity.", (s) -> {
@@ -246,9 +247,6 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
246247
)
247248
);
248249

249-
if (IndexSettings.DOC_VALUES_SKIPPER) {
250-
settings.add(IndexSettings.USE_DOC_VALUES_SKIPPER);
251-
}
252250
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG) {
253251
settings.add(IndexSettings.USE_SYNTHETIC_ID);
254252
}

server/src/main/java/org/elasticsearch/index/IndexSettings.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,6 @@ public boolean isES87TSDBCodecEnabled() {
677677
Property.Final
678678
);
679679

680-
public static final boolean DOC_VALUES_SKIPPER = new FeatureFlag("doc_values_skipper").isEnabled();
681680
public static final Setting<Boolean> USE_DOC_VALUES_SKIPPER = Setting.boolSetting(
682681
"index.mapping.use_doc_values_skipper",
683682
true,
@@ -1204,7 +1203,7 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
12041203
recoverySourceEnabled = RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING.get(nodeSettings);
12051204
recoverySourceSyntheticEnabled = DiscoveryNode.isStateless(nodeSettings) == false
12061205
&& scopedSettings.get(RECOVERY_USE_SYNTHETIC_SOURCE_SETTING);
1207-
useDocValuesSkipper = DOC_VALUES_SKIPPER && scopedSettings.get(USE_DOC_VALUES_SKIPPER);
1206+
useDocValuesSkipper = scopedSettings.get(USE_DOC_VALUES_SKIPPER);
12081207
seqNoIndexOptions = scopedSettings.get(SEQ_NO_INDEX_OPTIONS_SETTING);
12091208
useTimeSeriesDocValuesFormat = scopedSettings.get(USE_TIME_SERIES_DOC_VALUES_FORMAT_SETTING);
12101209
useEs812PostingsFormat = scopedSettings.get(USE_ES_812_POSTINGS_FORMAT);

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
public enum FeatureFlag {
1919
TIME_SERIES_MODE("es.index_mode_feature_flag_registered=true", Version.fromString("8.0.0"), null),
20-
DOC_VALUES_SKIPPER("es.doc_values_skipper_feature_flag_enabled=true", Version.fromString("8.18.1"), null),
2120
LOGS_STREAM("es.logs_stream_feature_flag_enabled=true", Version.fromString("9.1.0"), null),
2221
SYNTHETIC_VECTORS("es.mapping_synthetic_vectors=true", Version.fromString("9.2.0"), null),
2322
INDEX_DIMENSIONS_TSID_OPTIMIZATION_FEATURE_FLAG(

x-pack/plugin/logsdb/src/yamlRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbTestSuiteIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.common.settings.Settings;
1616
import org.elasticsearch.common.util.concurrent.ThreadContext;
1717
import org.elasticsearch.test.cluster.ElasticsearchCluster;
18-
import org.elasticsearch.test.cluster.FeatureFlag;
1918
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
2019
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2120
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
@@ -36,7 +35,6 @@ public class LogsdbTestSuiteIT extends ESClientYamlSuiteTestCase {
3635
.user(USER, PASS, "superuser", false)
3736
.setting("xpack.security.autoconfiguration.enabled", "false")
3837
.setting("xpack.license.self_generated.type", "trial")
39-
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
4038
.build();
4139

4240
public LogsdbTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest
4949
.systemProperty("es.queryable_built_in_roles_enabled", "false")
5050
.user(USER, PASS)
5151
.feature(FeatureFlag.TIME_SERIES_MODE)
52-
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
5352
.feature(FeatureFlag.SYNTHETIC_VECTORS)
5453
.feature(FeatureFlag.RANDOM_SAMPLING)
5554
.feature(FeatureFlag.GENERIC_VECTOR_FORMAT)

0 commit comments

Comments
 (0)