Merge remote-tracking branch 'gitmodimo/PublicConcurrentQueue' into combined3

Rafał Hibner · Rafał Hibner · commit de160046713d · 2025-08-25T14:25:33.000Z
diff --git a/cpp/src/arrow/acero/asof_join_node.cc b/cpp/src/arrow/acero/asof_join_node.cc
@@ -18,7 +18,7 @@
 #include "arrow/acero/asof_join_node.h"
 #include "arrow/acero/accumulation_queue.h"
 #include "arrow/acero/backpressure_handler.h"
-#include "arrow/acero/concurrent_queue_internal.h"
+#include "arrow/acero/concurrent_queue.h"
 
 #include <atomic>
 #include <condition_variable>
diff --git a/cpp/src/arrow/acero/concurrent_queue.h b/cpp/src/arrow/acero/concurrent_queue.h
diff --git a/cpp/src/arrow/acero/sorted_merge_node.cc b/cpp/src/arrow/acero/sorted_merge_node.cc
@@ -28,7 +28,7 @@
 
 #include "arrow/acero/accumulation_queue.h"
 #include "arrow/acero/backpressure.h"
-#include "arrow/acero/concurrent_queue_internal.h"
+#include "arrow/acero/concurrent_queue.h"
 #include "arrow/acero/exec_plan.h"
 #include "arrow/acero/exec_plan_internal.h"
 #include "arrow/acero/options.h"
diff --git a/cpp/src/arrow/acero/util_test.cc b/cpp/src/arrow/acero/util_test.cc
@@ -16,7 +16,7 @@
 // under the License.
 
 #include <future>
-#include "arrow/acero/concurrent_queue_internal.h"
+#include "arrow/acero/concurrent_queue.h"
 #include "arrow/acero/hash_join_node.h"
 #include "arrow/acero/schema_util.h"
 #include "arrow/testing/extension_type.h"
