Skip to content

Pre-compile mapping_includes filter in LogsdbIndexModeSettingsProvider #136899

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 1 commit into from
Oct 22, 2025
+6 −2
Merged

Pre-compile mapping_includes filter in LogsdbIndexModeSettingsProvider #136899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions .../logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand All @@ -61,6 +62,10 @@ final class LogsdbIndexModeSettingsProvider implements IndexSettingProvider {
.stream()
.flatMap(v -> Stream.of(v, "_doc." + v))
.collect(Collectors.toSet());
private static final Function<Map<String, Object>, Map<String, Object>> MAPPING_INCLUDES_FILTER = XContentMapValues.filter(
MAPPING_INCLUDES.toArray(String[]::new),
new String[0]
);

private final LogsdbLicenseService licenseService;
private final SetOnce<CheckedFunction<IndexMetadata, MapperService, IOException>> mapperServiceFactory = new SetOnce<>();
Expand Down Expand Up @@ -264,14 +269,13 @@ MappingHints getMappingHints(
// The _doc.properties.host* is needed to determine whether host.name field can be injected.
// The _doc.subobjects is needed to determine whether subobjects is enabled.
List<CompressedXContent> filteredMappings = new ArrayList<>(combinedTemplateMappings.size());
String[] mappingIncludesArray = MAPPING_INCLUDES.toArray(String[]::new);
for (CompressedXContent mappingSource : combinedTemplateMappings) {
var ref = mappingSource.compressedReference();
Map<String, Object> map;
if (maybeUsesPatternText == false) {
var fullMap = XContentHelper.convertToMap(ref, true, XContentType.JSON).v2();
maybeUsesPatternText = checkMappingForPatternText(fullMap);
map = XContentMapValues.filter(fullMap, mappingIncludesArray, new String[0]);
map = MAPPING_INCLUDES_FILTER.apply(fullMap);
} else {
map = XContentHelper.convertToMap(ref, true, XContentType.JSON, MAPPING_INCLUDES, Set.of()).v2();
}
Expand Down