Revert "Box FlightErrror::tonic to reduce size (fixes nightly clippy) (apache#7229)" (apache#7266)

crepererum · web-flow · commit f4fde769ab6e · 2025-03-11T15:28:10.000Z
This reverts commit 9e91029.
diff --git a/arrow-flight/src/client.rs b/arrow-flight/src/client.rs
@@ -210,7 +210,7 @@ impl FlightClient {
         let (response_stream, trailers) = extract_lazy_trailers(response_stream);
 
         Ok(FlightRecordBatchStream::new_from_flight_data(
-            response_stream.map_err(|status| status.into()),
+            response_stream.map_err(FlightError::Tonic),
         )
         .with_headers(md)
         .with_trailers(trailers))
@@ -470,7 +470,7 @@ impl FlightClient {
             .list_flights(request)
             .await?
             .into_inner()
-            .map_err(|status| status.into());
+            .map_err(FlightError::Tonic);
 
         Ok(response.boxed())
     }
@@ -537,7 +537,7 @@ impl FlightClient {
             .list_actions(request)
             .await?
             .into_inner()
-            .map_err(|status| status.into());
+            .map_err(FlightError::Tonic);
 
         Ok(action_stream.boxed())
     }
@@ -575,7 +575,7 @@ impl FlightClient {
             .do_action(request)
             .await?
             .into_inner()
-            .map_err(|status| status.into())
+            .map_err(FlightError::Tonic)
             .map(|r| {
                 r.map(|r| {
                     // unwrap inner bytes
diff --git a/arrow-flight/src/error.rs b/arrow-flight/src/error.rs
@@ -27,7 +27,7 @@ pub enum FlightError {
     /// Returned when functionality is not yet available.
     NotYetImplemented(String),
     /// Error from the underlying tonic library
-    Tonic(Box<tonic::Status>),
+    Tonic(tonic::Status),
     /// Some unexpected message was received
     ProtocolError(String),
     /// An error occurred during decoding
@@ -74,7 +74,7 @@ impl Error for FlightError {
 
 impl From<tonic::Status> for FlightError {
     fn from(status: tonic::Status) -> Self {
-        Self::Tonic(Box::new(status))
+        Self::Tonic(status)
     }
 }
 
@@ -91,7 +91,7 @@ impl From<FlightError> for tonic::Status {
         match value {
             FlightError::Arrow(e) => tonic::Status::internal(e.to_string()),
             FlightError::NotYetImplemented(e) => tonic::Status::internal(e),
-            FlightError::Tonic(status) => *status,
+            FlightError::Tonic(status) => status,
             FlightError::ProtocolError(e) => tonic::Status::internal(e),
             FlightError::DecodeError(e) => tonic::Status::internal(e),
             FlightError::ExternalError(e) => tonic::Status::internal(e.to_string()),
@@ -147,10 +147,4 @@ mod test {
         let source = root_error.downcast_ref::<FlightError>().unwrap();
         assert!(matches!(source, FlightError::DecodeError(_)));
     }
-
-    #[test]
-    fn test_error_size() {
-        // use Box in variants to keep this size down
-        assert_eq!(std::mem::size_of::<FlightError>(), 32);
-    }
 }
diff --git a/arrow-flight/src/sql/client.rs b/arrow-flight/src/sql/client.rs
@@ -309,7 +309,7 @@ impl FlightSqlServiceClient<Channel> {
         let (response_stream, trailers) = extract_lazy_trailers(response_stream);
 
         Ok(FlightRecordBatchStream::new_from_flight_data(
-            response_stream.map_err(|status| status.into()),
+            response_stream.map_err(FlightError::Tonic),
         )
         .with_headers(md)
         .with_trailers(trailers))
diff --git a/arrow-flight/src/streams.rs b/arrow-flight/src/streams.rs
@@ -127,7 +127,7 @@ impl<T> Stream for FallibleTonicResponseStream<T> {
 
         match ready!(pinned.response_stream.poll_next_unpin(cx)) {
             Some(Ok(res)) => Poll::Ready(Some(Ok(res))),
-            Some(Err(status)) => Poll::Ready(Some(Err(status.into()))),
+            Some(Err(status)) => Poll::Ready(Some(Err(FlightError::Tonic(status)))),
             None => Poll::Ready(None),
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ impl FlightSqlServiceClient<Channel> {`
`309`	`309`	`let (response_stream, trailers) = extract_lazy_trailers(response_stream);`
`310`	`310`
`311`	`311`	`Ok(FlightRecordBatchStream::new_from_flight_data(`
`312`		`- response_stream.map_err(\|status\| status.into()),`
	`312`	`+ response_stream.map_err(FlightError::Tonic),`
`313`	`313`	`)`
`314`	`314`	`.with_headers(md)`
`315`	`315`	`.with_trailers(trailers))`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ impl<T> Stream for FallibleTonicResponseStream<T> {`
`127`	`127`
`128`	`128`	`match ready!(pinned.response_stream.poll_next_unpin(cx)) {`
`129`	`129`	`Some(Ok(res)) => Poll::Ready(Some(Ok(res))),`
`130`		`- Some(Err(status)) => Poll::Ready(Some(Err(status.into()))),`
	`130`	`+ Some(Err(status)) => Poll::Ready(Some(Err(FlightError::Tonic(status)))),`
`131`	`131`	`None => Poll::Ready(None),`
`132`	`132`	`}`
`133`	`133`	`}`