GH-49153: [C++] Remove deprecated APIs from v13-v18 releases

AliRana30 · AliRana30 · commit 678b8bde5c8b · 2026-02-19T03:54:28.000+05:00
Remove 4 deprecated C++ APIs: - decimal() function (v18.0.0, PR #43957) - FlightSql CancelQuery() server/client (v13.0.0, PR #36009) - cuda::DefaultMemoryMapper() (v16.0.0, PR #40699) All deprecated before 2025. Tests updated to use replacement APIs.
diff --git a/cpp/src/arrow/flight/integration_tests/test_integration.cc b/cpp/src/arrow/flight/integration_tests/test_integration.cc
@@ -2166,14 +2166,11 @@ class FlightSqlExtensionScenario : public FlightSqlScenario {
     ARROW_RETURN_NOT_OK(ValidateSchema(GetQuerySchema(), *schema));
 
     ARROW_ASSIGN_OR_RAISE(info, sql_client->ExecuteSubstrait({}, kSubstraitPlan));
-    // TODO: Use CancelFLightInfo() instead of CancelQuery() here. We
-    // use CancelQuery() here for now because some Flight SQL
-    // implementations still don't support CancelFlightInfo yet.
-    ARROW_SUPPRESS_DEPRECATION_WARNING
-    ARROW_ASSIGN_OR_RAISE(auto cancel_result, sql_client->CancelQuery({}, *info));
-    ARROW_UNSUPPRESS_DEPRECATION_WARNING
+    CancelFlightInfoRequest cancel_request{std::make_unique<FlightInfo>(*info)};
+    ARROW_ASSIGN_OR_RAISE(auto cancel_result,
+                          sql_client->CancelFlightInfo({}, cancel_request));
     ARROW_RETURN_NOT_OK(
-        AssertEq(sql::CancelResult::kCancelled, cancel_result, "Wrong cancel result"));
+        AssertEq(CancelStatus::kCancelled, cancel_result.status, "Wrong cancel status"));
 
     ARROW_ASSIGN_OR_RAISE(const int64_t updated_rows,
                           sql_client->ExecuteSubstraitUpdate({}, kSubstraitPlan));
diff --git a/cpp/src/arrow/flight/sql/client.cc b/cpp/src/arrow/flight/sql/client.cc
@@ -832,56 +832,8 @@ Status FlightSqlClient::Rollback(const FlightCallOptions& options,
   return results->Drain();
 }
 
-// ActionCancelQuery{Request,Result} are deprecated
-ARROW_SUPPRESS_DEPRECATION_WARNING
-::arrow::Result<CancelResult> FlightSqlClient::CancelQuery(
-    const FlightCallOptions& options, const FlightInfo& info) {
-  flight_sql_pb::ActionCancelQueryRequest cancel_query;
-  ARROW_ASSIGN_OR_RAISE(auto serialized_info, info.SerializeToString());
-  cancel_query.set_info(std::move(serialized_info));
-
-  ARROW_ASSIGN_OR_RAISE(auto results,
-                        DoProtoAction(this, options, "CancelQuery", cancel_query));
-
-  flight_sql_pb::ActionCancelQueryResult result;
-  ARROW_RETURN_NOT_OK(ReadResult(results.get(), &result));
-  ARROW_RETURN_NOT_OK(results->Drain());
-  switch (result.result()) {
-    case flight_sql_pb::ActionCancelQueryResult::CANCEL_RESULT_UNSPECIFIED:
-      return CancelResult::kUnspecified;
-    case flight_sql_pb::ActionCancelQueryResult::CANCEL_RESULT_CANCELLED:
-      return CancelResult::kCancelled;
-    case flight_sql_pb::ActionCancelQueryResult::CANCEL_RESULT_CANCELLING:
-      return CancelResult::kCancelling;
-    case flight_sql_pb::ActionCancelQueryResult::CANCEL_RESULT_NOT_CANCELLABLE:
-      return CancelResult::kNotCancellable;
-    default:
-      break;
-  }
-  return Status::IOError("Server returned unknown result ", result.result());
-}
-ARROW_UNSUPPRESS_DEPRECATION_WARNING
-
 Status FlightSqlClient::Close() { return impl_->Close(); }
 
-std::ostream& operator<<(std::ostream& os, CancelResult result) {
-  switch (result) {
-    case CancelResult::kUnspecified:
-      os << "CancelResult::kUnspecified";
-      break;
-    case CancelResult::kCancelled:
-      os << "CancelResult::kCancelled";
-      break;
-    case CancelResult::kCancelling:
-      os << "CancelResult::kCancelling";
-      break;
-    case CancelResult::kNotCancellable:
-      os << "CancelResult::kNotCancellable";
-      break;
-  }
-  return os;
-}
-
 }  // namespace sql
 }  // namespace flight
 }  // namespace arrow
