Skip to content

Antalya 25.3: Support different warehouses behind Iceberg REST catalog #860

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

Merged
merged 5 commits into from
Jul 3, 2025
Merged

Antalya 25.3: Support different warehouses behind Iceberg REST catalog #860

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6eceb35
Allow data and metadata by different paths
ianton-ru Jun 12, 2025
9a7b6b5
Cut bucket from path
ianton-ru Jun 16, 2025
daad95d
Iceberg catalog with S3 tables
ianton-ru Jun 19, 2025
85ea912
Merge branch 'antalya-25.3' into feature/different_folder_for_data_lake
ianton-ru Jun 19, 2025
95f4f0f
Dirty workaround to resolve correct endpoint in HEAD requests
ianton-ru Jun 20, 2025
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
9 changes: 8 additions & 1 deletion src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,14 @@ std::string getProperFilePathFromMetadataInfo(std::string_view data_path, std::s
}
else
{
throw ::DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Expected to find '{}' in data path: '{}'", common_path, data_path);
/// Data files can have different path
pos = data_path.find("://");
Copy link
Collaborator

Choose a reason for hiding this comment

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

The method docs say:

// For example, if the full blob path is s3://bucket/table_name/data/00000-1-1234567890.avro, the function will return table_name/data/00000-1-1234567890.avro

Which means the bucket shall not be included in the return value as far as I understand.

As far as I understand your exception handling,you skip the initial "://" and then copy everything after the next "/". But what if you are using Path-style URIs (i.e, https://s3.region-code.amazonaws.com/bucket-name/key-name)?

Copy link
Author

Choose a reason for hiding this comment

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

Try to remove bucket

Copy link
Collaborator

Choose a reason for hiding this comment

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

Same S3/URI comment here

if (pos == std::string::npos)
throw ::DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unexpected data path: '{}'", data_path);
pos = data_path.find("/", pos + 3);
if (pos == std::string::npos)
throw ::DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Unexpected data path: '{}'", data_path);
return std::string(data_path.substr(pos));
}
}

Expand Down
Loading