add node kind to node field specifiers #6359
Merged
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
github-actions
bot
added
the
group/backend
CodSpeed Performance ReportMerging #6359 will not alter performanceComparing Summary
|
ajtmccarty
force-pushed
the
ajtm-04242025-migrated-kind-diff-bug
branch
from
bf65e91 to
8c07957
Compare
ajtmccarty
changed the base branch from
stable
to
ajtm-0501-2025-drop-nodes-from-diff
FYI if you end your branch name with |
ajtmccarty
commented
May 2, 2025
| @@ -531,49 +541,6 @@ def from_calculated_diff( | |||
| nodes={EnrichedDiffNode.from_calculated_node(calculated_node=n) for n in calculated_diff.nodes}, | |||
| ) | |||
|
|
|||
| def add_parent( | |||
| return node_field_specifiers_map | ||
|
|
||
| def _remove_node_specifiers( |
There was a problem hiding this comment.
logic moved to NodeFieldSpecifierMap
backend/infrahub/core/query/diff.py
Outdated
There was a problem hiding this comment.
the change in here are just to use a list of uuids when filtering at the node-level to improve performance
ogenstad
approved these changes
May 6, 2025
LucasG0
reviewed
May 6, 2025
| @@ -85,9 +85,13 @@ def deserialize_tracking_id(tracking_id_str: str) -> TrackingId: | |||
| class NodeIdentifier: | |||
| uuid: str | |||
| kind: str | |||
| labels: frozenset[str] | |||
There was a problem hiding this comment.
It could be a good place here to add a comment explaining why we need both kind and labels in addition to uuid to uniquenely identify a database node
LucasG0
approved these changes
May 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
IFC-1452
changes to the core logic of the diff for how we track node uniqueness. previously, everything in the diff assumed a node's UUID was enough to uniquely identify it. this is usually the case, but if we update a node's inheritance or kind, then we will end up with multiple nodes with the same UUID at the database level. to fix this, we need to track node uniqueness by UUID, kind, and the labels of the node at the database level (which are determined by inheritance)
more changes will be required to correctly capture and merge changes from a node kind migration or a node inheritance migration