handle node deleted merge edge case #5026
Merged
Conversation
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
github-actions
bot
added
the
group/backend
CodSpeed Performance ReportMerging #5026 will improve performances by 34.01%Comparing Summary
Benchmarks breakdown
|
ajtmccarty
force-pushed
the
ajtm-11222024-node-merge-full-delete
branch
from
b91e120 to
fa55c0a
Compare
dgarros
approved these changes
Nov 26, 2024
ogenstad
approved these changes
Nov 26, 2024
LucasG0
pushed a commit
that referenced
this pull request
Nov 28, 2024
* handle node deleted merge edge case * fix query
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.
fixes #3315
IFC-312
final piece of handling deleted node conflicts in the new diff and merge
this PR adds a shortcut to delete everything connected to a node deleted in the diff during the merge. this should improve performance if a diff includes a lot of deleted nodes
it also fixes a problem that could arise if a node was deleted on a branch and had a one-way relationship added to it on main or vice versa. the deleted node and all of its attributes/relationships would be set to deleted except for the new relationship added on main. added a test with some customer cypher queries to verify it