Skip to content

fix: don't use external buffers on platforms without support #3

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

Merged
merged 2 commits into from
Oct 6, 2023
Merged

fix: don't use external buffers on platforms without support #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58a0aa1
don't fail hard on missing external buffers
Mause Oct 4, 2023
300279c
build: skip excess build in Makefile
Mause Oct 5, 2023
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: build

./node_modules:
npm install --build-from-source
npm install --ignore-scripts

build: ./node_modules
./node_modules/.bin/node-pre-gyp build -j max --loglevel=silent
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"gypfile": true,
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.0",
"node-addon-api": "*",
"node-addon-api": "^7.0.0",
"node-gyp": "^9.3.0"
},
"binary": {
Expand Down
8 changes: 4 additions & 4 deletions src/statement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,10 @@ struct RunPreparedTask : public Task {
// query results, the string data is owned by the QueryResult
auto result_ref_ptr = new std::shared_ptr<duckdb::QueryResult>(result_ptr);

auto array_buffer =
Napi::ArrayBuffer::New(env, (void *)blob.GetData(), blob.GetSize(), deleter, result_ref_ptr);
auto array_buffer = Napi::Buffer<char>::NewOrCopy(env, (char *)blob.GetData(), blob.GetSize(),
deleter, result_ref_ptr);

auto typed_array = Napi::Uint8Array::New(env, blob.GetSize(), array_buffer, 0);
auto typed_array = Napi::TypedArrayOf<char>(env, array_buffer);

// TODO we should handle this in duckdb probably
if (is_header) {
Expand Down Expand Up @@ -708,7 +708,7 @@ struct GetNextArrowIpcTask : public Task {
delete static_cast<unique_ptr<duckdb::DataChunk> *>(hint);
};
auto array_buffer =
Napi::ArrayBuffer::New(env, (void *)blob.GetData(), blob.GetSize(), deleter, data_chunk_ptr);
Napi::Buffer<char>::NewOrCopy(env, (char *)blob.GetData(), blob.GetSize(), deleter, data_chunk_ptr);

deferred.Resolve(array_buffer);
}
Expand Down