Skip to content

Commit c1c00e1

Browse files
authored
[8.19] Remove tsdb_doc_values_optimized_merge feature flag. (#128435)
This PR should have merged end of May. But PR CI got stuck and never got merged. This caused the optimized doc value merging to not be enabled in 8.19. So this PR turned into a bug fix instead of a backport. Backports the following commits to 8.19: Remove tsdb_doc_values_optimized_merge feature flag. (Remove tsdb_doc_values_optimized_merge feature flag. #128435)
1 parent a598d0d commit c1c00e1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

docs/changelog/128459.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128459
2+
summary: "[8.19] Remove forgotten `tsdb_doc_values_optimized_merge` feature flag that caused an optimization to be disabled that should have been enabled"
3+
area: Codec
4+
type: bug
5+
issues: []

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)