From 4ecc4f6f89e903c721141b31cea9f15b95da494e Mon Sep 17 00:00:00 2001 From: Morris Tai Date: Tue, 16 May 2023 16:23:54 -0400 Subject: [PATCH 1/2] chore(core): remove unnecessary path prefix --- core/src/layers/oteltrace.rs | 2 +- core/src/raw/oio/read.rs | 4 ++-- core/src/services/fs/backend.rs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/src/layers/oteltrace.rs b/core/src/layers/oteltrace.rs index 4894ad9bb5a8..ee01e2abe853 100644 --- a/core/src/layers/oteltrace.rs +++ b/core/src/layers/oteltrace.rs @@ -308,7 +308,7 @@ impl oio::BlockingRead for OtelTraceWrapper { self.inner.read(buf) } - fn seek(&mut self, pos: std::io::SeekFrom) -> Result { + fn seek(&mut self, pos: io::SeekFrom) -> Result { self.inner.seek(pos) } diff --git a/core/src/raw/oio/read.rs b/core/src/raw/oio/read.rs index b71b62ef0587..29987581851a 100644 --- a/core/src/raw/oio/read.rs +++ b/core/src/raw/oio/read.rs @@ -346,7 +346,7 @@ impl BlockingRead for Box { } } -impl std::io::Read for dyn BlockingRead { +impl io::Read for dyn BlockingRead { #[inline] fn read(&mut self, buf: &mut [u8]) -> io::Result { let this: &mut dyn BlockingRead = &mut *self; @@ -355,7 +355,7 @@ impl std::io::Read for dyn BlockingRead { } } -impl std::io::Seek for dyn BlockingRead { +impl io::Seek for dyn BlockingRead { #[inline] fn seek(&mut self, pos: io::SeekFrom) -> io::Result { let this: &mut dyn BlockingRead = &mut *self; diff --git a/core/src/services/fs/backend.rs b/core/src/services/fs/backend.rs index 282656d9d25a..ffda8621b572 100644 --- a/core/src/services/fs/backend.rs +++ b/core/src/services/fs/backend.rs @@ -292,12 +292,12 @@ impl FsBackend { #[async_trait] impl Accessor for FsBackend { - type Reader = oio::into_reader::FdReader>; + type Reader = oio::into_reader::FdReader>; type BlockingReader = oio::into_blocking_reader::FdReader; - type Writer = FsWriter; + type Writer = FsWriter; type BlockingWriter = FsWriter; type Appender = (); - type Pager = Option>; + type Pager = Option>; type BlockingPager = Option>; fn info(&self) -> AccessorInfo { @@ -421,7 +421,7 @@ impl Accessor for FsBackend { (p, None) }; - let f = tokio::fs::OpenOptions::new() + let f = fs::OpenOptions::new() .create(true) .truncate(true) .write(true) @@ -503,7 +503,7 @@ impl Accessor for FsBackend { Ok(RpDelete::default()) } - Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(RpDelete::default()), + Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(RpDelete::default()), Err(err) => Err(parse_io_error(err)), } } @@ -688,7 +688,7 @@ impl Accessor for FsBackend { Ok(RpDelete::default()) } - Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(RpDelete::default()), + Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(RpDelete::default()), Err(err) => Err(parse_io_error(err)), } } From 255735a025a9cf7e159ae8aad85561a5faa1ff44 Mon Sep 17 00:00:00 2001 From: Morris Tai Date: Wed, 17 May 2023 00:13:25 -0400 Subject: [PATCH 2/2] chore(core): drop `use` and call full path instead --- core/src/services/fs/backend.rs | 36 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/core/src/services/fs/backend.rs b/core/src/services/fs/backend.rs index ffda8621b572..3e914f550fec 100644 --- a/core/src/services/fs/backend.rs +++ b/core/src/services/fs/backend.rs @@ -17,7 +17,6 @@ use std::cmp::min; use std::collections::HashMap; -use std::io; use std::io::SeekFrom; use std::path::Path; use std::path::PathBuf; @@ -26,7 +25,6 @@ use async_compat::Compat; use async_trait::async_trait; use chrono::DateTime; use log::debug; -use tokio::fs; use uuid::Uuid; use super::error::parse_io_error; @@ -157,7 +155,7 @@ impl Builder for FsBuilder { // If root dir is not exist, we must create it. if let Err(e) = std::fs::metadata(&root) { - if e.kind() == io::ErrorKind::NotFound { + if e.kind() == std::io::ErrorKind::NotFound { std::fs::create_dir_all(&root).map_err(|e| { Error::new(ErrorKind::Unexpected, "create root dir failed") .with_operation("Builder::build") @@ -172,7 +170,7 @@ impl Builder for FsBuilder { // If atomic write dir is not exist, we must create it. if let Some(d) = &atomic_write_dir { if let Err(e) = std::fs::metadata(d) { - if e.kind() == io::ErrorKind::NotFound { + if e.kind() == std::io::ErrorKind::NotFound { std::fs::create_dir_all(d).map_err(|e| { Error::new(ErrorKind::Unexpected, "create atomic write dir failed") .with_operation("Builder::build") @@ -284,7 +282,9 @@ impl FsBackend { })? .to_path_buf(); - fs::create_dir_all(&parent).await.map_err(parse_io_error)?; + tokio::fs::create_dir_all(&parent) + .await + .map_err(parse_io_error)?; Ok(p) } @@ -292,12 +292,12 @@ impl FsBackend { #[async_trait] impl Accessor for FsBackend { - type Reader = oio::into_reader::FdReader>; + type Reader = oio::into_reader::FdReader>; type BlockingReader = oio::into_blocking_reader::FdReader; - type Writer = FsWriter; + type Writer = FsWriter; type BlockingWriter = FsWriter; type Appender = (); - type Pager = Option>; + type Pager = Option>; type BlockingPager = Option>; fn info(&self) -> AccessorInfo { @@ -332,7 +332,9 @@ impl Accessor for FsBackend { async fn create_dir(&self, path: &str, _: OpCreateDir) -> Result { let p = self.root.join(path.trim_end_matches('/')); - fs::create_dir_all(&p).await.map_err(parse_io_error)?; + tokio::fs::create_dir_all(&p) + .await + .map_err(parse_io_error)?; Ok(RpCreateDir::default()) } @@ -351,7 +353,7 @@ impl Accessor for FsBackend { let p = self.root.join(path.trim_end_matches('/')); - let mut f = fs::OpenOptions::new() + let mut f = tokio::fs::OpenOptions::new() .read(true) .open(&p) .await @@ -421,7 +423,7 @@ impl Accessor for FsBackend { (p, None) }; - let f = fs::OpenOptions::new() + let f = tokio::fs::OpenOptions::new() .create(true) .truncate(true) .write(true) @@ -496,14 +498,14 @@ impl Accessor for FsBackend { match meta { Ok(meta) => { if meta.is_dir() { - fs::remove_dir(&p).await.map_err(parse_io_error)?; + tokio::fs::remove_dir(&p).await.map_err(parse_io_error)?; } else { - fs::remove_file(&p).await.map_err(parse_io_error)?; + tokio::fs::remove_file(&p).await.map_err(parse_io_error)?; } Ok(RpDelete::default()) } - Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(RpDelete::default()), + Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(RpDelete::default()), Err(err) => Err(parse_io_error(err)), } } @@ -514,7 +516,7 @@ impl Accessor for FsBackend { let f = match tokio::fs::read_dir(&p).await { Ok(rd) => rd, Err(e) => { - return if e.kind() == io::ErrorKind::NotFound { + return if e.kind() == std::io::ErrorKind::NotFound { Ok((RpList::default(), None)) } else { Err(parse_io_error(e)) @@ -688,7 +690,7 @@ impl Accessor for FsBackend { Ok(RpDelete::default()) } - Err(err) if err.kind() == io::ErrorKind::NotFound => Ok(RpDelete::default()), + Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(RpDelete::default()), Err(err) => Err(parse_io_error(err)), } } @@ -699,7 +701,7 @@ impl Accessor for FsBackend { let f = match std::fs::read_dir(p) { Ok(rd) => rd, Err(e) => { - return if e.kind() == io::ErrorKind::NotFound { + return if e.kind() == std::io::ErrorKind::NotFound { Ok((RpList::default(), None)) } else { Err(parse_io_error(e))