Skip to content

Fix child QueryResult lifetime after parent close #1

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

Open
magyargergo wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix child QueryResult lifetime after parent close #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81778f0
Fix child QueryResult lifetime after parent close
magyargergo Mar 15, 2026
7def8b1
Add QueryResult close-order regression tests
magyargergo Mar 15, 2026
ff7b82a
Strengthen NodeQueryResult ownership model
magyargergo Mar 16, 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
19 changes: 10 additions & 9 deletions src_cpp/include/node_connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ class ConnectionExecuteAsyncWorker : public Napi::AsyncWorker {
try {
auto result =
connection
->executeWithParamsWithID(preparedStatement.get(), std::move(params), queryID)
.release();
nodeQueryResult->SetQueryResult(result, true);
if (!result->isSuccess()) {
SetError(result->getErrorMessage());
->executeWithParamsWithID(preparedStatement.get(), std::move(params), queryID);
auto* resultRaw = result.get();
nodeQueryResult->AdoptQueryResult(std::move(result));
if (!resultRaw->isSuccess()) {
SetError(resultRaw->getErrorMessage());
return;
}
} catch (const std::exception& exc) {
Expand Down Expand Up @@ -155,10 +155,11 @@ class ConnectionQueryAsyncWorker : public Napi::AsyncWorker {
progressBar->toggleProgressBarPrinting(true);
}
try {
auto result = connection->queryWithID(statement, queryID).release();
nodeQueryResult->SetQueryResult(result, true);
if (!result->isSuccess()) {
SetError(result->getErrorMessage());
auto result = connection->queryWithID(statement, queryID);
auto* resultRaw = result.get();
nodeQueryResult->AdoptQueryResult(std::move(result));
if (!resultRaw->isSuccess()) {
SetError(resultRaw->getErrorMessage());
}
} catch (const std::exception& exc) {
SetError(std::string(exc.what()));
Expand Down
108 changes: 83 additions & 25 deletions src_cpp/include/node_query_result.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "node_util.h"
#include "planner/operator/logical_plan.h"
#include "processor/result/factorized_table.h"
#include <atomic>
#include <memory>
#include <napi.h>

using namespace lbug::processor;
Expand All @@ -18,8 +20,10 @@ class NodeQueryResult : public Napi::ObjectWrap<NodeQueryResult> {

public:
static Napi::Object Init(Napi::Env env, Napi::Object exports);
static Napi::Object NewInstance(Napi::Env env, std::unique_ptr<QueryResult> queryResult);
explicit NodeQueryResult(const Napi::CallbackInfo& info);
void SetQueryResult(QueryResult* queryResult, bool isOwned);
void AdoptQueryResult(std::unique_ptr<QueryResult> queryResult);
std::unique_ptr<QueryResult> DetachNextQueryResult();
~NodeQueryResult() override;

private:
Expand All @@ -40,11 +44,16 @@ class NodeQueryResult : public Napi::ObjectWrap<NodeQueryResult> {
void PopulateColumnNames();
void Close(const Napi::CallbackInfo& info);
void Close();
QueryResult& GetQueryResult() const;
void AcquireAsyncUse();
void ReleaseAsyncUse();
void ThrowIfAsyncOperationInFlight(const char* operation) const;

private:
QueryResult* queryResult = nullptr;
static Napi::FunctionReference constructor;
std::unique_ptr<QueryResult> ownedQueryResult = nullptr;
std::unique_ptr<std::vector<std::string>> columnNames = nullptr;
bool isOwned = false;
std::atomic<uint32_t> activeAsyncUses = 0;
};

enum GetColumnMetadataType { DATA_TYPE, NAME };
Expand All @@ -53,14 +62,17 @@ class NodeQueryResultGetColumnMetadataAsyncWorker : public Napi::AsyncWorker {
public:
NodeQueryResultGetColumnMetadataAsyncWorker(Napi::Function& callback,
NodeQueryResult* nodeQueryResult, GetColumnMetadataType type)
: AsyncWorker(callback), nodeQueryResult(nodeQueryResult), type(type) {}
: AsyncWorker(callback), nodeQueryResult(nodeQueryResult), type(type) {
nodeQueryResult->AcquireAsyncUse();
nodeQueryResult->Ref();
}

~NodeQueryResultGetColumnMetadataAsyncWorker() override = default;

inline void Execute() override {
try {
if (type == GetColumnMetadataType::DATA_TYPE) {
auto columnDataTypes = nodeQueryResult->queryResult->getColumnDataTypes();
auto columnDataTypes = nodeQueryResult->GetQueryResult().getColumnDataTypes();
result = std::vector<std::string>(columnDataTypes.size());
for (auto i = 0u; i < columnDataTypes.size(); ++i) {
result[i] = columnDataTypes[i].toString();
Expand All @@ -80,10 +92,16 @@ class NodeQueryResultGetColumnMetadataAsyncWorker : public Napi::AsyncWorker {
for (auto i = 0u; i < result.size(); ++i) {
nodeResult.Set(i, result[i]);
}
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({env.Null(), nodeResult});
}

inline void OnError(Napi::Error const& error) override { Callback().Call({error.Value()}); }
inline void OnError(Napi::Error const& error) override {
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({error.Value()});
}

private:
NodeQueryResult* nodeQueryResult;
Expand All @@ -94,16 +112,20 @@ class NodeQueryResultGetColumnMetadataAsyncWorker : public Napi::AsyncWorker {
class NodeQueryResultGetNextAsyncWorker : public Napi::AsyncWorker {
public:
NodeQueryResultGetNextAsyncWorker(Napi::Function& callback, NodeQueryResult* nodeQueryResult)
: AsyncWorker(callback), nodeQueryResult(nodeQueryResult) {}
: AsyncWorker(callback), nodeQueryResult(nodeQueryResult) {
nodeQueryResult->AcquireAsyncUse();
nodeQueryResult->Ref();
}

~NodeQueryResultGetNextAsyncWorker() override = default;

inline void Execute() override {
try {
if (!nodeQueryResult->queryResult->hasNext()) {
auto& queryResult = nodeQueryResult->GetQueryResult();
if (!queryResult.hasNext()) {
cppTuple.reset();
}
cppTuple = nodeQueryResult->queryResult->getNext();
cppTuple = queryResult.getNext();
} catch (const std::exception& exc) {
SetError(std::string(exc.what()));
}
Expand All @@ -112,24 +134,35 @@ class NodeQueryResultGetNextAsyncWorker : public Napi::AsyncWorker {
inline void OnOK() override {
auto env = Env();
if (cppTuple == nullptr) {
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({env.Null(), env.Undefined()});
return;
}
Napi::Object nodeTuple = Napi::Object::New(env);
try {
auto columnNames = nodeQueryResult->queryResult->getColumnNames();
auto columnNames = nodeQueryResult->GetQueryResult().getColumnNames();
for (auto i = 0u; i < cppTuple->len(); ++i) {
Napi::Value value = Util::ConvertToNapiObject(*cppTuple->getValue(i), env);
nodeTuple.Set(columnNames[i], value);
}
} catch (const std::exception& exc) {
auto napiError = Napi::Error::New(env, exc.what());
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({napiError.Value(), env.Undefined()});
return;
}
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({env.Null(), nodeTuple});
}

inline void OnError(Napi::Error const& error) override { Callback().Call({error.Value()}); }
inline void OnError(Napi::Error const& error) override {
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({error.Value()});
}

private:
NodeQueryResult* nodeQueryResult;
Expand All @@ -138,46 +171,65 @@ class NodeQueryResultGetNextAsyncWorker : public Napi::AsyncWorker {

class NodeQueryResultGetNextQueryResultAsyncWorker : public Napi::AsyncWorker {
public:
NodeQueryResultGetNextQueryResultAsyncWorker(Napi::Function& callback,
NodeQueryResult* currentQueryResult, NodeQueryResult* nextQueryResult)
: AsyncWorker(callback), currQueryResult(currentQueryResult),
nextQueryResult(nextQueryResult) {}
NodeQueryResultGetNextQueryResultAsyncWorker(
Napi::Function& callback, NodeQueryResult* currentQueryResult)
: AsyncWorker(callback), currQueryResult(currentQueryResult) {
currQueryResult->AcquireAsyncUse();
currQueryResult->Ref();
}

~NodeQueryResultGetNextQueryResultAsyncWorker() override = default;

void Execute() override {
try {
auto nextResult = currQueryResult->queryResult->getNextQueryResult();
if (!nextResult->isSuccess()) {
SetError(nextResult->getErrorMessage());
nextOwnedResult = currQueryResult->DetachNextQueryResult();
if (nextOwnedResult == nullptr) {
return;
}
nextQueryResult->SetQueryResult(nextResult, false);
if (!nextOwnedResult->isSuccess()) {
SetError(nextOwnedResult->getErrorMessage());
}
} catch (const std::exception& exc) {
SetError(std::string(exc.what()));
}
}

void OnOK() override { Callback().Call({Env().Null()}); }
void OnOK() override {
auto env = Env();
currQueryResult->ReleaseAsyncUse();
currQueryResult->Unref();
if (nextOwnedResult == nullptr) {
Callback().Call({env.Null(), env.Undefined()});
return;
}
Callback().Call({env.Null(), NodeQueryResult::NewInstance(env, std::move(nextOwnedResult))});
}

void OnError(Napi::Error const& error) override { Callback().Call({error.Value()}); }
void OnError(Napi::Error const& error) override {
currQueryResult->ReleaseAsyncUse();
currQueryResult->Unref();
Callback().Call({error.Value()});
}

private:
NodeQueryResult* currQueryResult;
NodeQueryResult* nextQueryResult;
std::unique_ptr<QueryResult> nextOwnedResult;
};

class NodeQueryResultGetQuerySummaryAsyncWorker : public Napi::AsyncWorker {
public:
NodeQueryResultGetQuerySummaryAsyncWorker(Napi::Function& callback,
NodeQueryResult* nodeQueryResult)
: AsyncWorker(callback), nodeQueryResult(nodeQueryResult) {}
: AsyncWorker(callback), nodeQueryResult(nodeQueryResult) {
nodeQueryResult->AcquireAsyncUse();
nodeQueryResult->Ref();
}

~NodeQueryResultGetQuerySummaryAsyncWorker() override = default;

inline void Execute() override {
try {
auto querySummary = nodeQueryResult->queryResult->getQuerySummary();
auto querySummary = nodeQueryResult->GetQueryResult().getQuerySummary();
result["compilingTime"] = querySummary->getCompilingTime();
result["executionTime"] = querySummary->getExecutionTime();
} catch (const std::exception& exc) {
Expand All @@ -191,10 +243,16 @@ class NodeQueryResultGetQuerySummaryAsyncWorker : public Napi::AsyncWorker {
for (const auto& [key, value] : result) {
nodeResult.Set(key, Napi::Number::New(env, value));
}
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({env.Null(), nodeResult});
}

inline void OnError(Napi::Error const& error) override { Callback().Call({error.Value()}); }
inline void OnError(Napi::Error const& error) override {
nodeQueryResult->ReleaseAsyncUse();
nodeQueryResult->Unref();
Callback().Call({error.Value()});
}

private:
NodeQueryResult* nodeQueryResult;
Expand Down
22 changes: 11 additions & 11 deletions src_cpp/node_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,11 @@ Napi::Value NodeConnection::QuerySync(const Napi::CallbackInfo& info) {
auto statement = info[0].As<Napi::String>().Utf8Value();
auto nodeQueryResult = Napi::ObjectWrap<NodeQueryResult>::Unwrap(info[1].As<Napi::Object>());
try {
auto result = connection->query(statement).release();
nodeQueryResult->SetQueryResult(result, true);
if (!result->isSuccess()) {
Napi::Error::New(env, result->getErrorMessage()).ThrowAsJavaScriptException();
auto result = connection->query(statement);
auto* resultRaw = result.get();
nodeQueryResult->AdoptQueryResult(std::move(result));
if (!resultRaw->isSuccess()) {
Napi::Error::New(env, resultRaw->getErrorMessage()).ThrowAsJavaScriptException();
}
} catch (const std::exception& exc) {
Napi::Error::New(env, std::string(exc.what())).ThrowAsJavaScriptException();
Expand All @@ -132,13 +133,12 @@ Napi::Value NodeConnection::ExecuteSync(const Napi::CallbackInfo& info) {
auto nodeQueryResult = Napi::ObjectWrap<NodeQueryResult>::Unwrap(info[1].As<Napi::Object>());
try {
auto params = Util::TransformParametersForExec(info[2].As<Napi::Array>());
auto result = connection
->executeWithParams(nodePreparedStatement->preparedStatement.get(),
std::move(params))
.release();
nodeQueryResult->SetQueryResult(result, true);
if (!result->isSuccess()) {
Napi::Error::New(env, result->getErrorMessage()).ThrowAsJavaScriptException();
auto result = connection->executeWithParams(nodePreparedStatement->preparedStatement.get(),
std::move(params));
auto* resultRaw = result.get();
nodeQueryResult->AdoptQueryResult(std::move(result));
if (!resultRaw->isSuccess()) {
Napi::Error::New(env, resultRaw->getErrorMessage()).ThrowAsJavaScriptException();
}
} catch (const std::exception& exc) {
Napi::Error::New(env, std::string(exc.what())).ThrowAsJavaScriptException();
Expand Down
Loading