Skip to content

Commit bb99d83

Browse files
committed
Remove tsdb_doc_values_optimized_merge feature flag. (elastic#128435)
All the development work has been completed in elastic#126111 and no regressions have been observer in nightly benchmarks
1 parent b886a86 commit bb99d83

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

@@ -59,14 +58,10 @@ public class ES819TSDBDocValuesFormat extends org.apache.lucene.codecs.DocValues
5958

6059
// Default for escape hatch:
6160
static final boolean OPTIMIZED_MERGE_ENABLE_DEFAULT;
62-
static final FeatureFlag TSDB_DOC_VALUES_OPTIMIZED_MERGE = new FeatureFlag("tsdb_doc_values_optimized_merge");
6361
static final String OPTIMIZED_MERGE_ENABLED_NAME = ES819TSDBDocValuesConsumer.class.getName() + ".enableOptimizedMerge";
6462

6563
static {
66-
boolean optimizedMergeDefault = TSDB_DOC_VALUES_OPTIMIZED_MERGE.isEnabled();
67-
OPTIMIZED_MERGE_ENABLE_DEFAULT = Boolean.parseBoolean(
68-
System.getProperty(OPTIMIZED_MERGE_ENABLED_NAME, Boolean.toString(optimizedMergeDefault))
69-
);
64+
OPTIMIZED_MERGE_ENABLE_DEFAULT = Boolean.parseBoolean(System.getProperty(OPTIMIZED_MERGE_ENABLED_NAME, Boolean.TRUE.toString()));
7065
}
7166

7267
private final boolean enableOptimizedMerge;

0 commit comments

Comments
 (0)