Merge branch 'SortedMergeNotFatal' into combined3

Rafał Hibner · Rafał Hibner · commit 2014b4854eb8 · 2025-10-07T12:36:20.000Z
diff --git a/cpp/src/arrow/acero/sorted_merge_node.cc b/cpp/src/arrow/acero/sorted_merge_node.cc
@@ -606,7 +606,7 @@ class SortedMergeNode : public ExecNode {
         out_b.index = batches_produced++;
         Status st = output_->InputReceived(this, std::move(out_b));
         if (!st.ok()) {
-          ARROW_LOG(FATAL) << "Error in output_::InputReceived: " << st.ToString();
+          ARROW_LOG(ERROR) << "Error in output_::InputReceived: " << st.ToString();
           EndFromProcessThread(std::move(st));
         }
       } else {

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ class SortedMergeNode : public ExecNode {`
`606`	`606`	`out_b.index = batches_produced++;`
`607`	`607`	`Status st = output_->InputReceived(this, std::move(out_b));`
`608`	`608`	`if (!st.ok()) {`
`609`		`- ARROW_LOG(FATAL) << "Error in output_::InputReceived: " << st.ToString();`
	`609`	`+ ARROW_LOG(ERROR) << "Error in output_::InputReceived: " << st.ToString();`
`610`	`610`	`EndFromProcessThread(std::move(st));`
`611`	`611`	`}`
`612`	`612`	`} else {`