You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by xu...@apache.org on 2023/09/28 04:30:01 UTC
[incubator-opendal] branch add-write-empty created (now 7856b6295)
This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a change to branch add-write-empty
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
at 7856b6295 feat: Add write_can_empty in Capability and related tests
This branch includes the following new commits:
new 7856b6295 feat: Add write_can_empty in Capability and related tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-opendal] 01/01: feat: Add write_can_empty in Capability and related tests
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch add-write-empty
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 7856b62954c713dd13f63a09f5e0a92bd40a368e
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Thu Sep 28 12:29:33 2023 +0800
feat: Add write_can_empty in Capability and related tests
Signed-off-by: Xuanwo <gi...@xuanwo.io>
---
core/src/raw/adapters/kv/backend.rs | 1 +
core/src/raw/adapters/typed_kv/backend.rs | 1 +
core/src/raw/oio/write/multipart_upload_write.rs | 8 +++++++-
core/src/services/azblob/backend.rs | 1 +
core/src/services/cos/backend.rs | 1 +
core/src/services/fs/backend.rs | 1 +
core/src/services/gcs/backend.rs | 1 +
core/src/services/obs/backend.rs | 1 +
core/src/services/oss/backend.rs | 1 +
core/src/services/s3/backend.rs | 1 +
core/src/services/webdav/backend.rs | 1 +
core/src/types/capability.rs | 2 ++
core/tests/behavior/write.rs | 18 ++++++++++++++++++
13 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/core/src/raw/adapters/kv/backend.rs b/core/src/raw/adapters/kv/backend.rs
index 211e9c9ef..94db4de8d 100644
--- a/core/src/raw/adapters/kv/backend.rs
+++ b/core/src/raw/adapters/kv/backend.rs
@@ -84,6 +84,7 @@ impl<S: Adapter> Accessor for Backend<S> {
}
if cap.write {
+ cap.write_can_empty = true;
cap.create_dir = true;
cap.delete = true;
}
diff --git a/core/src/raw/adapters/typed_kv/backend.rs b/core/src/raw/adapters/typed_kv/backend.rs
index 6d515b01a..d5313b8e0 100644
--- a/core/src/raw/adapters/typed_kv/backend.rs
+++ b/core/src/raw/adapters/typed_kv/backend.rs
@@ -84,6 +84,7 @@ impl<S: Adapter> Accessor for Backend<S> {
if kv_cap.set {
cap.write = true;
+ cap.write_can_empty = true;
cap.create_dir = true;
}
diff --git a/core/src/raw/oio/write/multipart_upload_write.rs b/core/src/raw/oio/write/multipart_upload_write.rs
index 4cf597e59..f95cf64f1 100644
--- a/core/src/raw/oio/write/multipart_upload_write.rs
+++ b/core/src/raw/oio/write/multipart_upload_write.rs
@@ -258,7 +258,13 @@ where
(w, res)
}));
}
- None => return Poll::Ready(Ok(())),
+ None => {
+ // Call write_once if there is no data in cache and no upload_id.
+ self.state = State::Close(Box::pin(async move {
+ let res = w.write_once(0, AsyncBody::Empty).await;
+ (w, res)
+ }));
+ }
},
}
}
diff --git a/core/src/services/azblob/backend.rs b/core/src/services/azblob/backend.rs
index 627d6fb02..de6d5e3e9 100644
--- a/core/src/services/azblob/backend.rs
+++ b/core/src/services/azblob/backend.rs
@@ -529,6 +529,7 @@ impl Accessor for AzblobBackend {
read_with_override_content_disposition: true,
write: true,
+ write_can_empty: true,
write_can_append: true,
write_with_cache_control: true,
write_with_content_type: true,
diff --git a/core/src/services/cos/backend.rs b/core/src/services/cos/backend.rs
index be19e0871..d376abcb7 100644
--- a/core/src/services/cos/backend.rs
+++ b/core/src/services/cos/backend.rs
@@ -265,6 +265,7 @@ impl Accessor for CosBackend {
read_with_if_none_match: true,
write: true,
+ write_can_empty: true,
write_can_append: true,
write_can_multi: true,
write_with_content_type: true,
diff --git a/core/src/services/fs/backend.rs b/core/src/services/fs/backend.rs
index a225958d2..40ada10f2 100644
--- a/core/src/services/fs/backend.rs
+++ b/core/src/services/fs/backend.rs
@@ -267,6 +267,7 @@ impl Accessor for FsBackend {
read_with_range: true,
write: true,
+ write_can_empty: true,
write_can_append: true,
write_can_multi: true,
create_dir: true,
diff --git a/core/src/services/gcs/backend.rs b/core/src/services/gcs/backend.rs
index 57ce7cfbd..e65fb155d 100644
--- a/core/src/services/gcs/backend.rs
+++ b/core/src/services/gcs/backend.rs
@@ -334,6 +334,7 @@ impl Accessor for GcsBackend {
read_with_if_none_match: true,
write: true,
+ write_can_empty: true,
write_can_multi: true,
write_with_content_type: true,
// The buffer size should be a multiple of 256 KiB (256 x 1024 bytes), unless it's the last chunk that completes the upload.
diff --git a/core/src/services/obs/backend.rs b/core/src/services/obs/backend.rs
index cff7c254f..aa5a86864 100644
--- a/core/src/services/obs/backend.rs
+++ b/core/src/services/obs/backend.rs
@@ -272,6 +272,7 @@ impl Accessor for ObsBackend {
read_with_if_none_match: true,
write: true,
+ write_can_empty: true,
write_can_append: true,
write_can_multi: true,
write_with_content_type: true,
diff --git a/core/src/services/oss/backend.rs b/core/src/services/oss/backend.rs
index cc4dddbae..4f90ea957 100644
--- a/core/src/services/oss/backend.rs
+++ b/core/src/services/oss/backend.rs
@@ -398,6 +398,7 @@ impl Accessor for OssBackend {
read_with_if_none_match: true,
write: true,
+ write_can_empty: true,
write_can_append: true,
write_can_multi: true,
write_with_cache_control: true,
diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs
index 82e420421..060106851 100644
--- a/core/src/services/s3/backend.rs
+++ b/core/src/services/s3/backend.rs
@@ -913,6 +913,7 @@ impl Accessor for S3Backend {
read_with_override_content_type: true,
write: true,
+ write_can_empty: true,
write_can_multi: true,
write_with_cache_control: true,
write_with_content_type: true,
diff --git a/core/src/services/webdav/backend.rs b/core/src/services/webdav/backend.rs
index 549a6b34f..4c4cf6b83 100644
--- a/core/src/services/webdav/backend.rs
+++ b/core/src/services/webdav/backend.rs
@@ -238,6 +238,7 @@ impl Accessor for WebdavBackend {
read_with_range: true,
write: true,
+ write_can_empty: true,
create_dir: true,
delete: true,
diff --git a/core/src/types/capability.rs b/core/src/types/capability.rs
index abe7eb9c4..2767c29e4 100644
--- a/core/src/types/capability.rs
+++ b/core/src/types/capability.rs
@@ -76,6 +76,8 @@ pub struct Capability {
pub write: bool,
/// If operator supports write can be called in multi times.
pub write_can_multi: bool,
+ /// If operator supports write with empty content.
+ pub write_can_empty: bool,
/// If operator supports write by append.
pub write_can_append: bool,
/// If operator supports write with content type.
diff --git a/core/tests/behavior/write.rs b/core/tests/behavior/write.rs
index 442aff1a5..675d0c7a3 100644
--- a/core/tests/behavior/write.rs
+++ b/core/tests/behavior/write.rs
@@ -48,6 +48,7 @@ pub fn behavior_write_tests(op: &Operator) -> Vec<Trial> {
test_create_dir,
test_create_dir_existing,
test_write_only,
+ test_write_with_empty_content,
test_write_with_dir_path,
test_write_with_special_chars,
test_write_with_cache_control,
@@ -136,6 +137,23 @@ pub async fn test_write_only(op: Operator) -> Result<()> {
Ok(())
}
+/// Write a file with empty content.
+pub async fn test_write_with_empty_content(op: Operator) -> Result<()> {
+ if !op.info().full_capability().write_can_empty {
+ return Ok(());
+ }
+
+ let path = uuid::Uuid::new_v4().to_string();
+
+ op.write(&path, vec![]).await?;
+
+ let meta = op.stat(&path).await.expect("stat must succeed");
+ assert_eq!(meta.content_length(), 0);
+
+ op.delete(&path).await.expect("delete must succeed");
+ Ok(())
+}
+
/// Write file with dir path should return an error
pub async fn test_write_with_dir_path(op: Operator) -> Result<()> {
let path = format!("{}/", uuid::Uuid::new_v4());