avantgardnerio commented on code in PR #2582:
URL: https://github.com/apache/arrow-rs/pull/2582#discussion_r954260779
##########
arrow-flight/src/sql/server.rs:
##########
@@ -401,103 +413,62 @@ where
&self,
request: Request<Ticket>,
) -> Result<Response<Self::DoGetStream>, Status> {
- let any: prost_types::Any =
prost::Message::decode(&*request.get_ref().ticket)
+ let msg: prost_types::Any =
prost::Message::decode(&*request.get_ref().ticket)
.map_err(decode_error_to_status)?;
- if any.is::<TicketStatementQuery>() {
- let token = any
- .unpack()
+ fn unpack<T: ProstMessageExt>(msg: prost_types::Any) -> Result<T,
Status> {
+ msg.unpack()
.map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_statement(token, request).await;
+ .ok_or_else(|| Status::internal("Expected a command, but found
none."))
}
- if any.is::<CommandPreparedStatementQuery>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_prepared_statement(token, request).await;
+
+ if msg.is::<TicketStatementQuery>() {
+ return self.do_get_statement(unpack(msg)?, request).await;
}
- if any.is::<CommandGetCatalogs>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_catalogs(token, request).await;
+ if msg.is::<CommandPreparedStatementQuery>() {
+ return self.do_get_prepared_statement(unpack(msg)?, request).await;
}
- if any.is::<CommandGetDbSchemas>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_schemas(token, request).await;
+ if msg.is::<CommandGetCatalogs>() {
+ return self.do_get_catalogs(unpack(msg)?, request).await;
}
- if any.is::<CommandGetTables>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_tables(token, request).await;
+ if msg.is::<CommandGetDbSchemas>() {
+ return self.do_get_schemas(unpack(msg)?, request).await;
}
- if any.is::<CommandGetTableTypes>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_table_types(token, request).await;
+ if msg.is::<CommandGetTables>() {
+ return self.do_get_tables(unpack(msg)?, request).await;
}
- if any.is::<CommandGetSqlInfo>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_sql_info(token, request).await;
+ if msg.is::<CommandGetTableTypes>() {
+ return self.do_get_table_types(unpack(msg)?, request).await;
}
- if any.is::<CommandGetPrimaryKeys>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_primary_keys(token, request).await;
+ if msg.is::<CommandGetSqlInfo>() {
+ return self.do_get_sql_info(unpack(msg)?, request).await;
}
- if any.is::<CommandGetExportedKeys>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_exported_keys(token, request).await;
+ if msg.is::<CommandGetPrimaryKeys>() {
+ return self.do_get_primary_keys(unpack(msg)?, request).await;
}
- if any.is::<CommandGetImportedKeys>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_imported_keys(token, request).await;
+ if msg.is::<CommandGetExportedKeys>() {
+ return self.do_get_exported_keys(unpack(msg)?, request).await;
}
- if any.is::<CommandGetCrossReference>() {
- let token = any
- .unpack()
- .map_err(arrow_error_to_status)?
- .expect("unreachable");
- return self.do_get_cross_reference(token, request).await;
+ if msg.is::<CommandGetImportedKeys>() {
+ return self.do_get_imported_keys(unpack(msg)?, request).await;
+ }
+ if msg.is::<CommandGetCrossReference>() {
+ return self.do_get_cross_reference(unpack(msg)?, request).await;
}
- Err(Status::unimplemented(format!(
- "do_get: The defined request is invalid: {:?}",
- String::from_utf8(request.get_ref().ticket.clone()).unwrap()
- )))
+ self.custom_do_get(request, msg).await
Review Comment:
This is the main purpose of the PR
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
