Skip to content

Fix optimizer crash in JDBC by ensuring active_query is set during prepare #551

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

Closed
thijs-s wants to merge 2 commits into from
Closed

Fix optimizer crash in JDBC by ensuring active_query is set during prepare #551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3650842
Fix optimizer crash in JDBC prepare by initializing active_query
thijs-s Jan 30, 2026
e75a9d7
remove temporary test file
thijs-s Jan 30, 2026
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
26 changes: 25 additions & 1 deletion src/duckdb/src/main/client_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,26 @@ struct ActiveQueryContext {
BaseQueryResult *open_result = nullptr;
};

//! RAII wrapper that ensures the active query is reset if an exception occurs during preparation
struct ActiveQueryGuard {
unique_ptr<ActiveQueryContext> &active_query;
bool set_active_query;

ActiveQueryGuard(unique_ptr<ActiveQueryContext> &active_query_p, const string &query)
: active_query(active_query_p), set_active_query(false) {
if (!active_query) {
active_query = make_uniq<ActiveQueryContext>();
set_active_query = true;
active_query->query = query;
}
}
~ActiveQueryGuard() {
if (set_active_query) {
active_query.reset();
}
}
};

#ifdef DEBUG
struct DebugClientContextState : public ClientContextState {
~DebugClientContextState() override {
Expand Down Expand Up @@ -711,7 +731,11 @@ unique_ptr<PreparedStatement> ClientContext::PrepareInternal(ClientContextLock &
shared_ptr<PreparedStatementData> prepared_data;
auto unbound_statement = statement->Copy();
RunFunctionInTransactionInternal(
lock, [&]() { prepared_data = CreatePreparedStatement(lock, statement_query, std::move(statement), {}); },
lock,
[&]() {
ActiveQueryGuard guard(active_query, statement_query);
prepared_data = CreatePreparedStatement(lock, statement_query, std::move(statement), {});
},
false);
prepared_data->unbound_statement = std::move(unbound_statement);
return make_uniq<PreparedStatement>(shared_from_this(), std::move(prepared_data), std::move(statement_query),
Expand Down