remove unneeded async and result on parse_error

improve encapsulation
apache · Sep 20, 2024 · 0d55a2d · 0d55a2d
1 parent 362c846
commit 0d55a2d
Show file tree

Hide file tree

Showing 137 changed files with 393 additions and 423 deletions.
diff --git a/core/src/services/aliyun_drive/backend.rs b/core/src/services/aliyun_drive/backend.rs
@@ -371,7 +371,7 @@ impl Access for AliyunDriveBackend {
  _ => {
  let (part, mut body) = resp.into_parts();
  let buf = body.to_buffer().await?;
- Err(parse_error(Response::from_parts(part, buf)).await?)
+ Err(parse_error(Response::from_parts(part, buf)))
  }
  }
  }

diff --git a/core/src/services/aliyun_drive/core.rs b/core/src/services/aliyun_drive/core.rs
@@ -101,7 +101,7 @@ impl AliyunDriveCore {
  }
  let res = self.client.send(req).await?;
  if !res.status().is_success() {
- return Err(parse_error(res).await?);
+ return Err(parse_error(res));
  }
  Ok(res.into_body())
  }

diff --git a/core/src/services/aliyun_drive/error.rs b/core/src/services/aliyun_drive/error.rs
@@ -22,12 +22,12 @@ use serde::Deserialize;
 use crate::*;
 
 #[derive(Default, Debug, Deserialize)]
