fix: cr

Author: jun0315

src/common/error/src/status_code.rs

@@ -86,6 +86,34 @@ impl StatusCode {
     pub fn is_success(code: u32) -> bool {
         Self::Success as u32 == code
     }
+
+    pub fn is_retryable(&self) -> bool {
+        match self {
+            StatusCode::StorageUnavailable
+            | StatusCode::RuntimeResourcesExhausted
+            | StatusCode::Internal => true,
+
+            StatusCode::Success
+            | StatusCode::Unknown
+            | StatusCode::Unsupported
+            | StatusCode::Unexpected
+            | StatusCode::InvalidArguments
+            | StatusCode::InvalidSyntax
+            | StatusCode::PlanQuery
+            | StatusCode::EngineExecuteQuery
+            | StatusCode::TableAlreadyExists
+            | StatusCode::TableNotFound
+            | StatusCode::TableColumnNotFound
+            | StatusCode::TableColumnExists
+            | StatusCode::DatabaseNotFound
+            | StatusCode::UserNotFound
+            | StatusCode::UnsupportedPasswordType
+            | StatusCode::UserPasswordMismatch
+            | StatusCode::AuthHeaderNotFound
+            | StatusCode::InvalidAuthHeader
+            | StatusCode::AccessDenied => false,
+        }
+    }
 }
 
 impl fmt::Display for StatusCode {

src/common/procedure/src/error.rs

@@ -127,38 +127,14 @@ impl Error {
     }
 
     /// Determine whether it is a retry later type through [StatusCode]
-    pub fn is_retry_later(status_code: StatusCode) -> bool {
-        match status_code {
-            StatusCode::StorageUnavailable
-            | StatusCode::RuntimeResourcesExhausted
-            | StatusCode::Internal => true,
-
-            StatusCode::Success
-            | StatusCode::Unknown
-            | StatusCode::Unsupported
-            | StatusCode::Unexpected
-            | StatusCode::InvalidArguments
-            | StatusCode::InvalidSyntax
-            | StatusCode::PlanQuery
-            | StatusCode::EngineExecuteQuery
-            | StatusCode::TableAlreadyExists
-            | StatusCode::TableNotFound
-            | StatusCode::TableColumnNotFound
-            | StatusCode::TableColumnExists
-            | StatusCode::DatabaseNotFound
-            | StatusCode::UserNotFound
-            | StatusCode::UnsupportedPasswordType
-            | StatusCode::UserPasswordMismatch
-            | StatusCode::AuthHeaderNotFound
-            | StatusCode::InvalidAuthHeader
-            | StatusCode::AccessDenied => false,
-        }
+    pub fn is_retry_later(&self) -> bool {
+        matches!(self, Error::RetryLater { .. })
     }
 
     /// Creates a new [Error::RetryLater] or [Error::External] error from source `err` according
     /// to its [StatusCode].
     pub fn from_error_ext<E: ErrorExt + Send + Sync + 'static>(err: E) -> Self {
-        if Error::is_retry_later(err.status_code()) {
+        if err.status_code().is_retryable() {
             Error::retry_later(err)
         } else {
             Error::external(err)

src/common/procedure/src/local/runner.rs

@@ -15,7 +15,6 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use common_error::ext::ErrorExt;
 use common_telemetry::logging;
 use tokio::time;
 
@@ -217,10 +216,10 @@ impl Runner {
                     "Failed to execute procedure {}-{}, retry: {}",
                     self.procedure.type_name(),
                     self.meta.id,
-                    ProcedureError::is_retry_later(e.status_code())
+                    e.is_retry_later(),
                 );
 
-                if ProcedureError::is_retry_later(e.status_code()) {
+                if e.is_retry_later() {
                     return ExecResult::RetryLater;
                 }
 

src/table-procedure/src/error.rs

@@ -84,6 +84,6 @@ impl ErrorExt for Error {
 
 impl From<Error> for common_procedure::Error {
     fn from(e: Error) -> common_procedure::Error {
-        common_procedure::Error::external(e)
+        common_procedure::Error::from_error_ext(e)
     }
 }