Xuanwo commented on code in PR #2203:
URL:
https://github.com/apache/incubator-opendal/pull/2203#discussion_r1184720494
##########
core/src/services/gdrive/backend.rs:
##########
@@ -16,47 +16,41 @@
// under the License.
use async_trait::async_trait;
-use http::{header, Request, Response, StatusCode};
-use serde::Deserialize;
-use std::fmt::Debug;
+use http::StatusCode;
+
+use std::{collections::HashMap, fmt::Debug, sync::Arc};
+use tokio::sync::Mutex;
use crate::{
ops::{OpDelete, OpRead, OpWrite},
raw::{
- build_rooted_abs_path, new_request_build_error, parse_into_metadata,
Accessor,
- AccessorInfo, AsyncBody, HttpClient, IncomingAsyncBody, RpDelete,
RpRead, RpWrite,
+ parse_into_metadata, Accessor, AccessorInfo, HttpClient,
IncomingAsyncBody, RpDelete,
+ RpRead, RpWrite,
},
types::Result,
Capability, Error, ErrorKind,
};
-use super::{error::parse_error, writer::GdriveWriter};
+use super::{core::GdriveCore, error::parse_error, writer::GdriveWriter};
-#[derive(Clone)]
+#[derive(Clone, Debug)]
pub struct GdriveBackend {
- root: String,
- access_token: String,
- client: HttpClient,
+ core: Arc<GdriveCore>,
}
impl GdriveBackend {
pub(crate) fn new(root: String, access_token: String, http_client:
HttpClient) -> Self {
GdriveBackend {
- root,
- access_token,
- client: http_client,
+ core: Arc::new(GdriveCore {
+ root,
+ access_token,
+ client: http_client,
+ path_2_id: Arc::new(Mutex::new(HashMap::new())),
Review Comment:
How about using `path_cache`? By the way, we can use `Arc::default()` here
for short.
##########
core/src/services/gdrive/core.rs:
##########
@@ -0,0 +1,202 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::fmt::Formatter;
+use std::sync::Arc;
+
+use crate::raw::HttpClient;
+
+use http::{header, Request, Response};
+use serde::Deserialize;
+use tokio::sync::Mutex;
+
+use crate::{
+ raw::{build_rooted_abs_path, new_request_build_error, AsyncBody,
IncomingAsyncBody},
+ types::Result,
+};
+
+pub struct GdriveCore {
+ pub root: String,
+ pub access_token: String,
+ pub client: HttpClient,
+ pub path_2_id: Arc<Mutex<HashMap<String, String>>>,
+}
+
+impl Debug for GdriveCore {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ let mut de = f.debug_struct("GdriveCore");
+ de.field("root", &self.root);
+ de.finish()
+ }
+}
+
+impl GdriveCore {
+ async fn get_abs_root_id(&self) -> String {
+ let root = "root";
+
+ {
+ let cache_guard = self.path_2_id.lock().await;
+ if cache_guard.contains_key(root) {
+ return cache_guard.get(root).unwrap().to_string();
+ }
+ }
+
+ let mut req =
Request::get("https://www.googleapis.com/drive/v3/files/root";);
+ let auth_header_content = format!("Bearer {}", self.access_token);
Review Comment:
How about extract this to `self.sign()`?
##########
core/src/services/gdrive/core.rs:
##########
@@ -0,0 +1,202 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::fmt::Formatter;
+use std::sync::Arc;
+
+use crate::raw::HttpClient;
+
+use http::{header, Request, Response};
+use serde::Deserialize;
+use tokio::sync::Mutex;
+
+use crate::{
+ raw::{build_rooted_abs_path, new_request_build_error, AsyncBody,
IncomingAsyncBody},
+ types::Result,
+};
+
+pub struct GdriveCore {
+ pub root: String,
+ pub access_token: String,
+ pub client: HttpClient,
+ pub path_2_id: Arc<Mutex<HashMap<String, String>>>,
+}
+
+impl Debug for GdriveCore {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ let mut de = f.debug_struct("GdriveCore");
+ de.field("root", &self.root);
+ de.finish()
+ }
+}
+
+impl GdriveCore {
+ async fn get_abs_root_id(&self) -> String {
+ let root = "root";
+
+ {
+ let cache_guard = self.path_2_id.lock().await;
+ if cache_guard.contains_key(root) {
+ return cache_guard.get(root).unwrap().to_string();
+ }
+ }
+
+ let mut req =
Request::get("https://www.googleapis.com/drive/v3/files/root";);
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)
+ .unwrap();
+
+ let resp = self.client.send(req).await.unwrap();
+
+ let body_value: GdriveFile =
+
serde_json::from_slice(&resp.into_body().bytes().await.unwrap()).unwrap();
Review Comment:
Please don't unwrap here. It's possible that meeting error during reading
body, we should handle this can convert to `opendal::Error` instead. So does
for serde_json from_slice.
##########
core/src/services/gdrive/core.rs:
##########
@@ -0,0 +1,202 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::fmt::Formatter;
+use std::sync::Arc;
+
+use crate::raw::HttpClient;
+
+use http::{header, Request, Response};
+use serde::Deserialize;
+use tokio::sync::Mutex;
+
+use crate::{
+ raw::{build_rooted_abs_path, new_request_build_error, AsyncBody,
IncomingAsyncBody},
+ types::Result,
+};
+
+pub struct GdriveCore {
+ pub root: String,
+ pub access_token: String,
+ pub client: HttpClient,
+ pub path_2_id: Arc<Mutex<HashMap<String, String>>>,
+}
+
+impl Debug for GdriveCore {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ let mut de = f.debug_struct("GdriveCore");
+ de.field("root", &self.root);
+ de.finish()
+ }
+}
+
+impl GdriveCore {
+ async fn get_abs_root_id(&self) -> String {
+ let root = "root";
+
+ {
Review Comment:
We can use if-let here to avoid unneeded `unwrap`: `if let Some(x) =
self.path_cache.lock().get(root).await`
##########
core/src/services/gdrive/core.rs:
##########
@@ -0,0 +1,202 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::fmt::Formatter;
+use std::sync::Arc;
+
+use crate::raw::HttpClient;
+
+use http::{header, Request, Response};
+use serde::Deserialize;
+use tokio::sync::Mutex;
+
+use crate::{
+ raw::{build_rooted_abs_path, new_request_build_error, AsyncBody,
IncomingAsyncBody},
+ types::Result,
+};
+
+pub struct GdriveCore {
+ pub root: String,
+ pub access_token: String,
+ pub client: HttpClient,
+ pub path_2_id: Arc<Mutex<HashMap<String, String>>>,
+}
+
+impl Debug for GdriveCore {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ let mut de = f.debug_struct("GdriveCore");
+ de.field("root", &self.root);
+ de.finish()
+ }
+}
+
+impl GdriveCore {
+ async fn get_abs_root_id(&self) -> String {
+ let root = "root";
+
+ {
+ let cache_guard = self.path_2_id.lock().await;
+ if cache_guard.contains_key(root) {
+ return cache_guard.get(root).unwrap().to_string();
+ }
+ }
+
+ let mut req =
Request::get("https://www.googleapis.com/drive/v3/files/root";);
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)
+ .unwrap();
+
+ let resp = self.client.send(req).await.unwrap();
+
+ let body_value: GdriveFile =
+
serde_json::from_slice(&resp.into_body().bytes().await.unwrap()).unwrap();
+ let root_id = String::from(body_value.id.as_str());
+
+ let mut cache_guard = self.path_2_id.lock().await;
+ cache_guard.insert(root.to_owned(), root_id.clone());
+
+ root_id
+ }
+
+ async fn get_file_id_by_path(&self, file_path: &str) -> String {
+ let path = build_rooted_abs_path(&self.root, file_path);
+
+ {
+ let cache_guard = self.path_2_id.lock().await;
+ if cache_guard.contains_key(&path) {
+ return cache_guard.get(&path).unwrap().to_string();
+ }
+ }
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+
+ let mut parent_id = self.get_abs_root_id().await;
+ let file_path_items: Vec<&str> = path.split('/').filter(|&x|
!x.is_empty()).collect();
+
+ for (i, item) in file_path_items.iter().enumerate() {
+ let mut query = format!(
+ "name = '{}' and parents = '{}' and trashed = false",
+ item, parent_id
+ );
+ if i != file_path_items.len() - 1 {
+ query += "and mimeType = 'application/vnd.google-apps.folder'";
+ }
+ let query: String = query.chars().filter(|c|
!c.is_whitespace()).collect();
+
+ let mut req = Request::get(format!(
+ "https://www.googleapis.com/drive/v3/files?q={}";,
+ query
+ ));
+ req = req.header(header::AUTHORIZATION, &auth_header_content);
+ let req = req
+ .body(AsyncBody::default())
+ .map_err(new_request_build_error)
+ .unwrap();
+
+ let resp = self.client.send(req).await.unwrap();
+
+ let body_value: GdriveFileList =
+
serde_json::from_slice(&resp.into_body().bytes().await.unwrap()).unwrap();
+ parent_id = String::from(body_value.files[0].id.as_str());
+ }
+
+ let mut cache_guard = self.path_2_id.lock().await;
+ cache_guard.insert(path, parent_id.clone());
+
+ parent_id
+ }
+
+ pub async fn gdrive_get(&self, path: &str) ->
Result<Response<IncomingAsyncBody>> {
+ let url: String = format!(
+ "https://www.googleapis.com/drive/v3/files/{}?alt=media";,
+ self.get_file_id_by_path(path).await
+ );
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ let mut req = Request::get(&url);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)?;
+
+ self.client.send(req).await
+ }
+
+ pub async fn gdrive_update(
+ &self,
+ path: &str,
+ size: Option<usize>,
+ content_type: Option<&str>,
+ body: AsyncBody,
+ ) -> Result<Response<IncomingAsyncBody>> {
+ let url = format!(
+ "https://www.googleapis.com/upload/drive/v3/files/{}";,
+ self.get_file_id_by_path(path).await
+ );
+
+ let mut req = Request::patch(&url);
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+
+ if let Some(size) = size {
+ req = req.header(header::CONTENT_LENGTH, size)
+ }
+
+ if let Some(mime) = content_type {
+ req = req.header(header::CONTENT_TYPE, mime)
+ }
+
+ let req = req.body(body).map_err(new_request_build_error)?;
+
+ self.client.send(req).await
+ }
+
+ pub async fn gdrive_delete(&self, path: &str) ->
Result<Response<IncomingAsyncBody>> {
+ let url = format!(
+ "https://www.googleapis.com/drive/v3/files/{}";,
+ self.get_file_id_by_path(path).await
+ );
+
+ let mut req = Request::delete(&url);
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)?;
+
+ self.client.send(req).await
+ }
+}
+
+#[derive(Deserialize)]
+struct GdriveFile {
+ id: String,
+}
+
+#[derive(Deserialize)]
+struct GdriveFileList {
Review Comment:
ditto, I guess we should link to
https://developers.google.com/drive/api/reference/rest/v3/files/list?
##########
core/src/services/gdrive/core.rs:
##########
@@ -0,0 +1,202 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::fmt::Formatter;
+use std::sync::Arc;
+
+use crate::raw::HttpClient;
+
+use http::{header, Request, Response};
+use serde::Deserialize;
+use tokio::sync::Mutex;
+
+use crate::{
+ raw::{build_rooted_abs_path, new_request_build_error, AsyncBody,
IncomingAsyncBody},
+ types::Result,
+};
+
+pub struct GdriveCore {
+ pub root: String,
+ pub access_token: String,
+ pub client: HttpClient,
+ pub path_2_id: Arc<Mutex<HashMap<String, String>>>,
+}
+
+impl Debug for GdriveCore {
+ fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+ let mut de = f.debug_struct("GdriveCore");
+ de.field("root", &self.root);
+ de.finish()
+ }
+}
+
+impl GdriveCore {
+ async fn get_abs_root_id(&self) -> String {
+ let root = "root";
+
+ {
+ let cache_guard = self.path_2_id.lock().await;
+ if cache_guard.contains_key(root) {
+ return cache_guard.get(root).unwrap().to_string();
+ }
+ }
+
+ let mut req =
Request::get("https://www.googleapis.com/drive/v3/files/root";);
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)
+ .unwrap();
+
+ let resp = self.client.send(req).await.unwrap();
+
+ let body_value: GdriveFile =
+
serde_json::from_slice(&resp.into_body().bytes().await.unwrap()).unwrap();
+ let root_id = String::from(body_value.id.as_str());
+
+ let mut cache_guard = self.path_2_id.lock().await;
+ cache_guard.insert(root.to_owned(), root_id.clone());
+
+ root_id
+ }
+
+ async fn get_file_id_by_path(&self, file_path: &str) -> String {
+ let path = build_rooted_abs_path(&self.root, file_path);
+
+ {
+ let cache_guard = self.path_2_id.lock().await;
+ if cache_guard.contains_key(&path) {
+ return cache_guard.get(&path).unwrap().to_string();
+ }
+ }
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+
+ let mut parent_id = self.get_abs_root_id().await;
+ let file_path_items: Vec<&str> = path.split('/').filter(|&x|
!x.is_empty()).collect();
+
+ for (i, item) in file_path_items.iter().enumerate() {
+ let mut query = format!(
+ "name = '{}' and parents = '{}' and trashed = false",
+ item, parent_id
+ );
+ if i != file_path_items.len() - 1 {
+ query += "and mimeType = 'application/vnd.google-apps.folder'";
+ }
+ let query: String = query.chars().filter(|c|
!c.is_whitespace()).collect();
+
+ let mut req = Request::get(format!(
+ "https://www.googleapis.com/drive/v3/files?q={}";,
+ query
+ ));
+ req = req.header(header::AUTHORIZATION, &auth_header_content);
+ let req = req
+ .body(AsyncBody::default())
+ .map_err(new_request_build_error)
+ .unwrap();
+
+ let resp = self.client.send(req).await.unwrap();
+
+ let body_value: GdriveFileList =
+
serde_json::from_slice(&resp.into_body().bytes().await.unwrap()).unwrap();
+ parent_id = String::from(body_value.files[0].id.as_str());
+ }
+
+ let mut cache_guard = self.path_2_id.lock().await;
+ cache_guard.insert(path, parent_id.clone());
+
+ parent_id
+ }
+
+ pub async fn gdrive_get(&self, path: &str) ->
Result<Response<IncomingAsyncBody>> {
+ let url: String = format!(
+ "https://www.googleapis.com/drive/v3/files/{}?alt=media";,
+ self.get_file_id_by_path(path).await
+ );
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ let mut req = Request::get(&url);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)?;
+
+ self.client.send(req).await
+ }
+
+ pub async fn gdrive_update(
+ &self,
+ path: &str,
+ size: Option<usize>,
+ content_type: Option<&str>,
+ body: AsyncBody,
+ ) -> Result<Response<IncomingAsyncBody>> {
+ let url = format!(
+ "https://www.googleapis.com/upload/drive/v3/files/{}";,
+ self.get_file_id_by_path(path).await
+ );
+
+ let mut req = Request::patch(&url);
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+
+ if let Some(size) = size {
+ req = req.header(header::CONTENT_LENGTH, size)
+ }
+
+ if let Some(mime) = content_type {
+ req = req.header(header::CONTENT_TYPE, mime)
+ }
+
+ let req = req.body(body).map_err(new_request_build_error)?;
+
+ self.client.send(req).await
+ }
+
+ pub async fn gdrive_delete(&self, path: &str) ->
Result<Response<IncomingAsyncBody>> {
+ let url = format!(
+ "https://www.googleapis.com/drive/v3/files/{}";,
+ self.get_file_id_by_path(path).await
+ );
+
+ let mut req = Request::delete(&url);
+
+ let auth_header_content = format!("Bearer {}", self.access_token);
+ req = req.header(header::AUTHORIZATION, auth_header_content);
+
+ let req = req
+ .body(AsyncBody::Empty)
+ .map_err(new_request_build_error)?;
+
+ self.client.send(req).await
+ }
+}
+
+#[derive(Deserialize)]
+struct GdriveFile {
Review Comment:
Please add a link for this struct's full schema, for example:
https://developers.google.com/drive/api/reference/rest/v3/files#File
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
