Support list_with_offset for GCS (#4993)

apache · Oct 30, 2023 · e4bb1e9 · e4bb1e9
1 parent e3cce56
commit e4bb1e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/object_store/src/gcp/client.rs b/object_store/src/gcp/client.rs
@@ -472,8 +472,6 @@ impl ListClient for GoogleCloudStorageClient {
         page_token: Option<&str>,
         offset: Option<&str>,
     ) -> Result<(ListResult, Option<String>)> {
-        assert!(offset.is_none()); // Not yet supported
-
         let credential = self.get_credential().await?;
         let url = format!("{}/{}", self.config.base_url, self.bucket_name_encoded);
 
@@ -495,6 +493,10 @@ impl ListClient for GoogleCloudStorageClient {
             query.push(("max-keys", max_results))
         }
 
+        if let Some(offset) = offset {
+            query.push(("start-after", offset))
+        }
+
         let response = self
             .client
             .request(Method::GET, url)

diff --git a/object_store/src/gcp/mod.rs b/object_store/src/gcp/mod.rs
@@ -147,6 +147,14 @@ impl ObjectStore for GoogleCloudStorage {
         self.client.list(prefix)
     }
 
+    fn list_with_offset(
+        &self,
+        prefix: Option<&Path>,
+        offset: &Path,
+    ) -> BoxStream<'_, Result<ObjectMeta>> {
+        self.client.list_with_offset(prefix, offset)
+    }
+
     async fn list_with_delimiter(&self, prefix: Option<&Path>) -> Result<ListResult> {
         self.client.list_with_delimiter(prefix).await
     }