fix(catalog): clear named queries on re-merge and deep-copy to prevent caller mutation - #3081
Open
pboyd wants to merge 1 commit into
Open
fix(catalog): clear named queries on re-merge and deep-copy to prevent caller mutation#3081pboyd wants to merge 1 commit into
pboyd wants to merge 1 commit into
Conversation
…t caller mutation Named queries in MCPSourceCollection, SourceCollection, and AgentSourceCollection were accumulated in a flat map with no per-origin tracking, so entries from a source persisted even after the source's config was re-parsed without any named queries. Replace the flat map with per-origin storage (namedQueryEntries) and compute the merged view on read, mirroring the existing pattern for sources. Also clone the namedQueries map and its nested FieldFilter.Value slices before storing them, so a caller mutating the map after Merge()/MergeWithNamedQueries() can no longer corrupt internal state or race with reads of the merged result. Assisted-by: Claude Signed-off-by: Paul Boyd <paul@pboyd.io>
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
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
1 participant
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
Named queries in MCPSourceCollection, SourceCollection, and AgentSourceCollection were accumulated in a flat map with no per-origin tracking, so entries from a source persisted even after the source's config was re-parsed without any named queries. Replace the flat map with per-origin storage (namedQueryEntries) and compute the merged view on read, mirroring the existing pattern for sources.
Also clone the namedQueries map and its nested FieldFilter.Value slices before storing them, so a caller mutating the map after Merge()/MergeWithNamedQueries() can no longer corrupt internal state or race with reads of the merged result.
How Has This Been Tested?
On a local dev cluster.
Merge criteria:
DCOcheck)