Fix tests

Ziy1-Tan · pitrou · commit b9c5e4d0a0a5 · 2025-07-01T10:21:07.000+02:00
Signed-off-by: Ziy1-Tan &lt;ajb459684460@gmail.com&gt;
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
@@ -517,7 +517,7 @@ set(ARROW_UTIL_SRCS
     util/ree_util.cc
     util/secure_string.cc
     util/string.cc
-    util/string_util_internal.cc
+    util/string_util.cc
     util/task_group.cc
     util/tdigest.cc
     util/thread_pool.cc
diff --git a/cpp/src/arrow/flight/transport/grpc/util_internal.cc b/cpp/src/arrow/flight/transport/grpc/util_internal.cc
@@ -29,7 +29,7 @@
 #include "arrow/flight/types.h"
 #include "arrow/status.h"
 #include "arrow/util/string.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 
 namespace arrow {
 
@@ -134,9 +134,10 @@ static TransportStatus TransportStatusFromGrpc(const ::grpc::Status& grpc_status
       return TransportStatus{TransportStatusCode::kUnauthenticated,
                              grpc_status.error_message()};
     default:
-      return TransportStatus{TransportStatusCode::kUnknown,
-                             internal::JoinToString("(", grpc_status.error_code(), ")",
-                                                    grpc_status.error_message())};
+      return TransportStatus{
+          TransportStatusCode::kUnknown,
+          arrow::internal::JoinToString("(", grpc_status.error_code(), ")",
+                                        grpc_status.error_message())};
   }
 }
 
diff --git a/cpp/src/arrow/flight/types.cc b/cpp/src/arrow/flight/types.cc
@@ -37,7 +37,7 @@
 #include "arrow/util/formatting.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/string.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 #include "arrow/util/uri.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/meson.build b/cpp/src/arrow/meson.build
@@ -199,7 +199,7 @@ arrow_util_srcs = [
     'util/mutex.cc',
     'util/ree_util.cc',
     'util/string.cc',
-    'util/string_util_internal.cc',
+    'util/string_util.cc',
     'util/task_group.cc',
     'util/tdigest.cc',
     'util/thread_pool.cc',
diff --git a/cpp/src/arrow/status.h b/cpp/src/arrow/status.h
@@ -23,7 +23,7 @@
 
 #include "arrow/util/compare.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 #include "arrow/util/visibility.h"
 
 #ifdef ARROW_EXTRA_ERROR_CONTEXT
diff --git a/cpp/src/arrow/testing/gtest_util.h b/cpp/src/arrow/testing/gtest_util.h
@@ -40,7 +40,7 @@
 #include "arrow/type_fwd.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 #include "arrow/util/type_fwd.h"
 
 // NOTE: failing must be inline in the macros below, to get correct file / line number
diff --git a/cpp/src/arrow/util/bitmap.h b/cpp/src/arrow/util/bitmap.h
@@ -37,7 +37,7 @@
 #include "arrow/util/endian.h"
 #include "arrow/util/functional.h"
 #include "arrow/util/span.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 #include "arrow/util/visibility.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/util/bitset_stack_internal.h b/cpp/src/arrow/util/bitset_stack_internal.h
@@ -38,7 +38,7 @@
 #include "arrow/util/compare.h"
 #include "arrow/util/functional.h"
 #include "arrow/util/macros.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 #include "arrow/util/type_traits.h"
 #include "arrow/util/visibility.h"
 
diff --git a/cpp/src/arrow/util/meson.build b/cpp/src/arrow/util/meson.build
@@ -160,7 +160,7 @@ install_headers(
         'simd.h',
         'small_vector.h',
         'span.h',
-        'string_util_internal.h',
+        'string_util.h',
         'string.h',
         'task_group.h',
         'test_common.h',
diff --git a/cpp/src/arrow/util/string_util.cc b/cpp/src/arrow/util/string_util.cc
@@ -15,15 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 
 #include <memory>
 #include <sstream>
 
 namespace arrow {
-
 namespace internal {
-namespace detail {
 
 StringStreamWrapper::StringStreamWrapper()
     : sstream_(std::make_unique<std::ostringstream>()), ostream_(*sstream_) {}
@@ -32,6 +30,5 @@ StringStreamWrapper::~StringStreamWrapper() {}
 
 std::string StringStreamWrapper::str() { return sstream_->str(); }
 
-}  // namespace detail
 }  // namespace internal
 }  // namespace arrow
diff --git a/cpp/src/arrow/util/string_util.h b/cpp/src/arrow/util/string_util.h
@@ -28,7 +28,6 @@
 namespace arrow {
 
 namespace internal {
-namespace detail {
 
 class ARROW_EXPORT StringStreamWrapper {
  public:
@@ -43,11 +42,9 @@ class ARROW_EXPORT StringStreamWrapper {
   std::ostream& ostream_;
 };
 
-}  // namespace detail
-
 template <typename... Args>
 std::string JoinToString(Args&&... args) {
-  detail::StringStreamWrapper ss;
+  StringStreamWrapper ss;
   (
       [&ss](auto&& arg) {
         // Avoid losing precision when printing floating point numbers
diff --git a/cpp/src/parquet/exception.h b/cpp/src/parquet/exception.h
@@ -23,7 +23,7 @@
 #include <utility>
 
 #include "arrow/type_fwd.h"
-#include "arrow/util/string_util_internal.h"
+#include "arrow/util/string_util.h"
 #include "parquet/platform.h"
 
 // PARQUET-1085
