Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(core): add if_not_exist in OpWrite #5305

Merged
merged 5 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions core/src/raw/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ pub struct OpWrite {
cache_control: Option<String>,
executor: Option<Executor>,
if_none_match: Option<String>,
if_not_exist: Option<bool>,
kemingy marked this conversation as resolved.
Show resolved Hide resolved
user_metadata: Option<HashMap<String, String>>,
}

Expand Down Expand Up @@ -697,6 +698,17 @@ impl OpWrite {
self.if_none_match.as_deref()
}

/// Set the If-Not-Exist of the option
pub fn with_if_not_exist(mut self, b: bool) -> Self {
self.if_not_exist = Some(b);
self
}

/// Get If-Not-Exist from option
pub fn if_not_exist(&self) -> Option<bool> {
self.if_not_exist
}

/// Merge given executor into option.
///
/// If executor has already been set, this will do nothing.
Expand Down
1 change: 1 addition & 0 deletions core/src/services/s3/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,7 @@ impl Access for S3Backend {
write_with_cache_control: true,
write_with_content_type: true,
write_with_if_none_match: true,
kemingy marked this conversation as resolved.
Show resolved Hide resolved
write_with_if_not_exist: true,
write_with_user_metadata: true,

// The min multipart size of S3 is 5 MiB.
Expand Down
6 changes: 6 additions & 0 deletions core/src/services/s3/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,12 @@ impl S3Core {
req = req.header(IF_NONE_MATCH, if_none_match);
}
kemingy marked this conversation as resolved.
Show resolved Hide resolved

if let Some(if_not_exist) = args.if_not_exist() {
if if_not_exist {
req = req.header(IF_NONE_MATCH, "*");
}
}

// Set body
let req = req.body(body).map_err(new_request_build_error)?;

Expand Down
2 changes: 2 additions & 0 deletions core/src/types/capability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ pub struct Capability {
pub write_with_cache_control: bool,
/// If operator supports write with if none match.
pub write_with_if_none_match: bool,
/// If operator supports write with if not exist.
pub write_with_if_not_exist: bool,
/// If operator supports write with user defined metadata
pub write_with_user_metadata: bool,
/// write_multi_max_size is the max size that services support in write_multi.
Expand Down
19 changes: 19 additions & 0 deletions core/src/types/operator/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,25 @@ impl Operator {
/// # }
/// ```
///
/// ## `if_not_exist`
///
/// Set `if_not_exist` for this `write` request. This can be treated as a simplified version
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, if_not_exist is not the same feature as if_none_match. For example, S3 only supports if_not_exist but not if_none_match. We should eliminate use cases like if_none_match("*") to clarify this.

All existing tests and docs should replace by if_not_exist instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with the current usage of if_none_match. I can find it in op read/stat/write.

  1. Should we keep the tests since we still allow users to use this option?
  2. Do you mean that we should delete the if_none_match from the write-op-related docs?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Should we keep the tests since we still allow users to use this option?

The tests using if_none_match("*") should be removed since we can't guarantee that all services will support this.

  1. Do you mean that we should delete the if_none_match from the write-op-related docs?

We can retain this docs, but we need to remove the if_none_match("*") example. Instead, we should use an etag to clarify that we are accepting an etag.

/// of [`OpWrite::if_none_match`].
///
/// This feature is used to write a file only when it doesn't exist. If the file already
/// exists, an error with kind [`ErrorKind::ConditionNotMatch`] will be returned.
///
kemingy marked this conversation as resolved.
Show resolved Hide resolved
/// ```no_run
/// # use opendal::{ErrorKind, Result};
/// use opendal::Operator;
/// # async fn test(op: Operator, etag: &str) -> Result<()> {
/// let bs = b"hello, world!".to_vec();
/// let res = op.write_with("path/to/file", bs).if_not_exist(true).await;
/// assert!(res.is_err());
/// assert_eq!(res.unwrap_err().kind(), ErrorKind::ConditionNotMatch);
/// # Ok(())}
/// ```
///
/// # Examples
///
/// ```
Expand Down
5 changes: 5 additions & 0 deletions core/src/types/operator/operator_futures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,11 @@ impl<F: Future<Output = Result<()>>> FutureWrite<F> {
self.map(|(args, options, bs)| (args.with_if_none_match(s), options, bs))
}

/// Set the If-Not-Exist for this operation.
pub fn if_not_exist(self, b: bool) -> Self {
self.map(|(args, options, bs)| (args.with_if_not_exist(b), options, bs))
}

/// Set the user defined metadata of the op
///
/// ## Notes
Expand Down
22 changes: 22 additions & 0 deletions core/tests/behavior/async_write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ pub fn tests(op: &Operator, tests: &mut Vec<Trial>) {
test_write_with_content_type,
test_write_with_content_disposition,
test_write_with_if_none_match,
test_write_with_if_not_exist,
test_write_with_user_metadata,
test_writer_write,
test_writer_write_with_overwrite,
Expand Down Expand Up @@ -646,3 +647,24 @@ pub async fn test_write_with_if_none_match(op: Operator) -> Result<()> {

Ok(())
}

/// Write an file with if_not_exist will get a ConditionNotMatch error if file exists.
pub async fn test_write_with_if_not_exist(op: Operator) -> Result<()> {
if !op.info().full_capability().write_with_if_not_exist {
return Ok(());
}

let (path, content, _) = TEST_FIXTURE.new_file(op.clone());

op.write(&path, content.clone())
.await
.expect("write must succeed");
let res = op
.write_with(&path, content.clone())
.if_not_exist(true)
.await;
assert!(res.is_err());
assert_eq!(res.unwrap_err().kind(), ErrorKind::ConditionNotMatch);

Ok(())
}
Loading