Skip to content

Commit 2fabf6a

Browse files
authored
Revert "Temporarily disable use_default_lucene_postings_format feature flag. …" (#128433)
This reverts commit 6f2d4c8.
1 parent 74d025e commit 2fabf6a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

server/src/main/java/org/elasticsearch/index/codec/PerFieldFormatSupplier.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,8 @@ public PerFieldFormatSupplier(MapperService mapperService, BigArrays bigArrays)
5050
this.mapperService = mapperService;
5151
this.bloomFilterPostingsFormat = new ES87BloomFilterPostingsFormat(bigArrays, this::internalGetPostingsFormatForField);
5252

53-
// TODO: temporarily disable feature flag for a few days to see effect in benchmarks
54-
boolean useDefaultLucenePostingsFormat = USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled() && false;
5553
if (mapperService != null
56-
&& useDefaultLucenePostingsFormat
54+
&& USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled()
5755
&& mapperService.getIndexSettings().getIndexVersionCreated().onOrAfter(IndexVersions.USE_LUCENE101_POSTINGS_FORMAT)
5856
&& mapperService.getIndexSettings().getMode() == IndexMode.STANDARD) {
5957
defaultPostingsFormat = Elasticsearch900Lucene101Codec.DEFAULT_POSTINGS_FORMAT;

server/src/test/java/org/elasticsearch/index/codec/PerFieldMapperCodecTests.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.index.codec;
1111

1212
import org.apache.lucene.codecs.PostingsFormat;
13+
import org.apache.lucene.codecs.lucene101.Lucene101PostingsFormat;
1314
import org.elasticsearch.cluster.metadata.IndexMetadata;
1415
import org.elasticsearch.common.compress.CompressedXContent;
1516
import org.elasticsearch.common.settings.Settings;
@@ -93,7 +94,8 @@ public void testUseBloomFilter() throws IOException {
9394
assertThat(perFieldMapperCodec.getPostingsFormatForField("_id"), instanceOf(ES87BloomFilterPostingsFormat.class));
9495
assertThat(perFieldMapperCodec.useBloomFilter("another_field"), is(false));
9596

96-
Class<? extends PostingsFormat> expectedPostingsFormat = ES812PostingsFormat.class;
97+
Class<? extends PostingsFormat> expectedPostingsFormat = PerFieldFormatSupplier.USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled()
98+
&& timeSeries == false ? Lucene101PostingsFormat.class : ES812PostingsFormat.class;
9799
assertThat(perFieldMapperCodec.getPostingsFormatForField("another_field"), instanceOf(expectedPostingsFormat));
98100
}
99101

@@ -108,7 +110,9 @@ public void testUseBloomFilterWithTimestampFieldEnabled() throws IOException {
108110
public void testUseBloomFilterWithTimestampFieldEnabled_noTimeSeriesMode() throws IOException {
109111
PerFieldFormatSupplier perFieldMapperCodec = createFormatSupplier(true, false, false);
110112
assertThat(perFieldMapperCodec.useBloomFilter("_id"), is(false));
111-
Class<? extends PostingsFormat> expectedPostingsFormat = ES812PostingsFormat.class;
113+
Class<? extends PostingsFormat> expectedPostingsFormat = PerFieldFormatSupplier.USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled()
114+
? Lucene101PostingsFormat.class
115+
: ES812PostingsFormat.class;
112116
assertThat(perFieldMapperCodec.getPostingsFormatForField("_id"), instanceOf(expectedPostingsFormat));
113117
}
114118

0 commit comments

Comments
 (0)