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.

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

feat: Update core to duckdb v0.10.0 #90

Merged
merged 5 commits into from
Feb 27, 2024
Merged

feat: Update core to duckdb v0.10.0 #90

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d11bd58
Update code generation for Makevars.win
krlmlr Feb 27, 2024
c46a6bf
chore: Update vendored sources to duckdb/duckdb@a20a91c5a4159ac857177…
krlmlr Feb 27, 2024
f72a289
change is finished to is finished or blocked
Tmonster Feb 26, 2024
7576cb3
chore: Update vendored sources to duckdb/duckdb@583508495b61d44a246d1…
krlmlr Feb 27, 2024
8735f7c
Pretend we're on the old version
krlmlr Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/statement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ bool FetchArrowChunk(ChunkScanState &scan_state, ClientProperties options, Appen
do {
execution_result = pending_query->ExecuteTask();
R_CheckUserInterrupt();
} while (!PendingQueryResult::IsFinished(execution_result));
} while (!PendingQueryResult::IsFinishedOrBlocked(execution_result));
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Tmonster: I cherry-picked this for #90, this seemed necessary due to some change in the core. This now breaks again, #190, after duckdb/duckdb#12636. Is this safe to revert, what do you think?

CC @Tishj.

if (execution_result == PendingExecutionResult::EXECUTION_ERROR) {
cpp11::stop("rapi_execute: Failed to run query\nError: %s", pending_query->GetError().c_str());
}
Expand Down