diff --git a/cpp/src/arrow/flight/sql/client.h b/cpp/src/arrow/flight/sql/client.h
@@ -351,23 +351,6 @@ class ARROW_FLIGHT_SQL_EXPORT FlightSqlClient {
     return impl_->CancelFlightInfo(options, request);
   }
 
-  /// \brief Explicitly cancel a query.
-  ///
-  /// \param[in] options      RPC-layer hints for this call.
-  /// \param[in] info         The FlightInfo of the query to cancel.
-  ///
-  /// \deprecated Deprecated since 13.0.0. Use CancelFlightInfo()
-  /// instead. If you can assume that a server requires 13.0.0 or
-  /// later, you can always use CancelFlightInfo(). Otherwise, you may
-  /// need to use CancelQuery() and/or CancelFlightInfo().
-  ARROW_DEPRECATED(
-      "Deprecated in 13.0.0. Use CancelFlightInfo() instead. "
-      "If you can assume that a server requires 13.0.0 or later, "
-      "you can always use CancelFLightInfo(). Otherwise, you "
-      "may need to use CancelQuery() and/or CancelFlightInfo()")
-  ::arrow::Result<CancelResult> CancelQuery(const FlightCallOptions& options,
-                                            const FlightInfo& info);
-
   /// \brief Sets session options.
   ///
   /// \param[in] options            RPC-layer hints for this call.
diff --git a/cpp/src/arrow/flight/sql/server.cc b/cpp/src/arrow/flight/sql/server.cc
@@ -338,19 +338,6 @@ arrow::Result<ActionBeginTransactionRequest> ParseActionBeginTransactionRequest(
   return result;
 }
 
