Skip to content

Use XPerFieldDocValuesFormat in AbstractTSDBSyntheticIdCodec #144744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlrx merged 10 commits into from
Mar 26, 2026
Merged

Use XPerFieldDocValuesFormat in AbstractTSDBSyntheticIdCodec #144744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ca35bd
Use XPerFieldDocValuesFormat in AbstractTSDBSyntheticIdCodec
tlrx Mar 23, 2026
e87dc8b
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 24, 2026
7211de6
adjust unit test
tlrx Mar 24, 2026
2a941de
[CI] Auto commit changes from spotless
Mar 24, 2026
6b82617
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 24, 2026
5cb6313
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 24, 2026
8a7fa67
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 25, 2026
70eaa72
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 25, 2026
704907a
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 25, 2026
9ecdee7
Merge branch 'main' into 2026/03/23-xperfielddocvaluesformat
tlrx Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions server/src/main/java/org/elasticsearch/index/codec/tsdb/AbstractTSDBSyntheticIdCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@

package org.elasticsearch.index.codec.tsdb;

import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.FieldInfosFormat;
import org.apache.lucene.codecs.FilterCodec;
import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.codecs.lucene104.Lucene104Codec;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.elasticsearch.index.codec.perfield.XPerFieldDocValuesFormat;
import org.elasticsearch.index.codec.storedfields.TSDBStoredFieldsFormat;
import org.elasticsearch.index.mapper.SyntheticIdField;

Expand Down Expand Up @@ -50,18 +52,30 @@
abstract class AbstractTSDBSyntheticIdCodec extends FilterCodec {
private final TSDBStoredFieldsFormat storedFieldsFormat;
private final ValidatingFieldInfosFormat fieldInfosFormat;
private final DocValuesFormat docValuesFormat;

AbstractTSDBSyntheticIdCodec(String name, Codec delegate) {
AbstractTSDBSyntheticIdCodec(String name, Lucene104Codec delegate) {
Comment thread
burqen marked this conversation as resolved.
super(name, delegate);
this.storedFieldsFormat = new TSDBStoredFieldsFormat(delegate.storedFieldsFormat());
this.fieldInfosFormat = new ValidatingFieldInfosFormat(delegate.fieldInfosFormat());
this.docValuesFormat = new XPerFieldDocValuesFormat() {
@Override
public DocValuesFormat getDocValuesFormatForField(String field) {
return delegate.getDocValuesFormatForField(field);
}
};
}

@Override
public StoredFieldsFormat storedFieldsFormat() {
return storedFieldsFormat;
}

@Override
public DocValuesFormat docValuesFormat() {
return docValuesFormat;
}

@Override
public final FieldInfosFormat fieldInfosFormat() {
return fieldInfosFormat;
Expand Down
6 changes: 3 additions & 3 deletions ...est/java/org/elasticsearch/index/codec/tsdb/es819/TSDBDocValuesFormatSingleNodeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.index.codec.tsdb.es819;

import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.LeafReaderContext;
Expand All @@ -24,6 +23,7 @@
import org.elasticsearch.index.codec.CodecService;
import org.elasticsearch.index.codec.Elasticsearch93Lucene104Codec;
import org.elasticsearch.index.codec.LegacyPerFieldMapperCodec;
import org.elasticsearch.index.codec.perfield.XPerFieldDocValuesFormat;
import org.elasticsearch.index.codec.tsdb.ES93TSDBDefaultCompressionLucene103Codec;
import org.elasticsearch.index.codec.tsdb.PartitionedDocValues;
import org.elasticsearch.index.engine.Engine;
Expand Down Expand Up @@ -169,8 +169,8 @@ private void assertDocValuesFormat(String indexName, DocValuesFormat expectedFor
if (deduplicateFieldInfosCodec.delegate() instanceof LegacyPerFieldMapperCodec legacyPerFieldMapperCodec) {
docValuesFormatProvider = legacyPerFieldMapperCodec::getDocValuesFormatForField;
} else if (deduplicateFieldInfosCodec.delegate() instanceof ES93TSDBDefaultCompressionLucene103Codec es93TSDB103Codec) {
assertThat(es93TSDB103Codec.docValuesFormat(), instanceOf(PerFieldDocValuesFormat.class));
docValuesFormatProvider = (field) -> ((PerFieldDocValuesFormat) es93TSDB103Codec.docValuesFormat())
assertThat(es93TSDB103Codec.docValuesFormat(), instanceOf(XPerFieldDocValuesFormat.class));
docValuesFormatProvider = (field) -> ((XPerFieldDocValuesFormat) es93TSDB103Codec.docValuesFormat())
.getDocValuesFormatForField(field);
} else {
fail("Unexpected codec type: " + codec.getClass().getName());
Expand Down
Loading