-
Notifications
You must be signed in to change notification settings - Fork 24.7k
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.
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
Handle ignored fields directly in SourceValueFetcher #68738
Merged
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c738b87
Handle ignored fields directly in SourceValueFetcher
romseygeek 174f3bb
Merge remote-tracking branch 'origin/master' into fetch/ignored-fields
romseygeek 0b2572a
Merge remote-tracking branch 'origin/master' into fetch/ignored-fields
romseygeek edcf43d
Merge remote-tracking branch 'origin/master' into fetch/ignored-fields
romseygeek b793998
Add YAML test; small cleanups
romseygeek 38cc321
Merge remote-tracking branch 'origin/master' into fetch/ignored-fields
romseygeek 865f332
Add a unit test as well
romseygeek 3caf378
Merge branch 'master' into fetch/ignored-fields
elasticmachine 6cab139
Merge branch 'master' into fetch/ignored-fields
elasticmachine File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Handle ignored fields directly in SourceValueFetcher
- Loading branch information
commit c738b87c5c9b7f01badf2acb7315277b33290897
There are no files selected for viewing
This file contains 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 file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,7 +27,6 @@ | |
public abstract class ArraySourceValueFetcher implements ValueFetcher { | ||
private final Set<String> sourcePaths; | ||
private final @Nullable Object nullValue; | ||
private final String fieldName; | ||
|
||
public ArraySourceValueFetcher(String fieldName, SearchExecutionContext context) { | ||
this(fieldName, context, null); | ||
|
@@ -41,21 +40,24 @@ public ArraySourceValueFetcher(String fieldName, SearchExecutionContext context) | |
public ArraySourceValueFetcher(String fieldName, SearchExecutionContext context, Object nullValue) { | ||
this.sourcePaths = context.sourcePath(fieldName); | ||
this.nullValue = nullValue; | ||
this.fieldName = fieldName; | ||
} | ||
|
||
@Override | ||
public List<Object> fetchValues(SourceLookup lookup, Set<String> ignoredFields) { | ||
public List<Object> fetchValues(SourceLookup lookup) { | ||
List<Object> values = new ArrayList<>(); | ||
if (ignoredFields.contains(fieldName)) { | ||
return values; | ||
} | ||
for (String path : sourcePaths) { | ||
Object sourceValue = lookup.extractValue(path, nullValue); | ||
if (sourceValue == null) { | ||
return List.of(); | ||
} | ||
values.addAll((List<?>) parseSourceValue(sourceValue)); | ||
try { | ||
values.addAll((List<?>) parseSourceValue(sourceValue)); | ||
} | ||
catch (Exception e) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Small comment, we always put |
||
// if parsing fails here then it would have failed at index time | ||
// as well, meaning that we must be ignoring malformed values. | ||
// So ignore it here too. | ||
} | ||
} | ||
return values; | ||
} | ||
|
This file contains 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 file contains 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 file contains 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 file contains 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 file contains 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 file contains 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 file contains 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 file contains 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 file contains 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 file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small comment, could be
lookup -> List.of()
.