Merge pull request #7706 from zhang2014/chore/result

chore(base): support error type for result

Author: Xuanwo

src/common/exception/src/exception.rs

@@ -45,6 +45,7 @@ impl From<&str> for ErrorCodeBacktrace {
         Self::Serialized(Arc::new(s.to_string()))
     }
 }
+
 impl From<String> for ErrorCodeBacktrace {
     fn from(s: String) -> Self {
         Self::Serialized(Arc::new(s))
@@ -138,7 +139,7 @@ impl ErrorCode {
     }
 }
 
-pub type Result<T> = std::result::Result<T, ErrorCode>;
+pub type Result<T, E = ErrorCode> = std::result::Result<T, E>;
 
 impl Debug for ErrorCode {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {

src/query/config/src/outer_v0.rs

@@ -370,7 +370,7 @@ impl From<InnerStorageGcsConfig> for GcsStorageConfig {
 impl TryInto<InnerStorageGcsConfig> for GcsStorageConfig {
     type Error = ErrorCode;
 
-    fn try_into(self) -> std::result::Result<InnerStorageGcsConfig, Self::Error> {
+    fn try_into(self) -> Result<InnerStorageGcsConfig, Self::Error> {
         Ok(InnerStorageGcsConfig {
             endpoint_url: self.gcs_endpoint_url,
             bucket: self.gcs_bucket,

src/query/formats/src/output_format.rs

@@ -222,7 +222,7 @@ impl Default for OutputFormatType {
 
 impl FromStr for OutputFormatType {
     type Err = ErrorCode;
-    fn from_str(s: &str) -> std::result::Result<Self, ErrorCode> {
+    fn from_str(s: &str) -> Result<Self> {
         FormatFactory::instance().get_output(s)
     }
 }

src/query/legacy-planners/src/plan_copy.rs

@@ -33,7 +33,7 @@ pub enum ValidationMode {
 
 impl FromStr for ValidationMode {
     type Err = String;
-    fn from_str(s: &str) -> std::result::Result<Self, String> {
+    fn from_str(s: &str) -> Result<Self, String> {
         match s.to_uppercase().as_str() {
             "" => Ok(ValidationMode::None),
             "RETURN_ERRORS" => Ok(ValidationMode::ReturnErrors),

src/query/management/src/stage/stage_mgr.rs

@@ -145,7 +145,7 @@ impl StageApi for StageMgr {
                 else_then: vec![],
             };
             let tx_reply = self.kv_api.transaction(txn_req).await?;
-            let res: std::result::Result<_, MetaError> = tx_reply.into();
+            let res: Result<_, MetaError> = tx_reply.into();
             let (succ, _) = res?;
 
             if succ {
@@ -208,7 +208,7 @@ impl StageApi for StageMgr {
                 else_then: vec![],
             };
             let tx_reply = self.kv_api.transaction(txn_req).await?;
-            let res: std::result::Result<_, MetaError> = tx_reply.into();
+            let res: Result<_, MetaError> = tx_reply.into();
             let (succ, _) = res?;
 
             if succ {
@@ -274,7 +274,7 @@ impl StageApi for StageMgr {
                 else_then: vec![],
             };
             let tx_reply = self.kv_api.transaction(txn_req).await?;
-            let res: std::result::Result<_, MetaError> = tx_reply.into();
+            let res: Result<_, MetaError> = tx_reply.into();
             let (succ, _) = res?;
 
             if succ {

src/query/service/src/api/rpc/flight_client.rs

@@ -153,7 +153,7 @@ pub enum FlightExchange {
 impl FlightExchange {
     pub fn from_server(
         streaming: Request<Streaming<FlightData>>,
-        response_tx: Sender<std::result::Result<FlightData, Status>>,
+        response_tx: Sender<Result<FlightData, Status>>,
     ) -> FlightExchange {
         let mut streaming = streaming.into_inner();
         let (tx, rx) = async_channel::bounded(1);
@@ -260,7 +260,7 @@ pub struct ClientFlightExchange {
     is_closed_request: AtomicBool,
     is_closed_response: AtomicBool,
     response_tx: Sender<FlightData>,
-    request_rx: Receiver<std::result::Result<FlightData, Status>>,
+    request_rx: Receiver<Result<FlightData, Status>>,
 }
 
 impl ClientFlightExchange {
@@ -344,8 +344,8 @@ pub struct ServerFlightExchange {
     state: Arc<ChannelState>,
     is_closed_request: AtomicBool,
     is_closed_response: AtomicBool,
-    request_rx: Receiver<std::result::Result<FlightData, Status>>,
-    response_tx: Sender<std::result::Result<FlightData, Status>>,
+    request_rx: Receiver<Result<FlightData, Status>>,
+    response_tx: Sender<Result<FlightData, Status>>,
 }
 
 impl Clone for ServerFlightExchange {

src/query/service/src/interpreters/interpreter_query_log.rs

@@ -46,13 +46,13 @@ pub enum LogType {
     Aborted = 4,
 }
 
-fn date_str<S>(dt: &i32, s: S) -> std::result::Result<S::Ok, S::Error>
+fn date_str<S>(dt: &i32, s: S) -> Result<S::Ok, S::Error>
 where S: Serializer {
     let t = NaiveDateTime::from_timestamp(i64::from(*dt) * 24 * 3600, 0);
     s.serialize_str(t.format("%Y-%m-%d").to_string().as_str())
 }
 
-fn datetime_str<S>(dt: &i64, s: S) -> std::result::Result<S::Ok, S::Error>
+fn datetime_str<S>(dt: &i64, s: S) -> Result<S::Ok, S::Error>
 where S: Serializer {
     let t = NaiveDateTime::from_timestamp(
         dt / 1_000_000,

src/query/service/src/sql/planner/plans/copy_v2.rs

@@ -33,7 +33,7 @@ pub enum ValidationMode {
 
 impl FromStr for ValidationMode {
     type Err = String;
-    fn from_str(s: &str) -> std::result::Result<Self, String> {
+    fn from_str(s: &str) -> Result<Self, String> {
         match s.to_uppercase().as_str() {
             "" => Ok(ValidationMode::None),
             "RETURN_ERRORS" => Ok(ValidationMode::ReturnErrors),

src/query/service/src/sql/statements/value_source.rs

@@ -264,7 +264,7 @@ async fn exprs_to_datavalue(
     Ok(datavalues)
 }
 
-fn parse_exprs(buf: &[u8], typ: &SessionType) -> std::result::Result<Vec<Expr>, ParserError> {
+fn parse_exprs(buf: &[u8], typ: &SessionType) -> Result<Vec<Expr>, ParserError> {
     let dialect: &dyn Dialect = match typ {
         SessionType::MySQL => &MySqlDialect {},
         _ => &GenericDialect {},

src/query/service/tests/it/servers/mysql/mysql_handler.rs

@@ -165,7 +165,7 @@ async fn create_connection(port: u16) -> Result<mysql_async::Conn> {
 struct EmptyRow;
 
 impl FromRow for EmptyRow {
-    fn from_row_opt(_: Row) -> std::result::Result<Self, FromRowError>
+    fn from_row_opt(_: Row) -> Result<Self, FromRowError>
     where Self: Sized {
         Ok(EmptyRow)
     }