Skip to content

Commit 7e269a9

Browse files
authored
Remove tsdb_doc_values_optimized_merge feature flag. (#128435)
All the development work has been completed in #126111 and no regressions have been observer in nightly benchmarks
1 parent 314dc1a commit 7e269a9

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesFormat.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.apache.lucene.codecs.DocValuesProducer;
1414
import org.apache.lucene.index.SegmentReadState;
1515
import org.apache.lucene.index.SegmentWriteState;
16-
import org.elasticsearch.common.util.FeatureFlag;
1716

1817
import java.io.IOException;
1918

@@ -91,14 +90,10 @@ public class ES819TSDBDocValuesFormat extends org.apache.lucene.codecs.DocValues
9190

9291
// Default for escape hatch:
9392
static final boolean OPTIMIZED_MERGE_ENABLE_DEFAULT;
94-
static final FeatureFlag TSDB_DOC_VALUES_OPTIMIZED_MERGE = new FeatureFlag("tsdb_doc_values_optimized_merge");
9593
static final String OPTIMIZED_MERGE_ENABLED_NAME = ES819TSDBDocValuesConsumer.class.getName() + ".enableOptimizedMerge";
9694

9795
static {
98-
boolean optimizedMergeDefault = TSDB_DOC_VALUES_OPTIMIZED_MERGE.isEnabled();
99-
OPTIMIZED_MERGE_ENABLE_DEFAULT = Boolean.parseBoolean(
100-
System.getProperty(OPTIMIZED_MERGE_ENABLED_NAME, Boolean.toString(optimizedMergeDefault))
101-
);
96+
OPTIMIZED_MERGE_ENABLE_DEFAULT = Boolean.parseBoolean(System.getProperty(OPTIMIZED_MERGE_ENABLED_NAME, Boolean.TRUE.toString()));
10297
}
10398

10499
final int skipIndexIntervalSize;

0 commit comments

Comments
 (0)