Skip to content

Replace MappedFieldType isIndexed with finer-grained IndexType #135892

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
merged 18 commits into from
Oct 8, 2025
Merged

Replace MappedFieldType isIndexed with finer-grained IndexType #135892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4b310fb
Replace MappedFieldType isIndexed with finer-grained IndexType
romseygeek Oct 2, 2025
c0d1c82
spotless
romseygeek Oct 3, 2025
9f7a3f2
imports
romseygeek Oct 3, 2025
06febd7
tests
romseygeek Oct 3, 2025
54cad73
moar
romseygeek Oct 3, 2025
9c8c435
_tsid shouldn't be searchable
romseygeek Oct 3, 2025
24c931c
again
romseygeek Oct 3, 2025
f2fc905
Merge remote-tracking branch 'origin/main' into mft/index-type-enum
romseygeek Oct 6, 2025
79f78fc
fixes
romseygeek Oct 6, 2025
996779e
Merge remote-tracking branch 'origin/main' into mft/index-type-enum
romseygeek Oct 6, 2025
e060d4e
Merge remote-tracking branch 'origin/main' into mft/index-type-enum
romseygeek Oct 6, 2025
8ec33ea
Merge branch 'main' into mft/index-type-enum
romseygeek Oct 7, 2025
b0afe61
Make IndexType a class rather than an enum
romseygeek Oct 7, 2025
ca697a1
Merge remote-tracking branch 'origin/main' into mft/index-type-enum
romseygeek Oct 7, 2025
69d6d0a
Merge remote-tracking branch 'romseygeek/mft/index-type-enum' into mf…
romseygeek Oct 7, 2025
405b365
tests
romseygeek Oct 7, 2025
1e9ff9f
nits
romseygeek Oct 8, 2025
2572fcc
Merge branch 'main' into mft/index-type-enum
romseygeek Oct 8, 2025
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
4 changes: 2 additions & 2 deletions .../src/main/java/org/elasticsearch/benchmark/_nightly/esql/ValuesSourceReaderBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.elasticsearch.index.IndexVersion;
import org.elasticsearch.index.mapper.BlockLoader;
import org.elasticsearch.index.mapper.FieldNamesFieldMapper;
import org.elasticsearch.index.mapper.IndexType;
import org.elasticsearch.index.mapper.KeywordFieldMapper;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.NumberFieldMapper;
Expand Down Expand Up @@ -290,9 +291,8 @@ private static BlockLoader numericBlockLoader(WhereAndBaseName w, NumberFieldMap
return new NumberFieldMapper.NumberFieldType(
w.name,
numberType,
true,
IndexType.points(true, docValues),
stored,
docValues,
true,
null,
Map.of(),
Expand Down
19 changes: 18 additions & 1 deletion benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.elasticsearch.index.fielddata.FieldDataContext;
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
import org.elasticsearch.index.mapper.IndexType;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.MappingLookup;
import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType;
Expand Down Expand Up @@ -85,7 +86,23 @@ public class ScriptScoreBenchmark {
private final ScriptModule scriptModule = new ScriptModule(Settings.EMPTY, pluginsService.filterPlugins(ScriptPlugin.class).toList());

private final Map<String, MappedFieldType> fieldTypes = Map.ofEntries(
Map.entry("n", new NumberFieldType("n", NumberType.LONG, false, false, true, true, null, Map.of(), null, false, null, null, false))
Map.entry(
"n",
new NumberFieldType(
"n",
NumberType.LONG,
IndexType.docValuesOnly(),
false,
true,
null,
Map.of(),
null,
false,
null,
null,
false
)
)
);
private final IndexFieldDataCache fieldDataCache = new IndexFieldDataCache.None();
private final CircuitBreakerService breakerService = new NoneCircuitBreakerService();
Expand Down
48 changes: 18 additions & 30 deletions ...c/test/java/org/elasticsearch/datastreams/mapper/DataStreamTimestampFieldMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeDisabledDocValuesSkipper
.mappers()
.getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH);
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertTrue(timestampMapper.fieldType().hasDocValues());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
assertTrue(timestampMapper.fieldType().isIndexed());
}

public void testFieldTypeWithDocValuesSkipper_LogsDBMode() throws IOException {
Expand All @@ -274,12 +274,11 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBMode() throws IOException {
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -297,12 +296,11 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeNoTimestampMapping() thr
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -327,12 +325,11 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeTimestampDateNanos() thr
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -355,12 +352,11 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeExplicitTimestampIndexEn
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -384,7 +380,7 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeExplicitTimestampIndexDi
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().hasDocValues());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
}

public void testFieldTypeWithDocValuesSkipper_LogsDBModeWithoutDefaultMapping() throws IOException {
Expand All @@ -407,12 +403,11 @@ public void testFieldTypeWithDocValuesSkipper_LogsDBModeWithoutDefaultMapping()
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand Down Expand Up @@ -479,12 +474,11 @@ public void testFieldTypeWithDocValuesSkipper_WithoutTimestampSorting() throws I
// NOTE: in LogsDB we always sort on @timestamp (and maybe also on host.name) by default
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -504,7 +498,7 @@ public void testFieldTypeWithDocValuesSkipper_StandardMode() throws IOException
.getMapper(DataStreamTimestampFieldMapper.DEFAULT_PATH);
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().hasDocValues());
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}

