diff --git a/cpp/src/arrow/flight/sql/client.cc b/cpp/src/arrow/flight/sql/client.cc index 536bc67fc586d..cd722677a5a39 100644 --- a/cpp/src/arrow/flight/sql/client.cc +++ b/cpp/src/arrow/flight/sql/client.cc @@ -829,6 +829,8 @@ Status FlightSqlClient::Rollback(const FlightCallOptions& options, return results->Drain(); } +// ActionCancelQuery{Request,Result} are deprecated +ARROW_SUPPRESS_DEPRECATION_WARNING ::arrow::Result FlightSqlClient::CancelQuery( const FlightCallOptions& options, const FlightInfo& info) { flight_sql_pb::ActionCancelQueryRequest cancel_query; @@ -855,6 +857,7 @@ ::arrow::Result FlightSqlClient::CancelQuery( } return Status::IOError("Server returned unknown result ", result.result()); } +ARROW_UNSUPPRESS_DEPRECATION_WARNING Status FlightSqlClient::Close() { return impl_->Close(); } diff --git a/cpp/src/arrow/flight/sql/server.cc b/cpp/src/arrow/flight/sql/server.cc index 5f6154a576b02..7e8c2cc2f796c 100644 --- a/cpp/src/arrow/flight/sql/server.cc +++ b/cpp/src/arrow/flight/sql/server.cc @@ -337,6 +337,8 @@ arrow::Result ParseActionBeginTransactionRequest( return result; } +// ActionCancelQueryRequest is deprecated +ARROW_SUPPRESS_DEPRECATION_WARNING arrow::Result ParseActionCancelQueryRequest( const Action& action) { pb::sql::ActionCancelQueryRequest command; @@ -346,6 +348,7 @@ arrow::Result ParseActionCancelQueryRequest( ARROW_ASSIGN_OR_RAISE(result.info, FlightInfo::Deserialize(command.info())); return result; } +ARROW_UNSUPPRESS_DEPRECATION_WARNING arrow::Result ParseActionCreatePreparedStatementRequest(const Action& action) { @@ -468,6 +471,8 @@ arrow::Result PackActionResult(const FlightEndpoint& endpoint) { return endpoint.SerializeToBuffer(); } +// ActionCancelQueryResult is deprecated +ARROW_SUPPRESS_DEPRECATION_WARNING arrow::Result PackActionResult(CancelResult result) { pb::sql::ActionCancelQueryResult pb_result; switch (result) { @@ -487,6 +492,7 @@ arrow::Result PackActionResult(CancelResult result) { } return PackActionResult(pb_result); } +ARROW_UNSUPPRESS_DEPRECATION_WARNING arrow::Result PackActionResult(ActionCreatePreparedStatementResult result) { pb::sql::ActionCreatePreparedStatementResult pb_result;