Skip to content
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

fix bug in merge logic that caused duplicate edges in the databae #5605

Merged
merged 1 commit into from
Jan 29, 2025

Conversation

ajtmccarty
Copy link
Contributor

Fixes #5569
IFC-1182

there was a bug in the logic to merge a branch into main that could cause duplicate IS_VISIBLE and IS_PROTECTED relationships to be created. this would cause the RelationshipGetPeerQuery to return the wrong number of relationships and would make the number of relationships appear incorrectly high

the test updates included in this PR use a plain cypher query to verify that no duplicate relationships exist, which is not how most of our tests operate, but it seems like the most thorough way to prevent the problem going forward

@github-actions github-actions bot added the group/backend Issue related to the backend (API Server, Git Agent) label Jan 28, 2025
Copy link

codspeed-hq bot commented Jan 28, 2025

CodSpeed Performance Report

Merging #5605 will not alter performance

Comparing ajtm-01282025-merge-property-bug (7c75a23) with stable (643197b)

Summary

✅ 10 untouched benchmarks

@ajtmccarty ajtmccarty marked this pull request as ready for review January 28, 2025 23:41
@ajtmccarty ajtmccarty requested a review from a team January 28, 2025 23:41
@ajtmccarty ajtmccarty merged commit 4a94619 into stable Jan 29, 2025
32 checks passed
@ajtmccarty ajtmccarty deleted the ajtm-01282025-merge-property-bug branch January 29, 2025 04:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
group/backend Issue related to the backend (API Server, Git Agent)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: Wrong Count on relationships after merging changes
2 participants