Merge branch 'SortedMergeStop' into combined3

Rafał Hibner · Rafał Hibner · commit 7469eca77492 · 2025-09-25T10:18:10.000Z
diff --git a/cpp/src/arrow/acero/sorted_merge_node.cc b/cpp/src/arrow/acero/sorted_merge_node.cc
@@ -644,6 +644,7 @@ class SortedMergeNode : public ExecNode {
       // Implementation note: If the queue is empty, we will block here
       if (process_queue.WaitAndPop() == kPoisonPill) {
         EndFromProcessThread();
+        return;
       }
       // Either we're out of data or something went wrong
       if (!PollOnce()) {

Original file line number	Diff line number	Diff line change
`@@ -644,6 +644,7 @@ class SortedMergeNode : public ExecNode {`
`644`	`644`	`// Implementation note: If the queue is empty, we will block here`
`645`	`645`	`if (process_queue.WaitAndPop() == kPoisonPill) {`
`646`	`646`	`EndFromProcessThread();`
	`647`	`+ return;`
`647`	`648`	`}`
`648`	`649`	`// Either we're out of data or something went wrong`
`649`	`650`	`if (!PollOnce()) {`