Skip to content

Antalya 25.8 Backport of #93866 - Google cloud storage support for data lakes catalogs #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkmkme wants to merge 2 commits into
base: antalya-25.8
Choose a base branch
from
Open

Antalya 25.8 Backport of #93866 - Google cloud storage support for data lakes catalogs #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
155a932
Merge pull request #93866 from scanhex12/gs_storage_support
alesapin Jan 14, 2026
f920a81
Merge branch 'antalya-25.8' into backports/antalya-25.8/93866
CarlosFelipeOR Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Common/FailPoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ static struct InitFiu
REGULAR(sleep_in_logs_flush) \
ONCE(smt_commit_exception_before_op) \
ONCE(backup_add_empty_memory_table) \
REGULAR(refresh_task_stop_racing_for_running_refresh)
REGULAR(refresh_task_stop_racing_for_running_refresh) \
ONCE(database_iceberg_gcs)


namespace FailPoints
Expand Down
17 changes: 15 additions & 2 deletions src/Databases/DataLake/ICatalog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@

#include <filesystem>

#include <Common/FailPoint.h>

namespace DB::ErrorCodes
{
extern const int NOT_IMPLEMENTED;
extern const int LOGICAL_ERROR;
extern const int BAD_ARGUMENTS;
}

namespace DB::FailPoints
{
extern const char database_iceberg_gcs[];
}

namespace DataLake
Expand Down Expand Up @@ -49,9 +57,14 @@ StorageType parseStorageTypeFromString(const std::string & type)
}
if (capitalize_first_letter(storage_type_str) == "File")
storage_type_str = "Local";

if (capitalize_first_letter(storage_type_str) == "S3a")
else if (capitalize_first_letter(storage_type_str) == "S3a" || storage_type_str == "oss" || storage_type_str == "gs")
{
fiu_do_on(DB::FailPoints::database_iceberg_gcs,
Copy link
Collaborator Author

@mkmkme mkmkme Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This particular bit I don't really like. It's there only for the sake of the integration test. But I've left it intact to be more aligned with the upstream.

Copy link
Collaborator

@arthurpassos arthurpassos Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better & easier to keep it consistent 👍

{
throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Google cloud storage converts to S3");
});
storage_type_str = "S3";
}

auto storage_type = magic_enum::enum_cast<StorageType>(capitalize_first_letter(storage_type_str));

Expand Down
23 changes: 23 additions & 0 deletions tests/integration/test_database_iceberg/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,3 +798,26 @@ def test_cluster_joins(started_cluster):
)

assert res == "Jack\tBlack\nJack\tSilver\nJohn\tBlack\nJohn\tSilver\n"

def test_gcs(started_cluster):
node = started_cluster.instances["node1"]

node.query("SYSTEM ENABLE FAILPOINT database_iceberg_gcs")
node.query(
f"""
DROP DATABASE IF EXISTS {CATALOG_NAME};
SET allow_database_iceberg = 1;
"""
)

with pytest.raises(Exception) as err:
node.query(
f"""
CREATE DATABASE {CATALOG_NAME}
ENGINE = DataLakeCatalog('http://rest:8181/v1', 'gcs', 'dummy')
SETTINGS
catalog_type = 'rest',
warehouse = 'demo',
"""
)
assert "Google cloud storage converts to S3" in str(err.value)
Loading