Expand All @@ -521,20 +515,19 @@ public void testFieldTypeWithDocValuesSkipper_CustomTimestampField() throws IOEx

final DateFieldMapper customTimestamp = (DateFieldMapper) mapperService.documentMapper().mappers().getMapper("timestamp");
assertTrue(customTimestamp.fieldType().hasDocValues());
assertTrue(customTimestamp.fieldType().isIndexed());
assertTrue(customTimestamp.fieldType().indexType().hasPoints());
assertFalse(customTimestamp.fieldType().hasDocValuesSkipper());

// Default LogsDB mapping including @timestamp field is used
final DateFieldMapper defaultTimestamp = (DateFieldMapper) mapperService.documentMapper().mappers().getMapper("@timestamp");
assertTrue(defaultTimestamp.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(defaultTimestamp.fieldType().isIndexed());
assertTrue(defaultTimestamp.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(defaultTimestamp.fieldType().isIndexed());
assertTrue(defaultTimestamp.fieldType().indexType().hasPoints());
assertFalse(defaultTimestamp.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -559,7 +552,7 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeDisabledDocValuesSkipper()
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertTrue(timestampMapper.fieldType().hasDocValues());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
}

public void testFieldTypeWithDocValuesSkipper_TSDBMode() throws IOException {
Expand All @@ -581,12 +574,11 @@ public void testFieldTypeWithDocValuesSkipper_TSDBMode() throws IOException {
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -606,12 +598,11 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeNoTimestampMapping() throw
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -638,12 +629,11 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeTimestampDateNanos() throw
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -668,12 +658,11 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeExplicitTimestampIndexEnab
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand All @@ -699,7 +688,7 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeExplicitTimestampIndexDisa
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().hasDocValues());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
}

public void testFieldTypeWithDocValuesSkipper_TSDBModeWithoutDefaultMapping() throws IOException {
Expand All @@ -724,12 +713,11 @@ public void testFieldTypeWithDocValuesSkipper_TSDBModeWithoutDefaultMapping() th
assertTrue(timestampMapper.fieldType().hasDocValues());
if (IndexSettings.USE_DOC_VALUES_SKIPPER.get(settings)) {
assumeTrue("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER);
assertFalse(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().hasDocValuesSkipper());
} else {
// TODO: remove this 'else' branch when removing the `doc_values_skipper` feature flag
assumeFalse("doc_values_skipper feature flag enabled", IndexSettings.DOC_VALUES_SKIPPER == false);
assertTrue(timestampMapper.fieldType().isIndexed());
assertTrue(timestampMapper.fieldType().indexType().hasPoints());
assertFalse(timestampMapper.fieldType().hasDocValuesSkipper());
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...egacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.elasticsearch.index.mapper.DocumentParsingException;
import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.GeoShapeQueryable;
import org.elasticsearch.index.mapper.IndexType;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.MapperBuilderContext;
Expand Down Expand Up @@ -426,7 +427,7 @@ private GeoShapeFieldType(
LegacyGeoShapeParser parser,
Map<String, String> meta
) {
super(name, indexed, false, false, parser, orientation, meta);
super(name, IndexType.terms(indexed, false), false, parser, orientation, meta);
this.queryProcessor = new LegacyGeoShapeQueryProcessor(this);
}

Expand Down
3 changes: 2 additions & 1 deletion ...er-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.index.mapper.DocumentParserContext;
import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.index.mapper.IndexType;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.MapperBuilderContext;
import org.elasticsearch.index.mapper.SourceValueFetcher;
Expand Down Expand Up @@ -113,7 +114,7 @@ public static final class RankFeatureFieldType extends MappedFieldType {
private final Float nullValue;

public RankFeatureFieldType(String name, Map<String, String> meta, boolean positiveScoreImpact, Float nullValue) {
super(name, true, false, false, meta);
super(name, IndexType.terms(true, false), false, meta);
this.positiveScoreImpact = positiveScoreImpact;
this.nullValue = nullValue;
}
Expand Down
3 changes: 2 additions & 1 deletion ...xtras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureMetaFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.search.Query;
import org.elasticsearch.index.mapper.IndexType;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.MetadataFieldMapper;
import org.elasticsearch.index.mapper.ValueFetcher;
Expand All @@ -37,7 +38,7 @@ public static final class RankFeatureMetaFieldType extends MappedFieldType {

// made visible for tests
RankFeatureMetaFieldType() {
super(NAME, false, false, false, Collections.emptyMap());
super(NAME, IndexType.NONE, false, Collections.emptyMap());
}

@Override
Expand Down
Loading