mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove use_default_lucene_postings_format feature flag (#128509) 

Remove use_default_lucene_postings_format feature flag and
let the IndexMode decide whether to default lucene postings instead of checking for standard index mode.

The `Lucene101PostingsFormat` is now used for a while behind a feature flag. Regressions were found by were fixed via apache/lucene#14511. The `Lucene101PostingsFormat` is now a better trade off when the index mode is standard.
This commit is contained in:
Martijn van Groningen 2025-06-02 17:04:08 +02:00 committed by GitHub
parent 2467c910cc
commit 041c42a779
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changelog/128509.yaml Normal file
View File

@ -0,0 +1,5 @@
pr: 128509
summary: Use default Lucene postings format when index mode is standard.
area: Codec
type: enhancement
issues: []

12
server/src/main/java/org/elasticsearch/index/IndexMode.java
View File

@ -129,6 +129,11 @@ public enum IndexMode {
public SourceFieldMapper.Mode defaultSourceMode() {
return SourceFieldMapper.Mode.STORED;
}
@Override
public boolean useDefaultPostingsFormat() {
return true;
}
},
TIME_SERIES("time_series") {
@Override
@ -552,6 +557,13 @@ public enum IndexMode {
return CodecService.DEFAULT_CODEC;
}
/**
* Whether the default posting format (for inverted indices) from Lucene should be used.
*/
public boolean useDefaultPostingsFormat() {
return false;
}
/**
* Parse a string into an {@link IndexMode}.
*/

5
server/src/main/java/org/elasticsearch/index/codec/PerFieldFormatSupplier.java
View File

@ -15,7 +15,6 @@ import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat;
import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat;
import org.elasticsearch.common.util.BigArrays;
import org.elasticsearch.common.util.FeatureFlag;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.IndexVersions;
@ -33,7 +32,6 @@ import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
* vectors.
*/
public class PerFieldFormatSupplier {
public static final FeatureFlag USE_DEFAULT_LUCENE_POSTINGS_FORMAT = new FeatureFlag("use_default_lucene_postings_format");
private static final DocValuesFormat docValuesFormat = new Lucene90DocValuesFormat();
private static final KnnVectorsFormat knnVectorsFormat = new Lucene99HnswVectorsFormat();
@ -51,9 +49,8 @@ public class PerFieldFormatSupplier {
this.bloomFilterPostingsFormat = new ES87BloomFilterPostingsFormat(bigArrays, this::internalGetPostingsFormatForField);
if (mapperService != null
&& USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled()
&& mapperService.getIndexSettings().getIndexVersionCreated().onOrAfter(IndexVersions.USE_LUCENE101_POSTINGS_FORMAT)
&& mapperService.getIndexSettings().getMode() == IndexMode.STANDARD) {
&& mapperService.getIndexSettings().getMode().useDefaultPostingsFormat()) {
defaultPostingsFormat = Elasticsearch900Lucene101Codec.DEFAULT_POSTINGS_FORMAT;
} else {
// our own posting format using PFOR

8
server/src/test/java/org/elasticsearch/index/codec/PerFieldMapperCodecTests.java
View File

@ -94,8 +94,7 @@ public class PerFieldMapperCodecTests extends ESTestCase {
assertThat(perFieldMapperCodec.getPostingsFormatForField("_id"), instanceOf(ES87BloomFilterPostingsFormat.class));
assertThat(perFieldMapperCodec.useBloomFilter("another_field"), is(false));
Class<? extends PostingsFormat> expectedPostingsFormat = PerFieldFormatSupplier.USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled()
&& timeSeries == false ? Lucene101PostingsFormat.class : ES812PostingsFormat.class;
Class<? extends PostingsFormat> expectedPostingsFormat = timeSeries ? ES812PostingsFormat.class : Lucene101PostingsFormat.class;
assertThat(perFieldMapperCodec.getPostingsFormatForField("another_field"), instanceOf(expectedPostingsFormat));
}
@ -110,10 +109,7 @@ public class PerFieldMapperCodecTests extends ESTestCase {
public void testUseBloomFilterWithTimestampFieldEnabled_noTimeSeriesMode() throws IOException {
PerFieldFormatSupplier perFieldMapperCodec = createFormatSupplier(true, false, false);
assertThat(perFieldMapperCodec.useBloomFilter("_id"), is(false));
Class<? extends PostingsFormat> expectedPostingsFormat = PerFieldFormatSupplier.USE_DEFAULT_LUCENE_POSTINGS_FORMAT.isEnabled()
? Lucene101PostingsFormat.class
: ES812PostingsFormat.class;
assertThat(perFieldMapperCodec.getPostingsFormatForField("_id"), instanceOf(expectedPostingsFormat));
assertThat(perFieldMapperCodec.getPostingsFormatForField("_id"), instanceOf(Lucene101PostingsFormat.class));
}
public void testUseBloomFilterWithTimestampFieldEnabled_disableBloomFilter() throws IOException {