Refactor SourceProvider creation to consistently use MappingLookup #128213
Conversation
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
This change updates the code to always create SourceProvider instances via MappingLookup, avoiding direct exposure to the underlying source format (synthetic or stored). It also aligns source filtering behavior between SourceProvider and SourceLoader, ensuring consistent application of filters. This change is needed to enable source filtering to occur earlier in the fetch phase, for example, when constructing a synthetic source.
jimczi
added
>enhancement
:StorageEngine/Mapping
Collaborator
|
Pinging @elastic/es-storage-engine (Team:StorageEngine) |
Collaborator
|
Hi @jimczi, I've created a changelog YAML for you. |
martijnvg
approved these changes
May 21, 2025
Member
martijnvg
left a comment
martijnvg
left a comment
There was a problem hiding this comment.
Two minor comments, LGTM otherwise.
server/src/main/java/org/elasticsearch/search/lookup/SourceProvider.java
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/search/lookup/SourceProvider.java
Show resolved
Hide resolved
kkrik-es
reviewed
May 21, 2025
| new SearchLookup( | ||
| field -> null, | ||
| (ft, lookup, fdt) -> null, | ||
| SourceProvider.fromLookup(MappingLookup.EMPTY, null, SourceFieldMetrics.NOOP) |
Contributor
There was a problem hiding this comment.
Nit: add a test-only factory:
SourceProvider getEmptySourceProvider() {
return SourceProvider.fromLookup(MappingLookup.EMPTY, null, SourceFieldMetrics.NOOP);
}
Contributor
There was a problem hiding this comment.
And maybe another one using MapperService.
Contributor
Author
There was a problem hiding this comment.
I thought about that but I like the fact that these tests are purposively using an empty mapping rather than a direct method. It's not really an empty source provider, just a source provider with an empty mapping and I don't want to encourage writing more tests with this pattern.
kkrik-es
approved these changes
May 21, 2025
jimczi
added a commit
to jimczi/elasticsearch
that referenced
this pull request
May 22, 2025
…lastic#128213) This change updates the code to always create SourceProvider instances via MappingLookup, avoiding direct exposure to the underlying source format (synthetic or stored). It also aligns source filtering behaviour between SourceProvider and SourceLoader, ensuring consistent application of filters. This change is needed to enable source filtering to occur earlier in the fetch phase, for example, when constructing a synthetic source.
elasticsearchmachine
pushed a commit
that referenced
this pull request
May 22, 2025
…128213) (#128312) This change updates the code to always create SourceProvider instances via MappingLookup, avoiding direct exposure to the underlying source format (synthetic or stored). It also aligns source filtering behaviour between SourceProvider and SourceLoader, ensuring consistent application of filters. This change is needed to enable source filtering to occur earlier in the fetch phase, for example, when constructing a synthetic source.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This change updates the code to always create SourceProvider instances via MappingLookup, avoiding direct exposure to the underlying source format (synthetic or stored). It also aligns source filtering behavior between SourceProvider and SourceLoader, ensuring consistent application of filters.
This change is needed to enable source filtering to occur earlier in the fetch phase, for example, when constructing a synthetic source.