Merge branch 'asof_join_wait_for_process_task' into combined2

Rafał Hibner · Rafał Hibner · commit 3cf060eb07ea · 2025-07-03T14:57:41.000Z
diff --git a/cpp/src/arrow/acero/asof_join_node.cc b/cpp/src/arrow/acero/asof_join_node.cc
@@ -1154,6 +1154,7 @@ class AsofJoinNode : public ExecNode {
       process_thread_.join();
     }
 #endif
+    process_task_.Wait();
   }
 
   const std::vector<col_index_t>& indices_of_on_key() { return indices_of_on_key_; }
@@ -1648,7 +1649,8 @@ AsofJoinNode::AsofJoinNode(ExecPlan* plan, NodeVector inputs,
 #ifdef ARROW_ENABLE_THREADING
       ,
       process_(),
-      process_thread_()
+      process_thread_(),
+      process_task_(Future<>::MakeFinished())
 #endif
 {
   for (auto& key_hasher : key_hashers_) {

Original file line number	Diff line number	Diff line change
`@@ -1154,6 +1154,7 @@ class AsofJoinNode : public ExecNode {`
`1154`	`1154`	`process_thread_.join();`
`1155`	`1155`	`}`
`1156`	`1156`	`#endif`
	`1157`	`+ process_task_.Wait();`
`1157`	`1158`	`}`
`1158`	`1159`
`1159`	`1160`	`const std::vector<col_index_t>& indices_of_on_key() { return indices_of_on_key_; }`
`@@ -1648,7 +1649,8 @@ AsofJoinNode::AsofJoinNode(ExecPlan* plan, NodeVector inputs,`
`1648`	`1649`	`#ifdef ARROW_ENABLE_THREADING`
`1649`	`1650`	`,`
`1650`	`1651`	`process_(),`
`1651`		`- process_thread_()`
	`1652`	`+ process_thread_(),`
	`1653`	`+ process_task_(Future<>::MakeFinished())`
`1652`	`1654`	`#endif`
`1653`	`1655`	`{`
`1654`	`1656`	`for (auto& key_hasher : key_hashers_) {`