MergeInto: correctly clean-up buffer and handle non trivial GetData by carlopi · Pull Request #20163 · duckdb/duckdb · GitHub
Skip to content

MergeInto: correctly clean-up buffer and handle non trivial GetData - #20163

Merged
Mytherin merged 4 commits into
duckdb:v1.4-andiumfrom
carlopi:fixup_merge_into
Dec 17, 2025
Merged

Mytherin merged 4 commits into
duckdb:v1.4-andiumfrom
carlopi:fixup_merge_into

Conversation

@carlopi

@carlopi carlopi commented Dec 12, 2025 •

Copy link
Copy Markdown
Member

This has been made visible through testing code in main branch, but this is currently off in case of GetData returning non trivial GetData such as HAVE_MORE_OUTPUT and 0 results (both since it will not loop back AND since it will NOT cleanup results).

@carlopi
carlopi marked this pull request as ready for review December 12, 2025 13:44
Comment thread src/execution/operator/persistent/physical_merge_into.cpp
@duckdb-draftbot
duckdb-draftbot marked this pull request as draft December 16, 2025 12:45
@carlopi
carlopi marked this pull request as ready for review December 16, 2025 12:46
@carlopi
carlopi marked this pull request as draft December 16, 2025 13:52
@carlopi
carlopi marked this pull request as ready for review December 16, 2025 14:31
@staticlibs

Copy link
Copy Markdown
Member

@carlopi

carlopi commented Dec 16, 2025

Copy link
Copy Markdown
Member Author

The Windows CI failures is caused by the fact that that run includes duckdb/extension-ci-tools#276, but does not include #19415. Both should be included for Main Extensions to pass on Windows. I suggest to rebase the PR branch onto the latest main.

@staticlibs: I am not sure how that can be done, given #19415 has been merged in main, and this targets the v1.4-andium branch. So either #19415 needs to be retargeted to v1.4 branch as well (but it's OK to do in a patch release)? Or we need to handle the fact that we can't rely on extension-ci-tools@main to be a valid target.

@staticlibs

Copy link
Copy Markdown
Member

@carlopi

Ah, sorry, I missed the v1.4-andium target. You are fully correct, I think we should pin extension-ci-tools in 1.4 branch (will look into this now). Until the decision whether #19415 goes into 1.4 or not is made.

…m branch

This would need to be first merged into main, and then reverted, for added fun
@duckdb-draftbot
duckdb-draftbot marked this pull request as draft December 16, 2025 20:48
@carlopi
carlopi marked this pull request as ready for review December 16, 2025 21:46
@Mytherin
Mytherin merged commit 775bac5 into duckdb:v1.4-andium Dec 17, 2025
100 checks passed
@Mytherin

Copy link
Copy Markdown
Member

@carlopi
carlopi deleted the fixup_merge_into branch December 17, 2025 08:17
github-actions Bot pushed a commit to duckdb/duckdb-r that referenced this pull request Dec 31, 2025
Split statements by semicolon (duckdb/duckdb#20174)
Internal duckdb/duckdb#6881: 2025c Time Zones (duckdb/duckdb#20258)
Bump Julia to v1.4.3 (duckdb/duckdb#20248)
[Chore] Clean up CI nightly run to prevent time outs (duckdb/duckdb#20150)
Fix extentension-ci-tools to latest release version in the v1.4-andium branch (duckdb/duckdb#20227)
MergeInto: correctly clean-up buffer and handle non trivial GetData (duckdb/duckdb#20163)
github-actions Bot added a commit to duckdb/duckdb-r that referenced this pull request Dec 31, 2025
Split statements by semicolon (duckdb/duckdb#20174)
Internal duckdb/duckdb#6881: 2025c Time Zones (duckdb/duckdb#20258)
Bump Julia to v1.4.3 (duckdb/duckdb#20248)
[Chore] Clean up CI nightly run to prevent time outs (duckdb/duckdb#20150)
Fix extentension-ci-tools to latest release version in the v1.4-andium branch (duckdb/duckdb#20227)
MergeInto: correctly clean-up buffer and handle non trivial GetData (duckdb/duckdb#20163)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants