This is an automated email from the ASF dual-hosted git repository. xuanwo pushed a commit to branch fix-ci in repository https://gitbox.apache.org/repos/asf/opendal.git
commit 30c874c92d1790821c20158be9005f8da46e1961 Author: Xuanwo <[email protected]> AuthorDate: Fri Oct 17 23:20:54 2025 +0800 Revert "feat(services/gdrive): Implement write returns metadata (#6683)" This reverts commit 48d9f5f9201004803847bd1dfabfdc3f46332f9c. --- core/src/services/gdrive/backend.rs | 27 +++++++++- core/src/services/gdrive/core.rs | 99 +++++++------------------------------ core/src/services/gdrive/writer.rs | 11 ++--- 3 files changed, 48 insertions(+), 89 deletions(-) diff --git a/core/src/services/gdrive/backend.rs b/core/src/services/gdrive/backend.rs index 12628820b..1efe3f969 100644 --- a/core/src/services/gdrive/backend.rs +++ b/core/src/services/gdrive/backend.rs @@ -53,7 +53,32 @@ impl Access for GdriveBackend { } async fn stat(&self, path: &str, _args: OpStat) -> Result<RpStat> { - let meta = self.core.gdrive_get_metadata(path).await?; + let resp = self.core.gdrive_stat(path).await?; + + if resp.status() != StatusCode::OK { + return Err(parse_error(resp)); + } + + let bs = resp.into_body(); + let gdrive_file: GdriveFile = + serde_json::from_reader(bs.reader()).map_err(new_json_deserialize_error)?; + + let file_type = if gdrive_file.mime_type == "application/vnd.google-apps.folder" { + EntryMode::DIR + } else { + EntryMode::FILE + }; + let mut meta = Metadata::new(file_type).with_content_type(gdrive_file.mime_type); + if let Some(v) = gdrive_file.size { + meta = meta.with_content_length(v.parse::<u64>().map_err(|e| { + Error::new(ErrorKind::Unexpected, "parse content length").set_source(e) + })?); + } + if let Some(v) = gdrive_file.modified_time { + meta = meta.with_last_modified(v.parse::<Timestamp>().map_err(|e| { + Error::new(ErrorKind::Unexpected, "parse last modified time").set_source(e) + })?); + } Ok(RpStat::new(meta)) } diff --git a/core/src/services/gdrive/core.rs b/core/src/services/gdrive/core.rs index 90a162d90..94b7e340f 100644 --- a/core/src/services/gdrive/core.rs +++ b/core/src/services/gdrive/core.rs @@ -34,14 +34,6 @@ use super::error::parse_error; use crate::raw::*; use crate::*; -// We append this as part of URL to request Google Drive file fields. -// Must be kept in sync with `GdriveFile` struct fields. -// For now, we only load the below fields for a smaller response. -// Read more: https://developers.google.com/workspace/drive/api/guides/fields-parameter -pub(crate) const DRIVE_FILE_FIELDS: &str = "id,name,mimeType,size,modifiedTime,md5Checksum,version"; - -const GDRIVE_FOLDER_MIME_TYPE: &str = "application/vnd.google-apps.folder"; - pub struct GdriveCore { pub info: Arc<AccessorInfo>, @@ -69,32 +61,19 @@ impl GdriveCore { format!("path not found: {path}"), ))?; + // The file metadata in the Google Drive API is very complex. + // For now, we only need the file id, name, mime type and modified time. let mut req = Request::get(format!( - "https://www.googleapis.com/drive/v3/files/{file_id}?fields={DRIVE_FILE_FIELDS}"; + "https://www.googleapis.com/drive/v3/files/{file_id}?fields=id,name,mimeType,size,modifiedTime"; )) - .extension(Operation::Stat) - .body(Buffer::new()) - .map_err(new_request_build_error)?; + .extension(Operation::Stat) + .body(Buffer::new()) + .map_err(new_request_build_error)?; self.sign(&mut req).await?; self.info.http_client().send(req).await } - /// Get metadata for a file from Google Drive. - pub async fn gdrive_get_metadata(&self, path: &str) -> Result<Metadata> { - let resp = self.gdrive_stat(path).await?; - - if resp.status() != StatusCode::OK { - return Err(parse_error(resp)); - } - - let bs = resp.into_body(); - let gdrive_file: GdriveFile = - serde_json::from_reader(bs.reader()).map_err(new_json_deserialize_error)?; - - gdrive_file.to_metadata() - } - pub async fn gdrive_get(&self, path: &str, range: BytesRange) -> Result<Response<HttpBody>> { let path = build_abs_path(&self.root, path); let path_id = self.path_cache.get(&path).await?.ok_or(Error::new( @@ -202,9 +181,7 @@ impl GdriveCore { ) -> Result<Response<Buffer>> { let parent = self.path_cache.ensure_dir(get_parent(path)).await?; - let url = format!( - "https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields={DRIVE_FILE_FIELDS}"; - ); + let url = "https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart";; let file_name = get_basename(path); @@ -254,9 +231,8 @@ impl GdriveCore { size: u64, body: Buffer, ) -> Result<Response<Buffer>> { - let url = format!( - "https://www.googleapis.com/upload/drive/v3/files/{file_id}?uploadType=media&fields={DRIVE_FILE_FIELDS}"; - ); + let url = + format!("https://www.googleapis.com/upload/drive/v3/files/{file_id}?uploadType=media";); let mut req = Request::patch(url) .header(header::CONTENT_TYPE, "application/octet-stream") @@ -492,61 +468,22 @@ pub struct GdriveTokenResponse { expires_in: u64, } -/// File struct for Google Drive API -/// We select a few arbitrary fields. -/// When update fields, keep `DRIVE_FILE_FIELDS` in sync to fetch related data. -/// Read more [here](https://developers.google.com/drive/api/reference/rest/v3/files#File) +/// This is the file struct returned by the Google Drive API. +/// This is a complex struct, but we only add the fields we need. +/// refer to https://developers.google.com/drive/api/reference/rest/v3/files#File #[derive(Deserialize, Debug)] #[serde(rename_all = "camelCase")] pub struct GdriveFile { pub mime_type: String, pub id: String, pub name: String, - // Size may be null for folders or shortcuts pub size: Option<String>, - pub modified_time: String, - // Only applicable to files with binary content in Google Drive. - pub md5_checksum: Option<String>, - // A short-lived link to the file's version. - pub version: Option<String>, -} - -impl GdriveFile { - /// Converts Google Drive file metadata to OpenDAL Metadata. - /// - /// This method parses the Google Drive API response fields and maps them - /// to OpenDAL's standard metadata fields. - pub(crate) fn to_metadata(&self) -> Result<Metadata> { - let file_type = if self.mime_type == GDRIVE_FOLDER_MIME_TYPE { - EntryMode::DIR - } else { - EntryMode::FILE - }; - let mut metadata = Metadata::new(file_type); - metadata.set_content_type(&self.mime_type); - - if let Some(ref size) = self.size { - let content_length = size.parse::<u64>().map_err(|e| { - Error::new(ErrorKind::Unexpected, "parse content length").set_source(e) - })?; - metadata.set_content_length(content_length); - } - - let last_modified = self.modified_time.parse::<Timestamp>().map_err(|e| { - Error::new(ErrorKind::Unexpected, "parse last modified time").set_source(e) - })?; - metadata.set_last_modified(last_modified); - - if let Some(ref md5_checksum) = self.md5_checksum { - metadata.set_content_md5(md5_checksum); - } - - if let Some(ref version) = self.version { - metadata.set_version(version); - } - - Ok(metadata) - } + // The modified time is not returned unless the `fields` + // query parameter contains `modifiedTime`. + // As we only need the modified time when we do `stat` operation, + // if other operations(such as search) do not specify the `fields` query parameter, + // try to access this field, it will be `None`. + pub modified_time: Option<String>, } /// refer to https://developers.google.com/drive/api/reference/rest/v3/files/list diff --git a/core/src/services/gdrive/writer.rs b/core/src/services/gdrive/writer.rs index ce732ad68..89b8024aa 100644 --- a/core/src/services/gdrive/writer.rs +++ b/core/src/services/gdrive/writer.rs @@ -62,17 +62,14 @@ impl oio::OneShotWrite for GdriveWriter { let status = resp.status(); match status { StatusCode::OK | StatusCode::CREATED => { - let bs = resp.into_body(); - let file: GdriveFile = - serde_json::from_reader(bs.reader()).map_err(new_json_deserialize_error)?; - // If we don't have the file id before, let's update the cache to avoid re-fetching. if self.file_id.is_none() { + let bs = resp.into_body(); + let file: GdriveFile = + serde_json::from_reader(bs.reader()).map_err(new_json_deserialize_error)?; self.core.path_cache.insert(&self.path, &file.id).await; } - - let metadata = file.to_metadata()?; - Ok(metadata) + Ok(Metadata::default()) } _ => Err(parse_error(resp)), }
