fix: gate sparse index usage with feature flag

salvatore-campagna · Jan 24, 2025 · 328e42b · 328e42b
1 parent db8374e
commit 328e42b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
@@ -21,6 +21,7 @@
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.util.CollectionUtils;
+import org.elasticsearch.common.util.FeatureFlag;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.IndexMode;
@@ -63,6 +64,7 @@
 public abstract class FieldMapper extends Mapper {
     private static final Logger logger = LogManager.getLogger(FieldMapper.class);
 
+    public static final FeatureFlag DOC_VALUES_SPARSE_INDEX = new FeatureFlag("doc_values_sparse_index");
     public static final Setting<Boolean> IGNORE_MALFORMED_SETTING = Setting.boolSetting("index.mapping.ignore_malformed", settings -> {
         if (IndexSettings.MODE.get(settings) == IndexMode.LOGSDB
             && IndexMetadata.SETTING_INDEX_VERSION_CREATED.get(settings).onOrAfter(IndexVersions.ENABLE_IGNORE_MALFORMED_LOGSDB)) {

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -427,6 +427,9 @@ private boolean shouldUseDocValuesSparseIndex(
             final IndexMode indexMode,
             final String fullFieldName
         ) {
+            if (FieldMapper.DOC_VALUES_SPARSE_INDEX.isEnabled() == false) {
+                return false;
+            }
             boolean isIndexedAndDocValuesDefault = indexed.isConfigured() || hasDocValues.isConfigured();
             boolean isNotIndexedAndHasDocValues = indexed.getValue() || hasDocValues.getValue() == false;
             boolean isLogsDbMode = IndexMode.LOGSDB.equals(indexMode);