Add Optional Source Filtering to Source Loaders#113827
Merged
jimczi merged 19 commits intoelastic:mainfrom Dec 11, 2024
Merged
Conversation
Spinoff of elastic#113036. This change introduces optional source filtering directly within source loaders (both synthetic and stored). The main benefit is seen in synthetic source loaders, as synthetic fields are stored independently. By filtering while loading the synthetic source, generating the source becomes linear in the number of fields that match the filter. This update also modifies the get document API to apply source filters earlier—directly through the source loader. The search API, however, is not affected in this change, since the loaded source is still used by other features (e.g., highlighting, fields, nested hits), and source filtering is always applied as the final step. A follow-up will be required to ensure careful handling of all search-related scenarios.
jimczi
added
>enhancement
:StorageEngine/Mapping
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
Collaborator
|
Hi @jimczi, I've created a changelog YAML for you. |
rjernst
reviewed
Sep 30, 2024
.../impl/src/main/java/org/elasticsearch/xcontent/provider/XContentParserConfigurationImpl.java
Outdated
Show resolved
Hide resolved
kkrik-es
reviewed
Oct 1, 2024
| protected SourceLoader.SyntheticFieldLoader syntheticFieldLoader(Stream<Mapper> mappers, boolean isFragment) { | ||
| var fields = mappers.sorted(Comparator.comparing(Mapper::fullPath)) | ||
| .map(Mapper::syntheticFieldLoader) | ||
| SourceLoader.SyntheticFieldLoader syntheticFieldLoader(SourceFilter filter, Collection<Mapper> mappers, boolean isFragment) { |
Contributor
There was a problem hiding this comment.
Nit: keep passing the stream to avoid reconverting the list to a stream?
I also wonder about the overhead here, shall we skip streams altogether and use good-old collections?
kkrik-es
reviewed
Oct 1, 2024
server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java
Outdated
Show resolved
Hide resolved
kkrik-es
reviewed
Oct 1, 2024
server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java
Outdated
Show resolved
Hide resolved
Contributor
|
Looks good overall, added Martijn and Sasha to get another look, since this is a core part of synthetic source. Do we have any benchmark results quantifying the impact of this? |
rjernst
approved these changes
Oct 1, 2024
libs/x-content/src/main/java/org/elasticsearch/xcontent/XContentParserConfiguration.java
Outdated
Show resolved
Hide resolved
lkts
approved these changes
Oct 3, 2024
Contributor
lkts
left a comment
lkts
left a comment
There was a problem hiding this comment.
This is great, synthetic source changes look good to me. I wonder if there is any performance impact when filtering is not used compared to current state.
server/src/main/java/org/elasticsearch/index/mapper/XContentDataHelper.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/mapper/XContentDataHelper.java
Outdated
Show resolved
Hide resolved
kkrik-es
approved these changes
Oct 8, 2024
3 tasks
Contributor
|
@jimczi any chance you can get back to submitting this? It should also help with fetching fields from synthetic source in ES|QL, with proper block loader adjustments. |
Contributor
Author
|
@kkrik-es I have updated the branch and can proceed with merging this PR as is, provided there are no objections. Please let me know if you have any concerns or additional feedback. |
Contributor
|
I think we've all approved, very excited to see it submitted. |
jimczi
added
the
auto-backport
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
jimczi
added a commit
to jimczi/elasticsearch
that referenced
this pull request
Dec 11, 2024
This change introduces optional source filtering directly within source loaders (both synthetic and stored). The main benefit is seen in synthetic source loaders, as synthetic fields are stored independently. By filtering while loading the synthetic source, generating the source becomes linear in the number of fields that match the filter. This update also modifies the get document API to apply source filters earlier—directly through the source loader. The search API, however, is not affected in this change, since the loaded source is still used by other features (e.g., highlighting, fields, nested hits), and source filtering is always applied as the final step. A follow-up will be required to ensure careful handling of all search-related scenarios.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 11, 2024
This change introduces optional source filtering directly within source loaders (both synthetic and stored). The main benefit is seen in synthetic source loaders, as synthetic fields are stored independently. By filtering while loading the synthetic source, generating the source becomes linear in the number of fields that match the filter. This update also modifies the get document API to apply source filters earlier—directly through the source loader. The search API, however, is not affected in this change, since the loaded source is still used by other features (e.g., highlighting, fields, nested hits), and source filtering is always applied as the final step. A follow-up will be required to ensure careful handling of all search-related scenarios.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Spinoff of #113036.
This change introduces optional source filtering directly within source loaders (both synthetic and stored). The main benefit is seen in synthetic source loaders, as synthetic fields are stored independently. By filtering while loading the synthetic source, generating the source becomes linear in the number of fields that match the filter.
This update also modifies the get document API to apply source filters earlier/directly through the source loader. The search API, however, is not affected in this change, since the loaded source is still used by other features (e.g., highlighting, fields, nested hits), and source filtering is always applied as the final step. A follow-up will be required to ensure careful handling of all search-related scenarios.