From 624cb6eb3b7dbf58d3550ae332c6b594ad8ba8dd Mon Sep 17 00:00:00 2001 From: Dylan Chen Date: Wed, 25 Dec 2024 15:32:14 +0800 Subject: [PATCH 1/2] Revert "chore: fix typo in FileIO Schemes (#653)" This reverts commit cda4a0c595af2606e2f4076e9ef81d79d4428f4b. --- crates/iceberg/src/io/file_io.rs | 2 +- crates/iceberg/src/io/storage.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iceberg/src/io/file_io.rs b/crates/iceberg/src/io/file_io.rs index 7eaa6aa6d5..19538177a8 100644 --- a/crates/iceberg/src/io/file_io.rs +++ b/crates/iceberg/src/io/file_io.rs @@ -40,7 +40,7 @@ use crate::{Error, ErrorKind, Result}; /// | Local file system | `storage-fs` | `file` | /// | Memory | `storage-memory` | `memory` | /// | S3 | `storage-s3` | `s3`, `s3a`| -/// | GCS | `storage-gcs` | `gcs` | +/// | GCS | `storage-gcs` | `gs` | #[derive(Clone, Debug)] pub struct FileIO { builder: FileIOBuilder, diff --git a/crates/iceberg/src/io/storage.rs b/crates/iceberg/src/io/storage.rs index cc726bb888..81c55846ac 100644 --- a/crates/iceberg/src/io/storage.rs +++ b/crates/iceberg/src/io/storage.rs @@ -171,7 +171,7 @@ impl Storage { "memory" => Ok(Scheme::Memory), "file" | "" => Ok(Scheme::Fs), "s3" | "s3a" => Ok(Scheme::S3), - "gcs" => Ok(Scheme::Gcs), + "gs" => Ok(Scheme::Gcs), s => Ok(s.parse::()?), } } From 766bcbb564ee4285f0064e643dc3f7f4f31f6230 Mon Sep 17 00:00:00 2001 From: Dylan Chen Date: Wed, 25 Dec 2024 16:45:18 +0800 Subject: [PATCH 2/2] support both gs and gcs --- crates/iceberg/src/io/file_io.rs | 2 +- crates/iceberg/src/io/storage.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/iceberg/src/io/file_io.rs b/crates/iceberg/src/io/file_io.rs index 19538177a8..330f210c6e 100644 --- a/crates/iceberg/src/io/file_io.rs +++ b/crates/iceberg/src/io/file_io.rs @@ -40,7 +40,7 @@ use crate::{Error, ErrorKind, Result}; /// | Local file system | `storage-fs` | `file` | /// | Memory | `storage-memory` | `memory` | /// | S3 | `storage-s3` | `s3`, `s3a`| -/// | GCS | `storage-gcs` | `gs` | +/// | GCS | `storage-gcs` | `gs`, `gcs`| #[derive(Clone, Debug)] pub struct FileIO { builder: FileIOBuilder, diff --git a/crates/iceberg/src/io/storage.rs b/crates/iceberg/src/io/storage.rs index 81c55846ac..605b317252 100644 --- a/crates/iceberg/src/io/storage.rs +++ b/crates/iceberg/src/io/storage.rs @@ -171,7 +171,7 @@ impl Storage { "memory" => Ok(Scheme::Memory), "file" | "" => Ok(Scheme::Fs), "s3" | "s3a" => Ok(Scheme::S3), - "gs" => Ok(Scheme::Gcs), + "gs" | "gcs" => Ok(Scheme::Gcs), s => Ok(s.parse::()?), } }