Skip to content

Add IdLoader.create(MapperService) method #137662

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 4 commits into from
Nov 6, 2025
Merged

Add IdLoader.create(MapperService) method #137662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a777af
Add IdLoader.create method
tlrx Nov 6, 2025
e5f4e5b
Merge branch 'main' into 2025/11/06/idloader-create
tlrx Nov 6, 2025
cd6dd73
nit
tlrx Nov 6, 2025
f53259e
Merge branch 'main' into 2025/11/06/idloader-create
tlrx Nov 6, 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
37 changes: 37 additions & 0 deletions server/src/main/java/org/elasticsearch/index/mapper/IdLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,53 @@
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.routing.IndexRouting;
import org.elasticsearch.cluster.routing.RoutingHashBuilder;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.index.fieldvisitor.LeafStoredFieldLoader;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;

/**
* Responsible for loading the _id from stored fields or for TSDB synthesizing the _id from the routing, _tsid and @timestamp fields.
*/
public sealed interface IdLoader permits IdLoader.TsIdLoader, IdLoader.StoredIdLoader {

/**
* @return returns an {@link IdLoader} instance to load the value of the _id field.
*/
static IdLoader create(MapperService mapperService) {
var indexSettings = mapperService.getIndexSettings();
if (indexSettings.getMode() == IndexMode.TIME_SERIES) {
IndexRouting.ExtractFromSource.ForRoutingPath indexRouting = null;
List<String> routingPaths = null;
if (indexSettings.getIndexVersionCreated().before(IndexVersions.TIME_SERIES_ROUTING_HASH_IN_ID)) {
indexRouting = (IndexRouting.ExtractFromSource.ForRoutingPath) indexSettings.getIndexRouting();
Copy link
Contributor

@kkrik-es kkrik-es Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: consider moving this block to IndexRouting.ExtractFromSource.ForRoutingPath as a utility method, to keep the interface short.

routingPaths = indexSettings.getIndexMetadata().getRoutingPaths();
for (String routingField : routingPaths) {
if (routingField.contains("*")) {
// In case the routing fields include path matches, find any matches and add them as distinct fields
// to the routing path.
Set<String> matchingRoutingPaths = new TreeSet<>(routingPaths);
for (Mapper mapper : mapperService.mappingLookup().fieldMappers()) {
if (mapper instanceof KeywordFieldMapper && indexRouting.matchesField(mapper.fullPath())) {
matchingRoutingPaths.add(mapper.fullPath());
}
}
routingPaths = new ArrayList<>(matchingRoutingPaths);
break;
}
}
}
return createTsIdLoader(indexRouting, routingPaths, indexSettings.useTimeSeriesSyntheticId());
} else {
return fromLeafStoredFieldLoader();
}
}

/**
* @return returns an {@link IdLoader} instance the loads the _id from stored field.
*/
Expand Down
33 changes: 1 addition & 32 deletions server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,21 @@
import org.apache.lucene.util.NumericUtils;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.cluster.routing.IndexRouting;
import org.elasticsearch.common.breaker.CircuitBreaker;
import org.elasticsearch.common.lucene.search.Queries;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.core.Releasables;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.IndexVersions;
import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.index.fielddata.FieldDataContext;
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData;
import org.elasticsearch.index.mapper.IdLoader;
import org.elasticsearch.index.mapper.KeywordFieldMapper;
import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.Mapper;
import org.elasticsearch.index.mapper.NestedLookup;
import org.elasticsearch.index.mapper.SourceLoader;
import org.elasticsearch.index.query.AbstractQueryBuilder;
Expand Down Expand Up @@ -88,8 +83,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.function.LongSupplier;
Expand Down Expand Up @@ -950,30 +943,6 @@ public SourceLoader newSourceLoader(@Nullable SourceFilter filter) {

@Override
public IdLoader newIdLoader() {
if (indexService.getIndexSettings().getMode() == IndexMode.TIME_SERIES) {
IndexRouting.ExtractFromSource.ForRoutingPath indexRouting = null;
List<String> routingPaths = null;
if (indexService.getIndexSettings().getIndexVersionCreated().before(IndexVersions.TIME_SERIES_ROUTING_HASH_IN_ID)) {
indexRouting = (IndexRouting.ExtractFromSource.ForRoutingPath) indexService.getIndexSettings().getIndexRouting();
routingPaths = indexService.getMetadata().getRoutingPaths();
for (String routingField : routingPaths) {
if (routingField.contains("*")) {
// In case the routing fields include path matches, find any matches and add them as distinct fields
// to the routing path.
Set<String> matchingRoutingPaths = new TreeSet<>(routingPaths);
for (Mapper mapper : indexService.mapperService().mappingLookup().fieldMappers()) {
if (mapper instanceof KeywordFieldMapper && indexRouting.matchesField(mapper.fullPath())) {
matchingRoutingPaths.add(mapper.fullPath());
}
}
routingPaths = new ArrayList<>(matchingRoutingPaths);
break;
}
}
}
return IdLoader.createTsIdLoader(indexRouting, routingPaths, indexService.getIndexSettings().useTimeSeriesSyntheticId());
} else {
return IdLoader.fromLeafStoredFieldLoader();
}
return IdLoader.create(indexService.mapperService());
}
}