Skip to content

[Dev] Fix issue with UPSERT updating rows in the transaction-local storage #15927

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Feb 4, 2025
Merged

[Dev] Fix issue with UPSERT updating rows in the transaction-local storage #15927

merged 4 commits into from
Feb 4, 2025

Conversation

Tishj
Copy link
Contributor

@Tishj Tishj commented Jan 27, 2025

This PR fixes https://github.com/duckdblabs/duckdb-internal/issues/3670

Finalize the local append before attempting an update, or the node we're looking for is not reachable yet

@Tishj Tishj requested a review from taniabogatsch January 27, 2025 10:03
taniabogatsch
taniabogatsch reviewed Jan 27, 2025
View reviewed changes
@duckdb-draftbot duckdb-draftbot marked this pull request as draft January 28, 2025 11:18
@Tishj Tishj marked this pull request as ready for review January 28, 2025 11:20
@Tishj Tishj mentioned this pull request Jan 29, 2025
Merged
@Tishj Tishj requested a review from Mytherin January 29, 2025 11:03
@Mytherin
Copy link
Collaborator

Thanks! Could you just resolve the merge conflicts?

@duckdb-draftbot duckdb-draftbot marked this pull request as draft February 3, 2025 08:44
@Tishj Tishj marked this pull request as ready for review February 3, 2025 08:45
@Tishj
Copy link
Contributor Author

Tishj commented Feb 4, 2025

@Mytherin could you review this?
I think it's good to go

@Mytherin Mytherin changed the base branch from main to v1.2-histrionicus February 4, 2025 13:37
@Mytherin Mytherin merged commit 22158bb into duckdb:v1.2-histrionicus Feb 4, 2025
50 checks passed
@Mytherin
Copy link
Collaborator

Mytherin commented Feb 4, 2025

Thanks!

Mytherin added a commit that referenced this pull request Feb 4, 2025
@Mytherin
[Upsert] Fix use of RETURNING in combination with UPSERT (ON CONFLICT…
84dc9bc 
… DO ...) (#15977)

This PR fixes #15791

This branch is made from <#15927>
as both of them touch the same code and needed partially the same
changes.

The RETURNING result is now properly made to include each insert/update
that gets made, instead of the optimistic approach that was taken
before.
@Tishj Tishj mentioned this pull request Feb 20, 2025
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mytherin Mytherin Awaiting requested review from Mytherin

1 more reviewer

@taniabogatsch taniabogatsch taniabogatsch approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Ready For Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Tishj @Mytherin @taniabogatsch