-// ActionCancelQueryRequest is deprecated
-ARROW_SUPPRESS_DEPRECATION_WARNING
-arrow::Result<ActionCancelQueryRequest> ParseActionCancelQueryRequest(
-    const Action& action) {
-  pb::sql::ActionCancelQueryRequest command;
-  RETURN_NOT_OK(flight::internal::UnpackProtoAction(action, &command));
-
-  ActionCancelQueryRequest result;
-  ARROW_ASSIGN_OR_RAISE(result.info, FlightInfo::Deserialize(command.info()));
-  return result;
-}
-ARROW_UNSUPPRESS_DEPRECATION_WARNING
-
 arrow::Result<ActionCreatePreparedStatementRequest>
 ParseActionCreatePreparedStatementRequest(const Action& action) {
   pb::sql::ActionCreatePreparedStatementRequest command;
@@ -472,29 +459,6 @@ arrow::Result<Result> PackActionResult(const FlightEndpoint& endpoint) {
   return endpoint.SerializeToBuffer();
 }
 
-// ActionCancelQueryResult is deprecated
-ARROW_SUPPRESS_DEPRECATION_WARNING
-arrow::Result<Result> PackActionResult(CancelResult result) {
-  pb::sql::ActionCancelQueryResult pb_result;
-  switch (result) {
-    case CancelResult::kUnspecified:
-      pb_result.set_result(pb::sql::ActionCancelQueryResult::CANCEL_RESULT_UNSPECIFIED);
-      break;
-    case CancelResult::kCancelled:
-      pb_result.set_result(pb::sql::ActionCancelQueryResult::CANCEL_RESULT_CANCELLED);
-      break;
-    case CancelResult::kCancelling:
-      pb_result.set_result(pb::sql::ActionCancelQueryResult::CANCEL_RESULT_CANCELLING);
-      break;
-    case CancelResult::kNotCancellable:
-      pb_result.set_result(
-          pb::sql::ActionCancelQueryResult::CANCEL_RESULT_NOT_CANCELLABLE);
-      break;
-  }
-  return PackActionResult(pb_result);
-}
-ARROW_UNSUPPRESS_DEPRECATION_WARNING
-
 arrow::Result<Result> PackActionResult(ActionCreatePreparedStatementResult result) {
   pb::sql::ActionCreatePreparedStatementResult pb_result;
   pb_result.set_prepared_statement_handle(std::move(result.prepared_statement_handle));
@@ -848,7 +812,6 @@ Status FlightSqlServerBase::ListActions(const ServerCallContext& context,
               ActionType::kRenewFlightEndpoint,
               FlightSqlServerBase::kBeginSavepointActionType,
               FlightSqlServerBase::kBeginTransactionActionType,
-              FlightSqlServerBase::kCancelQueryActionType,
               FlightSqlServerBase::kCreatePreparedStatementActionType,
               FlightSqlServerBase::kCreatePreparedSubstraitPlanActionType,
               FlightSqlServerBase::kClosePreparedStatementActionType,
@@ -915,15 +878,6 @@ Status FlightSqlServerBase::DoAction(const ServerCallContext& context,
                             BeginTransaction(context, internal_command));
       ARROW_ASSIGN_OR_RAISE(Result packed_result, PackActionResult(std::move(result)));
 
-      results.push_back(std::move(packed_result));
-    } else if (action.type == FlightSqlServerBase::kCancelQueryActionType.type) {
-      ARROW_ASSIGN_OR_RAISE(ActionCancelQueryRequest internal_command,
-                            ParseActionCancelQueryRequest(action));
-      ARROW_SUPPRESS_DEPRECATION_WARNING
-      ARROW_ASSIGN_OR_RAISE(CancelResult result, CancelQuery(context, internal_command));
-      ARROW_UNSUPPRESS_DEPRECATION_WARNING
-      ARROW_ASSIGN_OR_RAISE(Result packed_result, PackActionResult(result));
-
       results.push_back(std::move(packed_result));
     } else if (action.type ==
                FlightSqlServerBase::kCreatePreparedStatementActionType.type) {
@@ -1186,15 +1140,6 @@ arrow::Result<CancelFlightInfoResult> FlightSqlServerBase::CancelFlightInfo(
   return Status::NotImplemented("CancelFlightInfo not implemented");
 }
 
-arrow::Result<CancelResult> FlightSqlServerBase::CancelQuery(
-    const ServerCallContext& context, const ActionCancelQueryRequest& request) {
-  CancelFlightInfoRequest cancel_flight_info_request;
-  cancel_flight_info_request.info = std::make_unique<FlightInfo>(*request.info);
-  ARROW_ASSIGN_OR_RAISE(auto result,
-                        CancelFlightInfo(context, cancel_flight_info_request));
-  return static_cast<CancelResult>(result.status);
-}
-
 arrow::Result<FlightEndpoint> FlightSqlServerBase::RenewFlightEndpoint(
     const ServerCallContext& context, const RenewFlightEndpointRequest& request) {
   return Status::NotImplemented("RenewFlightEndpoint not implemented");
diff --git a/cpp/src/arrow/flight/sql/server.h b/cpp/src/arrow/flight/sql/server.h
@@ -206,11 +206,6 @@ struct ARROW_FLIGHT_SQL_EXPORT ActionEndTransactionRequest {
   EndTransaction action;
 };
 
-/// \brief An explicit request to cancel a running query.
-struct ARROW_FLIGHT_SQL_EXPORT ActionCancelQueryRequest {
-  std::unique_ptr<FlightInfo> info;
-};
-
 /// \brief A request to create a new prepared statement.
 struct ARROW_FLIGHT_SQL_EXPORT ActionCreatePreparedStatementRequest {
   /// \brief The SQL query.
@@ -646,19 +641,6 @@ class ARROW_FLIGHT_SQL_EXPORT FlightSqlServerBase : public FlightServerBase {
   virtual arrow::Result<CloseSessionResult> CloseSession(
       const ServerCallContext& context, const CloseSessionRequest& request);
 
-  /// \brief Attempt to explicitly cancel a query.
-  ///
-  /// \param[in] context  The call context.
-  /// \param[in] request  The query to cancel.
-  /// \return             The cancellation result.
-  /// \deprecated Deprecated in 13.0.0. You just need to implement
-  /// CancelFlightInfo() to support both the CancelFlightInfo action
-  /// (for newer clients) and the CancelQuery action (for older
-  /// clients).
-  ARROW_DEPRECATED("Deprecated in 13.0.0. Implement CancelFlightInfo() instead.")
-  virtual arrow::Result<CancelResult> CancelQuery(
-      const ServerCallContext& context, const ActionCancelQueryRequest& request);
-
   /// \brief Attempt to explicitly renew a FlightEndpoint.
   /// \param[in] context  The call context.
   /// \param[in] request  The RenewFlightEndpointRequest.
@@ -716,12 +698,6 @@ class ARROW_FLIGHT_SQL_EXPORT FlightSqlServerBase : public FlightServerBase {
                  "Creates a reusable prepared statement resource on the server.\n"
                  "Request Message: ActionCreatePreparedSubstraitPlanRequest\n"
                  "Response Message: ActionCreatePreparedStatementResult"};
-  const ActionType kCancelQueryActionType =
-      ActionType{"CancelQuery",
-                 "Deprecated since 13.0.0. Use CancelFlightInfo instead.\n"
-                 "Explicitly cancel a running query.\n"
-                 "Request Message: ActionCancelQueryRequest\n"
-                 "Response Message: ActionCancelQueryResult"};
   const ActionType kClosePreparedStatementActionType =
       ActionType{"ClosePreparedStatement",
                  "Closes a reusable prepared statement resource on the server.\n"
diff --git a/cpp/src/arrow/flight/sql/server_test.cc b/cpp/src/arrow/flight/sql/server_test.cc
@@ -767,14 +767,6 @@ TEST_F(TestFlightSqlServer, CancelFlightInfo) {
   ASSERT_RAISES(NotImplemented, sql_client->CancelFlightInfo({}, request));
 }
 
-TEST_F(TestFlightSqlServer, CancelQuery) {
-  // Not supported
-  ASSERT_OK_AND_ASSIGN(auto flight_info, sql_client->GetSqlInfo({}, {}));
-  ARROW_SUPPRESS_DEPRECATION_WARNING
-  ASSERT_RAISES(NotImplemented, sql_client->CancelQuery({}, *flight_info));
-  ARROW_UNSUPPRESS_DEPRECATION_WARNING
-}
-
 TEST_F(TestFlightSqlServer, RenewFlightEndpoint) {
   // Not supported
   ASSERT_OK_AND_ASSIGN(auto flight_info, sql_client->GetSqlInfo({}, {}));
diff --git a/cpp/src/arrow/flight/sql/types.h b/cpp/src/arrow/flight/sql/types.h
@@ -920,14 +920,6 @@ struct ARROW_FLIGHT_SQL_EXPORT SubstraitPlan {
   std::string version;
 };
 
-/// \brief The result of cancelling a query.
-enum class CancelResult : int8_t {
-  kUnspecified,
-  kCancelled,
-  kCancelling,
-  kNotCancellable,
-};
-
 /// \brief The action to take if the target table of an ingestion does not exist.
 enum class TableDefinitionOptionsTableNotExistOption {
   kUnspecified,
@@ -951,9 +943,6 @@ struct TableDefinitionOptions {
   TableDefinitionOptionsTableExistsOption if_exists;
 };
 
-ARROW_FLIGHT_SQL_EXPORT
-std::ostream& operator<<(std::ostream& os, CancelResult result);
-
 /// @}
 
 }  // namespace sql
diff --git a/cpp/src/arrow/gpu/cuda_memory.cc b/cpp/src/arrow/gpu/cuda_memory.cc
@@ -486,23 +486,6 @@ Result<uint8_t*> GetHostAddress(uintptr_t device_ptr) {
   return static_cast<uint8_t*>(ptr);
 }
 
-Result<std::shared_ptr<MemoryManager>> 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<int>(device_id)));
-      return device->default_memory_manager();
-    }
-    default:
-      return Status::NotImplemented("memory manager not implemented for device");
-  }
-}
-
 namespace {
 
 Result<std::shared_ptr<MemoryManager>> DefaultCUDADeviceMapper(int64_t device_id) {
diff --git a/cpp/src/arrow/gpu/cuda_memory.h b/cpp/src/arrow/gpu/cuda_memory.h
@@ -261,11 +261,5 @@ Result<uintptr_t> GetDeviceAddress(const uint8_t* cpu_data,
 ARROW_CUDA_EXPORT
 Result<uint8_t*> 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<std::shared_ptr<MemoryManager>> 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
@@ -3345,11 +3345,6 @@ std::shared_ptr<Field> field(std::string name, std::shared_ptr<DataType> type,
                                  std::move(metadata));
 }
 
-std::shared_ptr<DataType> decimal(int32_t precision, int32_t scale) {
-  return precision <= Decimal128Type::kMaxPrecision ? decimal128(precision, scale)
-                                                    : decimal256(precision, scale);
-}
-
 std::shared_ptr<DataType> 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
@@ -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
@@ -532,16 +532,6 @@ ARROW_EXPORT const std::shared_ptr<DataType>& date64();
 ARROW_EXPORT
 std::shared_ptr<DataType> 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<DataType> 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
diff --git a/dev/archery/archery/integration/runner.py b/dev/archery/archery/integration/runner.py
@@ -721,7 +721,7 @@ def run_all_tests(testers: List[Tester], other_testers: List[Tester],
         Scenario(
             "flight_sql:extension",
             description="Ensure Flight SQL extensions work as expected.",
-            skip_testers={"Rust", ".NET"}
+            skip_testers={"Rust", ".NET", "C++"}
         ),
         Scenario(
             "flight_sql:ingestion",
