Skip to content

Commit e5035d3

Browse files
committed
clarify fn names for creation without finalizers
1 parent c707884 commit e5035d3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

bindings/src/duckdb_node_bindings.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ static const napi_type_tag FunctionInfoTypeTag = {
493493
0xB0E6739D698048EA, 0x9E79734E3E137AC3
494494
};
495495

496-
Napi::External<_duckdb_function_info> CreateExternalForFunctionInfo(Napi::Env env, duckdb_function_info function_info) {
496+
Napi::External<_duckdb_function_info> CreateExternalForFunctionInfoWithoutFinalizer(Napi::Env env, duckdb_function_info function_info) {
497497
// FunctionInfo objects are never explicitly created; they are passed in to function callbacks.
498498
return CreateExternalWithoutFinalizer<_duckdb_function_info>(env, FunctionInfoTypeTag, function_info);
499499
}
@@ -650,7 +650,7 @@ static const napi_type_tag VectorTypeTag = {
650650
0x9FE56DE8E3124D07, 0x9ABF31145EDE1C9E
651651
};
652652

653-
Napi::External<_duckdb_vector> CreateExternalForVector(Napi::Env env, duckdb_vector vector) {
653+
Napi::External<_duckdb_vector> CreateExternalForVectorWithoutFinalizer(Napi::Env env, duckdb_vector vector) {
654654
// Vectors live as long as their containing data chunk; they cannot be explicitly destroyed.
655655
return CreateExternalWithoutFinalizer<_duckdb_vector>(env, VectorTypeTag, vector);
656656
}
@@ -676,9 +676,9 @@ void ScalarFunctionMainCallback(Napi::Env env, Napi::Function callback, ScalarFu
676676
callback.Call(
677677
env.Undefined(),
678678
{
679-
CreateExternalForFunctionInfo(env, data->info),
679+
CreateExternalForFunctionInfoWithoutFinalizer(env, data->info),
680680
CreateExternalForDataChunkWithoutFinalizer(env, data->input),
681-
CreateExternalForVector(env, data->output)
681+
CreateExternalForVectorWithoutFinalizer(env, data->output)
682682
}
683683
);
684684
}
@@ -3794,7 +3794,7 @@ class DuckDBNodeAddon : public Napi::Addon<DuckDBNodeAddon> {
37943794
auto chunk = GetDataChunkFromExternal(env, info[0]);
37953795
auto column_index = info[1].As<Napi::Number>().Uint32Value();
37963796
auto vector = duckdb_data_chunk_get_vector(chunk, column_index);
3797-
return CreateExternalForVector(env, vector);
3797+
return CreateExternalForVectorWithoutFinalizer(env, vector);
37983798
}
37993799

38003800
// DUCKDB_C_API idx_t duckdb_data_chunk_get_size(duckdb_data_chunk chunk);
@@ -3893,7 +3893,7 @@ class DuckDBNodeAddon : public Napi::Addon<DuckDBNodeAddon> {
38933893
auto env = info.Env();
38943894
auto vector = GetVectorFromExternal(env, info[0]);
38953895
auto child = duckdb_list_vector_get_child(vector);
3896-
return CreateExternalForVector(env, child);
3896+
return CreateExternalForVectorWithoutFinalizer(env, child);
38973897
}
38983898

38993899
// DUCKDB_C_API idx_t duckdb_list_vector_get_size(duckdb_vector vector);
@@ -3932,7 +3932,7 @@ class DuckDBNodeAddon : public Napi::Addon<DuckDBNodeAddon> {
39323932
auto vector = GetVectorFromExternal(env, info[0]);
39333933
auto index = info[1].As<Napi::Number>().Uint32Value();
39343934
auto child = duckdb_struct_vector_get_child(vector, index);
3935-
return CreateExternalForVector(env, child);
3935+
return CreateExternalForVectorWithoutFinalizer(env, child);
39363936
}
39373937

39383938
// DUCKDB_C_API duckdb_vector duckdb_array_vector_get_child(duckdb_vector vector);
@@ -3941,7 +3941,7 @@ class DuckDBNodeAddon : public Napi::Addon<DuckDBNodeAddon> {
39413941
auto env = info.Env();
39423942
auto vector = GetVectorFromExternal(env, info[0]);
39433943
auto child = duckdb_array_vector_get_child(vector);
3944-
return CreateExternalForVector(env, child);
3944+
return CreateExternalForVectorWithoutFinalizer(env, child);
39453945
}
39463946

39473947
// DUCKDB_C_API void duckdb_slice_vector(duckdb_vector vector, duckdb_selection_vector selection, idx_t len);

0 commit comments

Comments
 (0)