From 2fffc3789c253e4ddc5b017f1072564227759de4 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Sat, 18 Nov 2023 21:32:54 +0800 Subject: [PATCH] fix comment --- object_store/src/lib.rs | 2 -- object_store/src/local.rs | 18 +++++++----------- object_store/src/memory.rs | 1 - 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/object_store/src/lib.rs b/object_store/src/lib.rs index 4244a98a9717..2d1d549f9e54 100644 --- a/object_store/src/lib.rs +++ b/object_store/src/lib.rs @@ -1064,8 +1064,6 @@ pub enum PutMode { /// Perform an atomic write operation if the current version of the object matches the /// provided [`UpdateVersion`], returning [`Error::Precondition`] otherwise Update(UpdateVersion), - /// Only for Mounted path, drop the file before renaming so that the file will upload. - OverwriteUnsafe, } /// Uniquely identifies a version of an object to update diff --git a/object_store/src/local.rs b/object_store/src/local.rs index b54552878b96..648f486e6916 100644 --- a/object_store/src/local.rs +++ b/object_store/src/local.rs @@ -341,10 +341,13 @@ impl ObjectStore for LocalFileSystem { let err = match file.write_all(&bytes) { Ok(_) => match opts.mode { - PutMode::Overwrite => match std::fs::rename(&staging_path, &path) { - Ok(_) => None, - Err(source) => Some(Error::UnableToRenameFile { source }), - }, + PutMode::Overwrite => { + std::mem::drop(file); + match std::fs::rename(&staging_path, &path) { + Ok(_) => None, + Err(source) => Some(Error::UnableToRenameFile { source }), + } + } PutMode::Create => match std::fs::hard_link(&staging_path, &path) { Ok(_) => { let _ = std::fs::remove_file(&staging_path); // Attempt to cleanup @@ -359,13 +362,6 @@ impl ObjectStore for LocalFileSystem { }, }, PutMode::Update(_) => unreachable!(), - PutMode::OverwriteUnsafe => { - std::mem::drop(file); - match std::fs::rename(&staging_path, &path) { - Ok(_) => None, - Err(source) => Some(Error::UnableToRenameFile { source }), - } - } }, Err(source) => Some(Error::UnableToCopyDataToFile { source }), }; diff --git a/object_store/src/memory.rs b/object_store/src/memory.rs index 4ce9ab6b8252..382300123846 100644 --- a/object_store/src/memory.rs +++ b/object_store/src/memory.rs @@ -177,7 +177,6 @@ impl ObjectStore for InMemory { PutMode::Overwrite => storage.overwrite(location, entry), PutMode::Create => storage.create(location, entry)?, PutMode::Update(v) => storage.update(location, v, entry)?, - PutMode::OverwriteUnsafe => storage.overwrite(location, entry), } storage.next_etag += 1;