post rebase fixes

Author: rok

cpp/src/arrow/compute/kernels/CMakeLists.txt

@@ -22,8 +22,7 @@ arrow_install_all_headers("arrow/compute/kernels")
 
 # Define arrow_compute_kernels_testing object library for common test files
 if(ARROW_TESTING)
-  add_library(arrow_compute_kernels_testing OBJECT test_util_internal.cc)
-  add_library(arrow_compute_kernels_testing OBJECT test_util.cc
+  add_library(arrow_compute_kernels_testing OBJECT test_util_internal.cc
           ../../extension/tensor_extension_array_test.cc)
   # Even though this is still just an object library we still need to "link" our
   # dependencies so that include paths are configured correctly

cpp/src/arrow/extension/tensor_extension_array_test.cc

@@ -29,9 +29,7 @@
 #include "arrow/tensor.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/key_value_metadata.h"
-#include "arrow/util/sort.h"
-#include "arrow/util/logging.h"
-
+#include "arrow/util/sort_internal.h"
 
 namespace arrow {
 
@@ -159,8 +157,7 @@ TEST_F(TestFixedShapeTensorType, CreateFromArray) {
   ASSERT_EQ(ext_arr->null_count(), 0);
 }
 
-<<<<<<< HEAD
-TEST_F(TestExtensionType, MakeArrayCanGetCorrectScalarType) {
+TEST_F(TestFixedShapeTensorType, MakeArrayCanGetCorrectScalarType) {
   ASSERT_OK_AND_ASSIGN(auto tensor,
                        Tensor::Make(value_type_, Buffer::Wrap(values_), shape_));
 
@@ -182,7 +179,6 @@ TEST_F(TestExtensionType, MakeArrayCanGetCorrectScalarType) {
   ASSERT_TRUE(tensor->Equals(*tensor_from_array));
 }
 
-template <typename T>
 void CheckSerializationRoundtrip(const std::shared_ptr<DataType>& ext_type) {
   auto type = internal::checked_pointer_cast<ExtensionType>(ext_type);
   auto serialized = type->Serialize();

cpp/src/arrow/extension/tensor_internal.cc

@@ -20,11 +20,10 @@
 #include "arrow/tensor.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/int_util_overflow.h"
-#include "arrow/util/sort.h"
+#include "arrow/util/sort_internal.h"
 
 #include "arrow/status.h"
-#include "arrow/util/logging.h"
-#include "arrow/util/print.h"
+#include "arrow/util/print_internal.h"
 
 namespace arrow::internal {
 
@@ -84,4 +83,4 @@ Status ComputeStrides(const std::shared_ptr<DataType>& value_type,
   return Status::OK();
 }
 
-}  // namespace arrow::internal
+}  // namespace arrow::internal

cpp/src/arrow/extension/tensor_internal.h

@@ -16,77 +16,21 @@
 // under the License.
 
 #pragma once
-#include "arrow/extension/tensor_internal.h"
 
 #include <cstdint>
 #include <vector>
 
 #include "arrow/array/array_nested.h"
-#include "arrow/tensor.h"
-#include "arrow/status.h"
-#include "arrow/util/checked_cast.h"
-#include "arrow/util/int_util_overflow.h"
-#include "arrow/util/sort_internal.h"
-#include "arrow/util/print_internal.h"
 
 namespace arrow::internal {
 
 ARROW_EXPORT
-inline Status IsPermutationValid(const std::vector<int64_t>& permutation) {
-  const auto size = static_cast<int64_t>(permutation.size());
-  std::vector<uint8_t> dim_seen(size, 0);
-
-  for (const auto p : permutation) {
-    if (p < 0 || p >= size || dim_seen[p] != 0) {
-      return Status::Invalid(
-          "Permutation indices for ", size,
-          " dimensional tensors must be unique and within [0, ", size - 1,
-          "] range. Got: ", ::arrow::internal::PrintVector{permutation, ","});
-    }
-    dim_seen[p] = 1;
-  }
-  return Status::OK();
-}
+Status IsPermutationValid(const std::vector<int64_t>& permutation);
 
 ARROW_EXPORT
-inline Status ComputeStrides(const std::shared_ptr<DataType>& value_type,
+Status ComputeStrides(const std::shared_ptr<DataType>& value_type,
                       const std::vector<int64_t>& shape,
                       const std::vector<int64_t>& permutation,
-                      std::vector<int64_t>* strides) {
-  auto fixed_width_type = internal::checked_pointer_cast<FixedWidthType>(value_type);
-  if (permutation.empty()) {
-    return internal::ComputeRowMajorStrides(*fixed_width_type.get(), shape, strides);
-  }
-  const int byte_width = value_type->byte_width();
-
-  int64_t remaining = 0;
-  if (!shape.empty() && shape.front() > 0) {
-    remaining = byte_width;
-    for (auto i : permutation) {
-      if (i > 0) {
-        if (internal::MultiplyWithOverflow(remaining, shape[i], &remaining)) {
-          return Status::Invalid(
-              "Strides computed from shape would not fit in 64-bit integer");
-        }
-      }
-    }
-  }
-
-  if (remaining == 0) {
-    strides->assign(shape.size(), byte_width);
-    return Status::OK();
-  }
-
-  strides->push_back(remaining);
-  for (auto i : permutation) {
-    if (i > 0) {
-      remaining /= shape[i];
-      strides->push_back(remaining);
-    }
-  }
-  Permute(permutation, strides);
-
-  return Status::OK();
-}
+                      std::vector<int64_t>* strides);
 
-}  // namespace arrow::internal
+}  // namespace arrow::internal

cpp/src/arrow/extension/variable_shape_tensor.cc

@@ -26,9 +26,9 @@
 #include "arrow/scalar.h"
 #include "arrow/tensor.h"
 #include "arrow/util/int_util_overflow.h"
-#include "arrow/util/logging.h"
-#include "arrow/util/print.h"
-#include "arrow/util/sort.h"
+#include "arrow/util/logging_internal.h"
+#include "arrow/util/print_internal.h"
+#include "arrow/util/sort_internal.h"
 #include "arrow/util/string.h"
 
 #include <rapidjson/document.h>