diff --git a/cpp/src/arrow/gpu/cuda_memory.cc b/cpp/src/arrow/gpu/cuda_memory.cc index 735a5dacc2b..87d985a0fc2 100644 --- a/cpp/src/arrow/gpu/cuda_memory.cc +++ b/cpp/src/arrow/gpu/cuda_memory.cc @@ -486,23 +486,6 @@ Result GetHostAddress(uintptr_t device_ptr) { return static_cast(ptr); } -Result> DefaultMemoryMapper(ArrowDeviceType device_type, - int64_t device_id) { - switch (device_type) { - case ARROW_DEVICE_CPU: - return default_cpu_memory_manager(); - case ARROW_DEVICE_CUDA: - case ARROW_DEVICE_CUDA_HOST: - case ARROW_DEVICE_CUDA_MANAGED: { - ARROW_ASSIGN_OR_RAISE(auto device, - arrow::cuda::CudaDevice::Make(static_cast(device_id))); - return device->default_memory_manager(); - } - default: - return Status::NotImplemented("memory manager not implemented for device"); - } -} - namespace { Result> DefaultCUDADeviceMapper(int64_t device_id) { diff --git a/cpp/src/arrow/gpu/cuda_memory.h b/cpp/src/arrow/gpu/cuda_memory.h index ce4b4b11cb2..83d65b0e7f7 100644 --- a/cpp/src/arrow/gpu/cuda_memory.h +++ b/cpp/src/arrow/gpu/cuda_memory.h @@ -261,11 +261,5 @@ Result GetDeviceAddress(const uint8_t* cpu_data, ARROW_CUDA_EXPORT Result GetHostAddress(uintptr_t device_ptr); -ARROW_DEPRECATED( - "Deprecated in 16.0.0. The CUDA device is registered by default, and you can use " - "arrow::DefaultDeviceMapper instead.") -Result> DefaultMemoryMapper(ArrowDeviceType device_type, - int64_t device_id); - } // namespace cuda } // namespace arrow diff --git a/cpp/src/arrow/type.cc b/cpp/src/arrow/type.cc index cba4a0ecd3a..f435bc0f1e4 100644 --- a/cpp/src/arrow/type.cc +++ b/cpp/src/arrow/type.cc @@ -3345,11 +3345,6 @@ std::shared_ptr field(std::string name, std::shared_ptr type, std::move(metadata)); } -std::shared_ptr decimal(int32_t precision, int32_t scale) { - return precision <= Decimal128Type::kMaxPrecision ? decimal128(precision, scale) - : decimal256(precision, scale); -} - std::shared_ptr smallest_decimal(int32_t precision, int32_t scale) { return precision <= Decimal32Type::kMaxPrecision ? decimal32(precision, scale) : precision <= Decimal64Type::kMaxPrecision ? decimal64(precision, scale) diff --git a/cpp/src/arrow/type.h b/cpp/src/arrow/type.h index e3582056ead..e7d6f5e516c 100644 --- a/cpp/src/arrow/type.h +++ b/cpp/src/arrow/type.h @@ -2585,9 +2585,6 @@ constexpr bool has_variadic_buffers(Type::type id) { } } -ARROW_DEPRECATED("Deprecated in 17.0.0. Use may_have_validity_bitmap() instead.") -constexpr bool HasValidityBitmap(Type::type id) { return may_have_validity_bitmap(id); } - ARROW_EXPORT std::string ToString(Type::type id); diff --git a/cpp/src/arrow/type_fwd.h b/cpp/src/arrow/type_fwd.h index be26c40dc1f..a1c1ac20f69 100644 --- a/cpp/src/arrow/type_fwd.h +++ b/cpp/src/arrow/type_fwd.h @@ -532,16 +532,6 @@ ARROW_EXPORT const std::shared_ptr& date64(); ARROW_EXPORT std::shared_ptr fixed_size_binary(int32_t byte_width); -/// \brief Create a DecimalType instance depending on the precision -/// -/// If the precision is greater than 38, a Decimal256Type is returned, -/// otherwise a Decimal128Type. -/// -/// Deprecated: prefer `smallest_decimal` instead. -ARROW_DEPRECATED("Deprecated in 18.0. Use `smallest_decimal` instead") -ARROW_EXPORT -std::shared_ptr decimal(int32_t precision, int32_t scale); - /// \brief Create a the smallest DecimalType instance depending on precision /// /// Given the requested precision and scale, the smallest DecimalType which