Fix unqualified search for collector instances table (#25479)#25567
Merged
Fix unqualified search for collector instances table (#25479)#25567
Conversation
SearchQueryParser ignored bsonFilterCreator and dbField overrides when resolving the default search field from EntityAttributes. Unqualified searches (bare terms without a field: prefix) generated queries against the literal default field name instead of using the attribute's custom filter logic, producing empty results for fields backed by attribute arrays. Resolve the default field from the dbFieldMapping after it is built so it inherits the bsonFilterCreator and correct dbField. Also update the collector instances resource to use hostname as the default search field instead of instance_uid.
thll
approved these changes
Apr 15, 2026
Contributor
thll
left a comment
thll
left a comment
There was a problem hiding this comment.
Works!
A bit of JavaDoc would be nice but I'm approving anyways.
| @@ -142,9 +142,15 @@ public SearchQueryParser(@Nonnull String defaultField, | |||
| public SearchQueryParser(@Nonnull String defaultField, | |||
Contributor
There was a problem hiding this comment.
Could we add JavaDoc explaining the behavior? The other constructor require the default field to be already mapped, this is different here.
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
3 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.
Description
SearchQueryParser ignored bsonFilterCreator and dbField overrides when resolving the default search field from EntityAttributes. Unqualified searches (bare terms without a field: prefix) generated queries against the literal default field name instead of using the attribute's custom filter logic, producing empty results for fields backed by attribute arrays.
Resolve the default field from the dbFieldMapping after it is built so it inherits the bsonFilterCreator and correct dbField. Also update the collector instances resource to use hostname as the default search field instead of instance_uid.
/nocl internal improvement
Fixes #25479
How Has This Been Tested?
Added test cases.
Screenshots (if appropriate):
Types of changes
Checklist: