Merge branch 'main' into planner-cleanup

Author: mergify[bot]

Cargo.lock

@@ -9,4 +9,5 @@ RUN apt-get update -y && \
     rm -rf /var/cache/apt/*
 
 COPY ./distro/$TARGETPLATFORM/databend-meta /databend-meta
+COPY ./distro/$TARGETPLATFORM/databend-metactl /databend-metactl
 ENTRYPOINT ["/databend-meta"]

docker/debian/meta.Dockerfile

@@ -1,4 +1,5 @@
 FROM gcr.io/distroless/cc
 ARG TARGETPLATFORM
 COPY ./distro/$TARGETPLATFORM/databend-meta /databend-meta
+COPY ./distro/$TARGETPLATFORM/databend-metactl /databend-metactl
 ENTRYPOINT ["/databend-meta"]

docker/distroless/meta.Dockerfile

@@ -12,4 +12,4 @@ test = false
 common-base = { path = "../base" }
 
 async-trait = "0.1.56"
-opendal = { version = "0.17.0", features = ["layers-retry"] }
+opendal = { version = "0.17.1", features = ["layers-retry"] }

src/common/contexts/Cargo.toml

@@ -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/common/exception/src/exception.rs

@@ -18,7 +18,7 @@ anyhow = "1.0.64"
 backon = "0.1.0"
 globiter = "0.1.0"
 once_cell = "1.12.0"
-opendal = { version = "0.17.0", features = [
+opendal = { version = "0.17.1", features = [
     "layers-retry",
     "layers-tracing",
     "layers-metrics",

src/common/storage/Cargo.toml

@@ -26,5 +26,5 @@ common-users = { path = "../users" }
 
 async-trait = "0.1.56"
 dyn-clone = "1.0.6"
-opendal = { version = "0.17.0", features = ["layers-retry"] }
+opendal = { version = "0.17.1", features = ["layers-retry"] }
 parking_lot = "0.12.1"

src/query/catalog/Cargo.toml

@@ -21,7 +21,7 @@ common-users = { path = "../users" }
 clap = { version = "3.2.5", features = ["derive", "env"] }
 hex = "0.4.3"
 once_cell = "1.12.0"
-opendal = { version = "0.17.0", features = ["layers-retry", "compress"], optional = true }
+opendal = { version = "0.17.1", features = ["layers-retry", "compress"], optional = true }
 semver = "1.0.10"
 serde = { version = "1.0.137", features = ["derive"] }
 serfig = "0.0.2"

src/query/config/Cargo.toml

@@ -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/config/src/outer_v0.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)
     }
 }