opendal 0.1.9 → 0.1.11

data/core/layers/immutable-index/src/lib.rs

@@ -155,6 +155,7 @@ impl Service for ImmutableIndexService {
     type Lister = ImmutableDir;
     type Deleter = oio::Deleter;
     type Copier = oio::Copier;
+    type Composer = oio::Composer;
 
     fn info(&self) -> ServiceInfo {
         self.inner.info()
@@ -167,6 +168,10 @@ impl Service for ImmutableIndexService {
         capability
     }
 
+    fn compose(&self, ctx: &OperationContext, to: &str, args: OpCompose) -> Result<Self::Composer> {
+        self.inner.compose(ctx, to, args)
+    }
+
     async fn create_dir(
         &self,
         ctx: &OperationContext,
@@ -194,9 +199,8 @@ impl Service for ImmutableIndexService {
         from: &str,
         to: &str,
         args: OpCopy,
-        opts: OpCopier,
     ) -> Result<Self::Copier> {
-        self.inner.copy(ctx, from, to, args, opts)
+        self.inner.copy(ctx, from, to, args)
     }
 
     fn list(&self, _ctx: &OperationContext, path: &str, args: OpList) -> Result<Self::Lister> {
@@ -228,6 +232,15 @@ impl Service for ImmutableIndexService {
         self.inner.rename(ctx, from, to, args).await
     }
 
+    async fn restore(
+        &self,
+        ctx: &OperationContext,
+        path: &str,
+        args: OpRestore,
+    ) -> Result<RpRestore> {
+        self.inner.restore(ctx, path, args).await
+    }
+
     async fn presign(
         &self,
         ctx: &OperationContext,
@@ -252,13 +265,12 @@ impl ImmutableDir {
 
     fn inner_next(&mut self) -> Option<oio::Entry> {
         self.idx.next().map(|v| {
-            let mode = if v.ends_with('/') {
-                EntryMode::DIR
+            let metadata = if v.ends_with('/') {
+                MetadataBuilder::dir()
             } else {
-                EntryMode::FILE
+                MetadataBuilder::unknown()
             };
-            let meta = Metadata::new(mode);
-            oio::Entry::with(v, meta)
+            oio::Entry::with(v, metadata.build())
         })
     }
 }
@@ -290,6 +302,7 @@ mod tests {
         type Lister = ();
         type Deleter = ();
         type Copier = ();
+        type Composer = ();
 
         fn info(&self) -> ServiceInfo {
             ServiceInfo::with_scheme("mock")
@@ -350,14 +363,7 @@ mod tests {
             ))
         }
 
-        fn copy(
-            &self,
-            _: &OperationContext,
-            _: &str,
-            _: &str,
-            _: OpCopy,
-            _: OpCopier,
-        ) -> Result<Self::Copier> {
+        fn copy(&self, _: &OperationContext, _: &str, _: &str, _: OpCopy) -> Result<Self::Copier> {
             Err(Error::new(
                 ErrorKind::Unsupported,
                 "operation is not supported",
@@ -422,7 +428,7 @@ mod tests {
             map.insert(entry.path().to_string(), entry.metadata().mode());
         }
 
-        assert_eq!(map["file"], EntryMode::FILE);
+        assert_eq!(map["file"], EntryMode::Unknown);
         assert_eq!(map["dir/"], EntryMode::DIR);
         assert_eq!(map["dir_without_prefix/"], EntryMode::DIR);
         Ok(())
@@ -454,9 +460,9 @@ mod tests {
 
         debug!("current files: {map:?}");
 
-        assert_eq!(map["file"], EntryMode::FILE);
+        assert_eq!(map["file"], EntryMode::Unknown);
         assert_eq!(map["dir/"], EntryMode::DIR);
-        assert_eq!(map["dir_without_prefix/file"], EntryMode::FILE);
+        assert_eq!(map["dir_without_prefix/file"], EntryMode::Unknown);
         Ok(())
     }
 
@@ -504,9 +510,18 @@ mod tests {
             map.insert(entry.path().to_string(), entry.metadata().mode());
         }
 
-        assert_eq!(map["dataset/stateful/ontime_2007_200.csv"], EntryMode::FILE);
-        assert_eq!(map["dataset/stateful/ontime_2008_200.csv"], EntryMode::FILE);
-        assert_eq!(map["dataset/stateful/ontime_2009_200.csv"], EntryMode::FILE);
+        assert_eq!(
+            map["dataset/stateful/ontime_2007_200.csv"],
+            EntryMode::Unknown
+        );
+        assert_eq!(
+            map["dataset/stateful/ontime_2008_200.csv"],
+            EntryMode::Unknown
+        );
+        assert_eq!(
+            map["dataset/stateful/ontime_2009_200.csv"],
+            EntryMode::Unknown
+        );
         Ok(())
     }
 
@@ -540,9 +555,18 @@ mod tests {
 
         debug!("current files: {map:?}");
 
-        assert_eq!(map["dataset/stateful/ontime_2007_200.csv"], EntryMode::FILE);
-        assert_eq!(map["dataset/stateful/ontime_2008_200.csv"], EntryMode::FILE);
-        assert_eq!(map["dataset/stateful/ontime_2009_200.csv"], EntryMode::FILE);
+        assert_eq!(
+            map["dataset/stateful/ontime_2007_200.csv"],
+            EntryMode::Unknown
+        );
+        assert_eq!(
+            map["dataset/stateful/ontime_2008_200.csv"],
+            EntryMode::Unknown
+        );
+        assert_eq!(
+            map["dataset/stateful/ontime_2009_200.csv"],
+            EntryMode::Unknown
+        );
         Ok(())
     }
 }

data/core/layers/logging/Cargo.toml

@@ -33,7 +33,7 @@ all-features = true
 
 [dependencies]
 log = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
 
 [dev-dependencies]
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }

data/core/layers/logging/src/lib.rs

@@ -267,6 +267,7 @@ impl<I: LoggingInterceptor> Service for LoggingService<I> {
     type Lister = LoggingLister<oio::Lister, I>;
     type Deleter = LoggingDeleter<oio::Deleter, I>;
     type Copier = LoggingCopier<oio::Copier, I>;
+    type Composer = oio::Composer;
 
     fn info(&self) -> ServiceInfo {
         self.info.clone()
@@ -276,6 +277,10 @@ impl<I: LoggingInterceptor> Service for LoggingService<I> {
         self.inner.capability()
     }
 
+    fn compose(&self, ctx: &OperationContext, to: &str, args: OpCompose) -> Result<Self::Composer> {
+        self.inner.compose(ctx, to, args)
+    }
+
     async fn create_dir(
         &self,
         ctx: &OperationContext,
@@ -370,11 +375,10 @@ impl<I: LoggingInterceptor> Service for LoggingService<I> {
         from: &str,
         to: &str,
         args: OpCopy,
-        opts: OpCopier,
     ) -> Result<Self::Copier> {
         self.log_start(Operation::Copy, &[("from", from), ("to", to)]);
         self.inner
-            .copy(ctx, from, to, args, opts)
+            .copy(ctx, from, to, args)
             .map(|c| {
                 self.logger.log(
                     &self.info,
@@ -413,6 +417,18 @@ impl<I: LoggingInterceptor> Service for LoggingService<I> {
         result
     }
 
+    async fn restore(
+        &self,
+        ctx: &OperationContext,
+        path: &str,
+        args: OpRestore,
+    ) -> Result<RpRestore> {
+        self.log_start(Operation::Restore, &[("path", path)]);
+        let result = self.inner.restore(ctx, path, args).await;
+        self.log_finish(Operation::Restore, &[("path", path)], result.as_ref().err());
+        result
+    }
+
     fn list(&self, ctx: &OperationContext, path: &str, args: OpList) -> Result<Self::Lister> {
         self.log_start(Operation::List, &[("path", path)]);
         self.inner
@@ -639,6 +655,34 @@ impl<W: oio::Write, I: LoggingInterceptor> oio::Write for LoggingWriter<W, I> {
         }
     }
 
+    async fn copy_from(&mut self, path: &str, args: OpRead, range: BytesRange) -> Result<()> {
+        let size = range
+            .size()
+            .expect("writer copy range must be absolute and bounded");
+
+        match self.inner.copy_from(path, args, range).await {
+            Ok(()) => {
+                self.written += size;
+                Ok(())
+            }
+            Err(err) => {
+                self.logger.log(
+                    &self.info,
+                    Operation::Write,
+                    &[
+                        ("path", &self.path),
+                        ("source", path),
+                        ("written", &self.written.to_string()),
+                        ("size", &size.to_string()),
+                    ],
+                    "failed",
+                    Some(&err),
+                );
+                Err(err)
+            }
+        }
+    }
+
     async fn abort(&mut self) -> Result<()> {
         match self.inner.abort().await {
             Ok(_) => {

data/core/layers/metrics/Cargo.toml

@@ -33,8 +33,8 @@ all-features = true
 
 [dependencies]
 metrics = "0.24"
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
-opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.58.1", default-features = false }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
+opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.59.0", default-features = false }
 
 [dev-dependencies]
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }

data/core/layers/mime-guess/Cargo.toml

@@ -33,9 +33,9 @@ all-features = true
 
 [dependencies]
 mime_guess = "2.0.5"
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
 
 [dev-dependencies]
 futures = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

data/core/layers/mime-guess/src/lib.rs

@@ -96,7 +96,19 @@ fn opwrite_with_mime(path: &str, op: OpWrite) -> OpWrite {
     }
 
     if let Some(mime) = mime_from_path(path) {
-        return op.with_content_type(mime);
+        return op.into_content_type(mime);
+    }
+
+    op
+}
+
+fn opcompose_with_mime(path: &str, op: OpCompose) -> OpCompose {
+    if op.content_type().is_some() {
+        return op;
+    }
+
+    if let Some(mime) = mime_from_path(path) {
+        return op.into_content_type(mime);
     }
 
     op
@@ -109,7 +121,9 @@ fn rpstat_with_mime(path: &str, rp: RpStat) -> RpStat {
         }
 
         if let Some(mime) = mime_from_path(path) {
-            return metadata.with_content_type(mime.into());
+            let mut metadata = metadata.into_builder();
+            metadata.content_type(mime);
+            return metadata.build();
         }
 
         metadata
@@ -122,6 +136,7 @@ impl Service for MimeGuessAccessor {
     type Lister = oio::Lister;
     type Deleter = oio::Deleter;
     type Copier = oio::Copier;
+    type Composer = oio::Composer;
 
     fn info(&self) -> ServiceInfo {
         self.0.info()
@@ -154,9 +169,12 @@ impl Service for MimeGuessAccessor {
         from: &str,
         to: &str,
         args: OpCopy,
-        opts: OpCopier,
     ) -> Result<Self::Copier> {
-        self.0.copy(ctx, from, to, args, opts)
+        self.0.copy(ctx, from, to, args)
+    }
+
+    fn compose(&self, ctx: &OperationContext, to: &str, args: OpCompose) -> Result<Self::Composer> {
+        self.0.compose(ctx, to, opcompose_with_mime(to, args))
     }
 
     async fn stat(&self, ctx: &OperationContext, path: &str, args: OpStat) -> Result<RpStat> {
@@ -176,6 +194,15 @@ impl Service for MimeGuessAccessor {
         self.0.rename(ctx, from, to, args).await
     }
 
+    async fn restore(
+        &self,
+        ctx: &OperationContext,
+        path: &str,
+        args: OpRestore,
+    ) -> Result<RpRestore> {
+        self.0.restore(ctx, path, args).await
+    }
+
     fn delete(&self, ctx: &OperationContext) -> Result<Self::Deleter> {
         self.0.delete(ctx)
     }

data/core/layers/observe-metrics-common/Cargo.toml

@@ -34,7 +34,7 @@ all-features = true
 [dependencies]
 futures = { workspace = true }
 http = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["macros"] }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

data/core/layers/observe-metrics-common/src/lib.rs

@@ -734,6 +734,7 @@ impl<I: MetricsIntercept> Service for MetricsAccessor<I> {
     type Lister = MetricsWrapper<oio::Lister, I>;
     type Deleter = MetricsWrapper<oio::Deleter, I>;
     type Copier = MetricsWrapper<oio::Copier, I>;
+    type Composer = oio::Composer;
 
     fn info(&self) -> ServiceInfo {
         self.info.clone()
@@ -743,6 +744,10 @@ impl<I: MetricsIntercept> Service for MetricsAccessor<I> {
         self.inner.capability()
     }
 
+    fn compose(&self, ctx: &OperationContext, to: &str, args: OpCompose) -> Result<Self::Composer> {
+        self.inner.compose(ctx, to, args)
+    }
+
     async fn create_dir(
         &self,
         ctx: &OperationContext,
@@ -842,7 +847,6 @@ impl<I: MetricsIntercept> Service for MetricsAccessor<I> {
         from: &str,
         to: &str,
         args: OpCopy,
-        opts: OpCopier,
     ) -> Result<Self::Copier> {
         let labels = MetricLabels::new(self.info.clone(), Operation::Copy.into_static());
 
@@ -853,7 +857,7 @@ impl<I: MetricsIntercept> Service for MetricsAccessor<I> {
         let mut guard =
             ExecutingGuard::new_operation(self.interceptor.clone(), labels.clone(), start);
 
-        match self.inner.copy(ctx, from, to, args, opts.clone()) {
+        match self.inner.copy(ctx, from, to, args) {
             Ok(copier) => {
                 guard.defuse();
                 Ok(MetricsWrapper::new(
@@ -911,6 +915,41 @@ impl<I: MetricsIntercept> Service for MetricsAccessor<I> {
         res
     }
 
+    async fn restore(
+        &self,
+        ctx: &OperationContext,
+        path: &str,
+        args: OpRestore,
+    ) -> Result<RpRestore> {
+        let labels = MetricLabels::new(self.info.clone(), Operation::Restore.into_static());
+        let start = Instant::now();
+
+        self.interceptor
+            .observe(labels.clone(), MetricValue::OperationExecuting(1));
+        let mut guard =
+            ExecutingGuard::new_operation(self.interceptor.clone(), labels.clone(), start);
+
+        let res = self
+            .inner
+            .restore(ctx, path, args)
+            .await
+            .inspect(|_| {
+                self.interceptor.observe(
+                    labels.clone(),
+                    MetricValue::OperationDurationSeconds(start.elapsed()),
+                );
+            })
+            .inspect_err(|err| {
+                self.interceptor.observe(
+                    labels.clone().with_error(err.kind()),
+                    MetricValue::OperationErrorsTotal,
+                );
+            });
+
+        guard.complete();
+        res
+    }
+
     async fn stat(&self, ctx: &OperationContext, path: &str, args: OpStat) -> Result<RpStat> {
         let labels = MetricLabels::new(self.info.clone(), Operation::Stat.into_static());
 
@@ -1217,6 +1256,20 @@ impl<R: oio::Write, I: MetricsIntercept> oio::Write for MetricsWrapper<R, I> {
             .inspect_err(|err| self.record_error(err))
     }
 
+    async fn copy_from(&mut self, path: &str, args: OpRead, range: BytesRange) -> Result<()> {
+        let size = range
+            .size()
+            .expect("writer copy range must be absolute and bounded");
+
+        self.inner
+            .copy_from(path, args, range)
+            .await
+            .inspect(|_| {
+                self.size += size;
+            })
+            .inspect_err(|err| self.record_error(err))
+    }
+
     async fn close(&mut self) -> Result<Metadata> {
         let result = self
             .inner

data/core/layers/otelmetrics/Cargo.toml

@@ -32,11 +32,11 @@ version = { workspace = true }
 all-features = true
 
 [dependencies]
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
-opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
+opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.59.0" }
 opentelemetry = { version = "0.32.0", default-features = false, features = [
   "metrics",
 ] }
 
 [dev-dependencies]
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }

data/core/layers/oteltrace/Cargo.toml

@@ -32,10 +32,10 @@ version = { workspace = true }
 all-features = true
 
 [dependencies]
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
 opentelemetry = { version = "0.32.0", default-features = false, features = [
   "trace",
 ] }
 
 [dev-dependencies]
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }

data/core/layers/oteltrace/src/lib.rs

@@ -94,6 +94,7 @@ impl Service for OtelTraceService {
     type Lister = OtelTraceWrapper<oio::Lister>;
     type Deleter = oio::Deleter;
     type Copier = oio::Copier;
+    type Composer = oio::Composer;
 
     fn info(&self) -> ServiceInfo {
         let tracer = global::tracer("opendal");
@@ -104,6 +105,10 @@ impl Service for OtelTraceService {
         self.inner.capability()
     }
 
+    fn compose(&self, ctx: &OperationContext, to: &str, args: OpCompose) -> Result<Self::Composer> {
+        self.inner.compose(ctx, to, args)
+    }
+
     async fn create_dir(
         &self,
         ctx: &OperationContext,
@@ -149,7 +154,6 @@ impl Service for OtelTraceService {
         from: &str,
         to: &str,
         args: OpCopy,
-        opts: OpCopier,
     ) -> Result<Self::Copier> {
         let tracer = global::tracer("opendal");
         let mut span = tracer.start("copy");
@@ -158,7 +162,7 @@ impl Service for OtelTraceService {
         span.set_attribute(KeyValue::new("args", format!("{args:?}")));
         let cx = TraceContext::current_with_span(span);
         let _guard = cx.attach();
-        self.inner.copy(ctx, from, to, args, opts)
+        self.inner.copy(ctx, from, to, args)
     }
 
     async fn rename(
@@ -180,6 +184,20 @@ impl Service for OtelTraceService {
             .await
     }
 
+    async fn restore(
+        &self,
+        ctx: &OperationContext,
+        path: &str,
+        args: OpRestore,
+    ) -> Result<RpRestore> {
+        let tracer = global::tracer("opendal");
+        let mut span = tracer.start("restore");
+        span.set_attribute(KeyValue::new("path", path.to_string()));
+        span.set_attribute(KeyValue::new("args", format!("{args:?}")));
+        let cx = TraceContext::current_with_span(span);
+        self.inner.restore(ctx, path, args).with_context(cx).await
+    }
+
     async fn stat(&self, ctx: &OperationContext, path: &str, args: OpStat) -> Result<RpStat> {
         let tracer = global::tracer("opendal");
         let mut span = tracer.start("stat");
@@ -265,6 +283,13 @@ impl<R: oio::Write> oio::Write for OtelTraceWrapper<R> {
         self.inner.write(bs).with_context(self.cx.clone()).await
     }
 
+    async fn copy_from(&mut self, path: &str, args: OpRead, range: BytesRange) -> Result<()> {
+        self.inner
+            .copy_from(path, args, range)
+            .with_context(self.cx.clone())
+            .await
+    }
+
     async fn abort(&mut self) -> Result<()> {
         self.inner.abort().with_context(self.cx.clone()).await
     }

data/core/layers/prometheus/Cargo.toml

@@ -32,11 +32,11 @@ version = { workspace = true }
 all-features = true
 
 [dependencies]
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
-opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
+opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.59.0" }
 prometheus = { version = "0.14", features = ["process"] }
 
 [dev-dependencies]
 log = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

data/core/layers/prometheus-client/Cargo.toml

@@ -32,11 +32,11 @@ version = { workspace = true }
 all-features = true
 
 [dependencies]
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
-opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
+opendal-layer-observe-metrics-common = { path = "../observe-metrics-common", version = "0.59.0" }
 prometheus-client = { version = "0.25" }
 
 [dev-dependencies]
 log = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

data/core/layers/retry/Cargo.toml

@@ -34,13 +34,13 @@ all-features = true
 [dependencies]
 backon = { version = "1.6", features = ["tokio-sleep"] }
 log = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1", default-features = false }
+opendal-core = { path = "../../core", version = "0.59.0", default-features = false }
 
 [dev-dependencies]
 bytes = { workspace = true }
 futures = { workspace = true }
 logforth = { workspace = true }
-opendal-core = { path = "../../core", version = "0.58.1" }
-opendal-layer-logging = { path = "../logging", version = "0.58.1" }
-opendal-layer-timeout = { path = "../timeout", version = "0.58.1" }
+opendal-core = { path = "../../core", version = "0.59.0" }
+opendal-layer-logging = { path = "../logging", version = "0.59.0" }
+opendal-layer-timeout = { path = "../timeout", version = "0.59.0" }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }