Cleanup api

Signed-off-by: Xuanwo <github@xuanwo.io>
apache · Mar 1, 2023 · 4b93bac · 4b93bac
1 parent 3515430
commit 4b93bac
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 78 deletions.
diff --git a/src/layers/logging.rs b/src/layers/logging.rs
@@ -291,26 +291,22 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
     async fn write(&self, path: &str, args: OpWrite) -> Result<(RpWrite, Self::Writer)> {
         debug!(
             target: LOGGING_TARGET,
-            "service={} operation={} path={} size={:?} -> started",
+            "service={} operation={} path={} -> started",
             self.scheme,
             Operation::Write,
-            path,
-            args.size()
+            path
         );
 
-        let size = args.size();
-
         self.inner
             .write(path, args)
             .await
             .map(|v| {
                 debug!(
                     target: LOGGING_TARGET,
-                    "service={} operation={} path={} size={:?} -> written",
+                    "service={} operation={} path={} -> start writing",
                     self.scheme,
                     Operation::Write,
                     path,
-                    size
                 );
                 v
             })
@@ -319,11 +315,10 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
                     log!(
                         target: LOGGING_TARGET,
                         lvl,
-                        "service={} operation={} path={} size={:?} -> {}: {err:?}",
+                        "service={} operation={} path={} -> {}: {err:?}",
                         self.scheme,
                         Operation::Write,
                         path,
-                        size,
                         self.err_status(&err)
                     )
                 };
@@ -853,23 +848,21 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
     fn blocking_write(&self, path: &str, args: OpWrite) -> Result<(RpWrite, Self::BlockingWriter)> {
         debug!(
             target: LOGGING_TARGET,
-            "service={} operation={} path={} size={:?} -> started",
+            "service={} operation={} path={} -> started",
             self.scheme,
             Operation::BlockingWrite,
             path,
-            args.size()
         );
 
         self.inner
-            .blocking_write(path, args.clone())
+            .blocking_write(path, args)
             .map(|v| {
                 debug!(
                     target: LOGGING_TARGET,
-                    "service={} operation={} path={} size={:?} -> written",
+                    "service={} operation={} path={} -> written",
                     self.scheme,
                     Operation::BlockingWrite,
                     path,
-                    args.size()
                 );
                 v
             })
@@ -878,11 +871,10 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
                     log!(
                         target: LOGGING_TARGET,
                         lvl,
-                        "service={} operation={} path={} size={:?} -> {}: {err:?}",
+                        "service={} operation={} path={} -> {}: {err:?}",
                         self.scheme,
                         Operation::BlockingWrite,
                         path,
-                        args.size(),
                         self.err_status(&err)
                     );
                 }

diff --git a/src/object/object.rs b/src/object/object.rs
@@ -529,9 +529,7 @@ impl Object {
     /// # }
     /// ```
     pub async fn write(&self, bs: impl Into<Bytes>) -> Result<()> {
-        let bs = bs.into();
-        let op = OpWrite::new(bs.len() as u64);
-        self.write_with(op, bs).await
+        self.write_with(OpWrite::new(), bs).await
     }
 
     /// Write multiple bytes into object.
@@ -633,10 +631,8 @@ impl Object {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn blocking_write(&self, bs: impl Into<Vec<u8>>) -> Result<()> {
-        let bs: Vec<u8> = bs.into();
-        let op = OpWrite::new(bs.len() as u64);
-        self.blocking_write_with(op, bs)
+    pub fn blocking_write(&self, bs: impl Into<Bytes>) -> Result<()> {
+        self.blocking_write_with(OpWrite::new(), bs)
     }
 
     /// Write multiple bytes into object.
@@ -1380,7 +1376,7 @@ impl Object {
     /// curl -X PUT "https://s3.amazonaws.com/examplebucket/test.txt?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=access_key_id/20130721/us-east-1/s3/aws4_request&X-Amz-Date=20130721T201207Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=<signature-value>" -d "Hello, World!"
     /// ```
     pub fn presign_write(&self, expire: Duration) -> Result<PresignedRequest> {
-        self.presign_write_with(OpWrite::new(0), expire)
+        self.presign_write_with(OpWrite::new(), expire)
     }
 
     /// Presign an operation for write with option described in OpenDAL [rfc-0661](../../docs/rfcs/0661-path-in-accessor.md)

diff --git a/src/ops.rs b/src/ops.rs
@@ -362,7 +362,6 @@ impl OpStat {
 pub struct OpWrite {
     append: bool,
 
-    size: u64,
     content_type: Option<String>,
     content_disposition: Option<String>,
 }
@@ -371,21 +370,15 @@ impl OpWrite {
     /// Create a new `OpWrite`.
     ///
     /// If input path is not a file path, an error will be returned.
-    pub fn new(size: u64) -> Self {
+    pub fn new() -> Self {
         Self {
             append: false,
 
-            size,
             content_type: None,
             content_disposition: None,
         }
     }
 
-    /// Get size from option.
-    pub fn size(&self) -> u64 {
-        self.size
-    }
-
     pub(crate) fn with_append(mut self) -> Self {
         self.append = true;
         self

diff --git a/src/raw/adapters/kv/backend.rs b/src/raw/adapters/kv/backend.rs
@@ -114,16 +114,16 @@ impl<S: Adapter> Accessor for Backend<S> {
         Ok((RpRead::new(bs.len() as u64), output::Cursor::from(bs)))
     }
 
-    async fn write(&self, path: &str, args: OpWrite) -> Result<(RpWrite, Self::Writer)> {
+    async fn write(&self, path: &str, _: OpWrite) -> Result<(RpWrite, Self::Writer)> {
         let p = build_abs_path(&self.root, path);
 
-        Ok((RpWrite::new(args.size()), KvWriter::new(self.kv.clone(), p)))
+        Ok((RpWrite::new(), KvWriter::new(self.kv.clone(), p)))
     }
 
-    fn blocking_write(&self, path: &str, args: OpWrite) -> Result<(RpWrite, Self::BlockingWriter)> {
+    fn blocking_write(&self, path: &str, _: OpWrite) -> Result<(RpWrite, Self::BlockingWriter)> {
         let p = build_abs_path(&self.root, path);
 
-        Ok((RpWrite::new(args.size()), KvWriter::new(self.kv.clone(), p)))
+        Ok((RpWrite::new(), KvWriter::new(self.kv.clone(), p)))
     }
 
     async fn stat(&self, path: &str, _: OpStat) -> Result<RpStat> {

diff --git a/src/raw/rps.rs b/src/raw/rps.rs
@@ -275,19 +275,12 @@ impl RpStat {
 
 /// Reply for `write` operation.
 #[derive(Debug, Clone, Default)]
-pub struct RpWrite {
-    written: u64,
-}
+pub struct RpWrite {}
 
 impl RpWrite {
     /// Create a new reply for write.
-    pub fn new(written: u64) -> Self {
-        Self { written }
-    }
-
-    /// Get the written size (in bytes) of write operation.
-    pub fn written(&self) -> u64 {
-        self.written
+    pub fn new() -> Self {
+        Self {}
     }
 }
 

diff --git a/src/services/azblob/backend.rs b/src/services/azblob/backend.rs
@@ -575,7 +575,7 @@ impl AzblobBackend {
     pub fn azblob_put_blob_request(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         content_type: Option<&str>,
         body: AsyncBody,
     ) -> Result<Request<AsyncBody>> {

diff --git a/src/services/azblob/writer.rs b/src/services/azblob/writer.rs
@@ -40,7 +40,7 @@ impl output::Write for AzblobWriter {
     async fn write(&mut self, bs: Bytes) -> Result<()> {
         let mut req = self.backend.azblob_put_blob_request(
             &self.path,
-            Some(self.op.size()),
+            Some(bs.len()),
             self.op.content_type(),
             AsyncBody::Bytes(bs),
         )?;

diff --git a/src/services/azdfs/backend.rs b/src/services/azdfs/backend.rs
@@ -494,7 +494,7 @@ impl AzdfsBackend {
     pub fn azdfs_update_request(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         body: AsyncBody,
     ) -> Result<Request<AsyncBody>> {
         let p = build_abs_path(&self.root, path);

diff --git a/src/services/azdfs/writer.rs b/src/services/azdfs/writer.rs
@@ -65,11 +65,9 @@ impl output::Write for AzdfsWriter {
             }
         }
 
-        let mut req = self.backend.azdfs_update_request(
-            &self.path,
-            Some(self.op.size()),
-            AsyncBody::Bytes(bs),
-        )?;
+        let mut req =
+            self.backend
+                .azdfs_update_request(&self.path, Some(bs.len()), AsyncBody::Bytes(bs))?;
 
         self.backend
             .signer

diff --git a/src/services/fs/backend.rs b/src/services/fs/backend.rs
@@ -442,7 +442,7 @@ impl Accessor for FsBackend {
             .await
             .map_err(parse_io_error)?;
 
-        Ok((RpWrite::new(0), FsWriter::new(target_path, tmp_path, f)))
+        Ok((RpWrite::new(), FsWriter::new(target_path, tmp_path, f)))
     }
 
     async fn stat(&self, path: &str, _: OpStat) -> Result<RpStat> {
@@ -628,7 +628,7 @@ impl Accessor for FsBackend {
             .open(path)
             .map_err(parse_io_error)?;
 
-        Ok((RpWrite::new(0), FsWriter::new(target_path, tmp_path, f)))
+        Ok((RpWrite::new(), FsWriter::new(target_path, tmp_path, f)))
     }
 
     fn blocking_stat(&self, path: &str, _: OpStat) -> Result<RpStat> {

diff --git a/src/services/ftp/backend.rs b/src/services/ftp/backend.rs
@@ -395,7 +395,7 @@ impl Accessor for FtpBackend {
 
     async fn write(&self, path: &str, _: OpWrite) -> Result<(RpWrite, Self::Writer)> {
         Ok((
-            RpWrite::new(0),
+            RpWrite::new(),
             FtpWriter::new(self.clone(), path.to_string()),
         ))
     }

diff --git a/src/services/gcs/backend.rs b/src/services/gcs/backend.rs
@@ -509,7 +509,7 @@ impl GcsBackend {
     pub fn gcs_insert_object_request(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         content_type: Option<&str>,
         body: AsyncBody,
     ) -> Result<Request<AsyncBody>> {

diff --git a/src/services/gcs/writer.rs b/src/services/gcs/writer.rs
@@ -40,7 +40,7 @@ impl output::Write for GcsWriter {
     async fn write(&mut self, bs: Bytes) -> Result<()> {
         let mut req = self.backend.gcs_insert_object_request(
             &self.path,
-            Some(self.op.size()),
+            Some(bs.len()),
             self.op.content_type(),
             AsyncBody::Bytes(bs),
         )?;

diff --git a/src/services/ghac/backend.rs b/src/services/ghac/backend.rs
@@ -319,7 +319,7 @@ impl Accessor for GhacBackend {
             ));
         }
 
-        let req = self.ghac_reserve(path, 1).await?;
+        let req = self.ghac_reserve(path).await?;
 
         let resp = self.client.send_async(req).await?;
 
@@ -392,8 +392,8 @@ impl Accessor for GhacBackend {
         }
     }
 
-    async fn write(&self, path: &str, args: OpWrite) -> Result<(RpWrite, Self::Writer)> {
-        let req = self.ghac_reserve(path, args.size()).await?;
+    async fn write(&self, path: &str, _: OpWrite) -> Result<(RpWrite, Self::Writer)> {
+        let req = self.ghac_reserve(path).await?;
 
         let resp = self.client.send_async(req).await?;
 
@@ -523,15 +523,14 @@ impl GhacBackend {
             .map_err(new_request_build_error)
     }
 
-    async fn ghac_reserve(&self, path: &str, size: u64) -> Result<Request<AsyncBody>> {
+    async fn ghac_reserve(&self, path: &str) -> Result<Request<AsyncBody>> {
         let p = build_abs_path(&self.root, path);
 
         let url = format!("{}{CACHE_URL_BASE}/caches", self.cache_url);
 
         let bs = serde_json::to_vec(&GhacReserveRequest {
             key: p,
             version: self.version.to_string(),
-            cache_size: size,
         })
         .map_err(new_json_serialize_error)?;
 
@@ -628,7 +627,6 @@ struct GhacQueryResponse {
 struct GhacReserveRequest {
     key: String,
     version: String,
-    cache_size: u64,
 }
 
 #[derive(Deserialize)]

diff --git a/src/services/hdfs/backend.rs b/src/services/hdfs/backend.rs
@@ -345,7 +345,7 @@ impl Accessor for HdfsBackend {
             .await
             .map_err(parse_io_error)?;
 
-        Ok((RpWrite::new(0), HdfsWriter::new(f)))
+        Ok((RpWrite::new(), HdfsWriter::new(f)))
     }
 
     async fn stat(&self, path: &str, _: OpStat) -> Result<RpStat> {
@@ -512,7 +512,7 @@ impl Accessor for HdfsBackend {
             .open(&p)
             .map_err(parse_io_error)?;
 
-        Ok((RpWrite::new(0), HdfsWriter::new(f)))
+        Ok((RpWrite::new(), HdfsWriter::new(f)))
     }
 
     fn blocking_stat(&self, path: &str, _: OpStat) -> Result<RpStat> {

diff --git a/src/services/obs/backend.rs b/src/services/obs/backend.rs
@@ -439,7 +439,7 @@ impl ObsBackend {
     pub fn obs_put_object_request(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         content_type: Option<&str>,
         body: AsyncBody,
     ) -> Result<Request<AsyncBody>> {

diff --git a/src/services/obs/writer.rs b/src/services/obs/writer.rs
@@ -40,7 +40,7 @@ impl output::Write for ObsWriter {
     async fn write(&mut self, bs: Bytes) -> Result<()> {
         let mut req = self.backend.obs_put_object_request(
             &self.path,
-            Some(self.op.size()),
+            Some(bs.len()),
             self.op.content_type(),
             AsyncBody::Bytes(bs),
         )?;

diff --git a/src/services/oss/backend.rs b/src/services/oss/backend.rs
@@ -609,7 +609,7 @@ impl OssBackend {
     pub fn oss_put_object_request(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         content_type: Option<&str>,
         content_disposition: Option<&str>,
         body: AsyncBody,
@@ -735,7 +735,7 @@ impl OssBackend {
     async fn oss_put_object(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         content_type: Option<&str>,
         content_disposition: Option<&str>,
         body: AsyncBody,

diff --git a/src/services/oss/writer.rs b/src/services/oss/writer.rs
@@ -40,7 +40,7 @@ impl output::Write for OssWriter {
     async fn write(&mut self, bs: Bytes) -> Result<()> {
         let mut req = self.backend.oss_put_object_request(
             &self.path,
-            Some(self.op.size()),
+            Some(bs.len()),
             self.op.content_type(),
             self.op.content_disposition(),
             AsyncBody::Bytes(bs),

diff --git a/src/services/s3/backend.rs b/src/services/s3/backend.rs
@@ -1366,7 +1366,7 @@ impl S3Backend {
     pub fn s3_put_object_request(
         &self,
         path: &str,
-        size: Option<u64>,
+        size: Option<usize>,
         content_type: Option<&str>,
         content_disposition: Option<&str>,
         body: AsyncBody,