-pub struct AliyunDriveError {
+struct AliyunDriveError {
  code: String,
  message: String,
 }
 
-pub async fn parse_error(res: Response<Buffer>) -> Result<Error> {
+pub(super) fn parse_error(res: Response<Buffer>) -> Error {
  let (parts, mut body) = res.into_parts();
  let bs = body.copy_to_bytes(body.remaining());
  let (code, message) = serde_json::from_reader::<_, AliyunDriveError>(bs.clone().reader())
@@ -52,5 +52,5 @@ pub async fn parse_error(res: Response<Buffer>) -> Result<Error> {
  if retryable {
  err = err.set_temporary();
  }
- Ok(err)
+ err
 }
diff --git a/core/src/services/alluxio/backend.rs b/core/src/services/alluxio/backend.rs
@@ -193,7 +193,7 @@ impl Access for AlluxioBackend {
  if !resp.status().is_success() {
  let (part, mut body) = resp.into_parts();
  let buf = body.to_buffer().await?;
- return Err(parse_error(Response::from_parts(part, buf)).await?);
+ return Err(parse_error(Response::from_parts(part, buf)));
  }
  Ok((RpRead::new(), resp.into_body()))
  }

diff --git a/core/src/services/alluxio/core.rs b/core/src/services/alluxio/core.rs
@@ -125,7 +125,7 @@ impl AlluxioCore {
  let status = resp.status();
  match status {
  StatusCode::OK => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -160,7 +160,7 @@ impl AlluxioCore {
  serde_json::from_reader(body.reader()).map_err(new_json_serialize_error)?;
  Ok(steam_id)
  }
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -184,7 +184,7 @@ impl AlluxioCore {
  serde_json::from_reader(body.reader()).map_err(new_json_serialize_error)?;
  Ok(steam_id)
  }
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -204,7 +204,7 @@ impl AlluxioCore {
  match status {
  StatusCode::OK => Ok(()),
  _ => {
- let err = parse_error(resp).await?;
+ let err = parse_error(resp);
  if err.kind() == ErrorKind::NotFound {
  return Ok(());
  }
@@ -232,7 +232,7 @@ impl AlluxioCore {
 
  match status {
  StatusCode::OK => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -258,7 +258,7 @@ impl AlluxioCore {
  serde_json::from_reader(body.reader()).map_err(new_json_serialize_error)?;
  Ok(file_info)
  }
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -284,7 +284,7 @@ impl AlluxioCore {
  serde_json::from_reader(body.reader()).map_err(new_json_deserialize_error)?;
  Ok(file_infos)
  }
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -320,7 +320,7 @@ impl AlluxioCore {
  serde_json::from_reader(body.reader()).map_err(new_json_serialize_error)?;
  Ok(size)
  }
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -337,7 +337,7 @@ impl AlluxioCore {
 
  match status {
  StatusCode::OK => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 }
diff --git a/core/src/services/alluxio/error.rs b/core/src/services/alluxio/error.rs
@@ -31,7 +31,7 @@ struct AlluxioError {
  message: String,
 }
 
-pub async fn parse_error(resp: Response<Buffer>) -> Result<Error> {
+pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
  let (parts, mut body) = resp.into_parts();
  let bs = body.copy_to_bytes(body.remaining());
 
@@ -56,7 +56,7 @@ pub async fn parse_error(resp: Response<Buffer>) -> Result<Error> {
 
  err = with_error_response_context(err, parts);
 
- Ok(err)
+ err
 }
 
 #[cfg(test)]
@@ -66,8 +66,8 @@ mod tests {
  use super::*;
 
  /// Error response example is from https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html
- #[tokio::test]
- async fn test_parse_error() {
+ #[test]
+ fn test_parse_error() {
  let err_res = vec![
  (
  r#"{"statusCode":"ALREADY_EXISTS","message":"The resource you requested already exist"}"#,
@@ -91,10 +91,9 @@ mod tests {
  .body(body)
  .unwrap();
 
- let err = parse_error(resp).await;
+ let err = parse_error(resp);
 
- assert!(err.is_ok());
- assert_eq!(err.unwrap().kind(), res.1);
+ assert_eq!(err.kind(), res.1);
  }
  }
 }
diff --git a/core/src/services/azblob/backend.rs b/core/src/services/azblob/backend.rs
@@ -546,7 +546,7 @@ impl Access for AzblobBackend {
 
  match status {
  StatusCode::OK => parse_into_metadata(path, resp.headers()).map(RpStat::new),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -559,7 +559,7 @@ impl Access for AzblobBackend {
  _ => {
  let (part, mut body) = resp.into_parts();
  let buf = body.to_buffer().await?;
- Err(parse_error(Response::from_parts(part, buf)).await?)
+ Err(parse_error(Response::from_parts(part, buf)))
  }
  }
  }
@@ -586,7 +586,7 @@ impl Access for AzblobBackend {
 
  match status {
  StatusCode::ACCEPTED | StatusCode::NOT_FOUND => Ok(RpDelete::default()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -608,7 +608,7 @@ impl Access for AzblobBackend {
 
  match status {
  StatusCode::ACCEPTED => Ok(RpCopy::default()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -651,7 +651,7 @@ impl Access for AzblobBackend {
 
  // check response status
  if resp.status() != StatusCode::ACCEPTED {
- return Err(parse_error(resp).await?);
+ return Err(parse_error(resp));
  }
 
  // get boundary from response header
@@ -701,7 +701,7 @@ impl Access for AzblobBackend {
  if resp.status() == StatusCode::ACCEPTED || resp.status() == StatusCode::NOT_FOUND {
  results.push((path, Ok(RpDelete::default().into())));
  } else {
- results.push((path, Err(parse_error(resp).await?)));
+ results.push((path, Err(parse_error(resp))));
  }
  }
  Ok(RpBatch::new(results))

diff --git a/core/src/services/azblob/error.rs b/core/src/services/azblob/error.rs
@@ -59,7 +59,7 @@ impl Debug for AzblobError {
 }
 
 /// Parse error response into Error.
-pub async fn parse_error(resp: Response<Buffer>) -> Result<Error> {
+pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
  let (parts, mut body) = resp.into_parts();
  let bs = body.copy_to_bytes(body.remaining());
 
@@ -104,7 +104,7 @@ pub async fn parse_error(resp: Response<Buffer>) -> Result<Error> {
  err = err.set_temporary();
  }
 
- Ok(err)
+ err
 }
 
 #[cfg(test)]

diff --git a/core/src/services/azblob/lister.rs b/core/src/services/azblob/lister.rs
@@ -55,7 +55,7 @@ impl oio::PageList for AzblobLister {
  .await?;
 
  if resp.status() != http::StatusCode::OK {
- return Err(parse_error(resp).await?);
+ return Err(parse_error(resp));
  }
 
  let bs = resp.into_body();

diff --git a/core/src/services/azblob/writer.rs b/core/src/services/azblob/writer.rs
@@ -79,12 +79,12 @@ impl oio::AppendWrite for AzblobWriter {
  // do nothing
  }
  _ => {
- return Err(parse_error(resp).await?);
+ return Err(parse_error(resp));
  }
  }
  Ok(0)
  }
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -100,7 +100,7 @@ impl oio::AppendWrite for AzblobWriter {
  let status = resp.status();
  match status {
  StatusCode::CREATED => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 }
@@ -118,7 +118,7 @@ impl oio::BlockWrite for AzblobWriter {
 
  match status {
  StatusCode::CREATED | StatusCode::OK => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -131,7 +131,7 @@ impl oio::BlockWrite for AzblobWriter {
  let status = resp.status();
  match status {
  StatusCode::CREATED | StatusCode::OK => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -144,7 +144,7 @@ impl oio::BlockWrite for AzblobWriter {
  let status = resp.status();
  match status {
  StatusCode::CREATED | StatusCode::OK => Ok(()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 

diff --git a/core/src/services/azdls/backend.rs b/core/src/services/azdls/backend.rs
@@ -261,7 +261,7 @@ impl Access for AzdlsBackend {
 
  match status {
  StatusCode::CREATED | StatusCode::OK => Ok(RpCreateDir::default()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -274,7 +274,7 @@ impl Access for AzdlsBackend {
  let resp = self.core.azdls_get_properties(path).await?;
 
  if resp.status() != StatusCode::OK {
- return Err(parse_error(resp).await?);
+ return Err(parse_error(resp));
  }
 
  let mut meta = parse_into_metadata(path, resp.headers())?;
@@ -320,7 +320,7 @@ impl Access for AzdlsBackend {
  _ => {
  let (part, mut body) = resp.into_parts();
  let buf = body.to_buffer().await?;
- Err(parse_error(Response::from_parts(part, buf)).await?)
+ Err(parse_error(Response::from_parts(part, buf)))
  }
  }
  }
@@ -342,7 +342,7 @@ impl Access for AzdlsBackend {
 
  match status {
  StatusCode::OK | StatusCode::NOT_FOUND => Ok(RpDelete::default()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 
@@ -357,7 +357,7 @@ impl Access for AzdlsBackend {
  let status = resp.status();
  match status {
  StatusCode::CREATED | StatusCode::CONFLICT => {}
- _ => return Err(parse_error(resp).await?),
+ _ => return Err(parse_error(resp)),
  }
  }
 
@@ -367,7 +367,7 @@ impl Access for AzdlsBackend {
 
  match status {
  StatusCode::CREATED => Ok(RpRename::default()),
- _ => Err(parse_error(resp).await?),
+ _ => Err(parse_error(resp)),
  }
  }
 }

diff --git a/core/src/services/azdls/error.rs b/core/src/services/azdls/error.rs
@@ -59,7 +59,7 @@ impl Debug for AzdlsError {
 }
 
 /// Parse error response into Error.
-pub async fn parse_error(resp: Response<Buffer>) -> Result<Error> {
+pub(super) fn parse_error(resp: Response<Buffer>) -> Error {
  let (parts, mut body) = resp.into_parts();
  let bs = body.copy_to_bytes(body.remaining());
 
@@ -101,5 +101,5 @@ pub async fn parse_error(resp: Response<Buffer>) -> Result<Error> {
  err = err.set_temporary();
  }
 
- Ok(err)
+ err
 }
diff --git a/core/src/services/azdls/lister.rs b/core/src/services/azdls/lister.rs
@@ -53,7 +53,7 @@ impl oio::PageList for AzdlsLister {
  }
 
  if resp.status() != http::StatusCode::OK {
- return Err(parse_error(resp).await?);
+ return Err(parse_error(resp));
  }
 
  // Return self at the first page.