Antalya 26.4: support external paths in Iceberg tables#1893
Open
zvonand wants to merge 2 commits into
Open
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1859 from Altinity/feat/antalya-26.3/90740 Antalya 26.3: support external paths in Iceberg tables # Conflicts: # src/IO/S3/URI.cpp # src/IO/S3/URI.h # src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergIterator.h # src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h # src/Storages/ObjectStorage/DataLakes/Iceberg/Mutations.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h # src/Storages/ObjectStorage/StorageObjectStorageSource.cpp # src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp
Cherry-pick of #1859 ("Antalya 26.3: support external paths in Iceberg tables") into antalya-26.4. Key conflict resolutions: - `S3::URI`: combined antalya-26.4's `S3UriStyle uri_style` (4th param) with source PR's `enable_url_encoding` (now 4th) and `uri_style` moved to 5th; updated callers in `diskSettings.cpp` and `ObjectStorageFactory.cpp` - `Mutations.cpp`: `ExpireSnapshots` code was moved to `ExpireSnapshotsExecute.cpp` by antalya-26.4 commit `edbf63227a8`; dropped the conflicted block from "theirs" and adapted `ExpireSnapshotsExecute.cpp` to pass `SecondaryStorages` to `getManifestList` and `getManifestFileEntriesHandle` - `StorageObjectStorageStableTaskDistributor.cpp`: `getFileIdentifier`, `saveLastNodeActivity`, and `rescheduleTasksFromReplica` do not exist on antalya-26.4; dropped those blocks - `IcebergMetadata.cpp/.h`: added `secondary_storages` member and init; kept antalya-26.4's `PersistentTableComponents &&` constructor pattern - `StorageObjectStorageSource.cpp`: combined path_for_virtual_column (theirs) with `storage_id` field (ours); used `getResolvedStorageFromObjectInfo` and `configuration->compression_method` field (not method) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
zvonand
added
releasy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Support Iceberg tables that have data files outside the table location or on a different object storage. Cherry-picked from ClickHouse#90740 (by @zvonand) (#1859 by @zvonand).
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #1859.