Merge pull request #375 from duckdb/jray/fix-scalar-fn-race

jraymakers · web-flow · commit 00f16abb92d7 · 2026-03-22T12:16:13.000-07:00
fix scalar fn race
diff --git a/bindings/src/duckdb_node_bindings.cpp b/bindings/src/duckdb_node_bindings.cpp
@@ -832,8 +832,8 @@ void ScalarFunctionBindTSFNCallback(Napi::Env env, Napi::Function callback, Scal
   {
     std::lock_guard lk(*data->cv_mutex);
     data->done = true;
-  }
-  data->cv->notify_one();
+    data->cv->notify_one();
+  } 
 }
 
 ScalarFunctionInternalExtraInfo *GetScalarFunctionInternalExtraInfoFromBindInfo(duckdb_bind_info bind_info) {
@@ -891,8 +891,8 @@ void ScalarFunctionMainTSFNCallback(Napi::Env env, Napi::Function callback, Scal
   {
     std::lock_guard lk(*data->cv_mutex);
     data->done = true;
+    data->cv->notify_one();
   }
-  data->cv->notify_one();
 }
 
 ScalarFunctionInternalExtraInfo *GetScalarFunctionInternalExtraInfoFromFunctionInfo(duckdb_function_info function_info) {

Original file line number	Diff line number	Diff line change
`@@ -832,8 +832,8 @@ void ScalarFunctionBindTSFNCallback(Napi::Env env, Napi::Function callback, Scal`
`832`	`832`	`{`
`833`	`833`	`std::lock_guard lk(*data->cv_mutex);`
`834`	`834`	`data->done = true;`
`835`		`- }`
`836`		`- data->cv->notify_one();`
	`835`	`+ data->cv->notify_one();`
	`836`	`+ }`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`ScalarFunctionInternalExtraInfo *GetScalarFunctionInternalExtraInfoFromBindInfo(duckdb_bind_info bind_info) {`
`@@ -891,8 +891,8 @@ void ScalarFunctionMainTSFNCallback(Napi::Env env, Napi::Function callback, Scal`
`891`	`891`	`{`
`892`	`892`	`std::lock_guard lk(*data->cv_mutex);`
`893`	`893`	`data->done = true;`
	`894`	`+ data->cv->notify_one();`
`894`	`895`	`}`
`895`		`- data->cv->notify_one();`
`896`	`896`	`}`
`897`	`897`
`898`	`898`	`ScalarFunctionInternalExtraInfo *GetScalarFunctionInternalExtraInfoFromFunctionInfo(duckdb_function_info function_info) {`