Antalya 26.6: support external paths in Iceberg tables - #2151
Open
zvonand wants to merge 3 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/Compaction.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergDataObjectInfo.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/ManifestFileIterator.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/Mutations.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/PositionDeleteTransform.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h # src/Storages/ObjectStorage/StorageObjectStorageSource.cpp # src/Storages/ObjectStorage/StorageObjectStorageSource.h # src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp # src/Storages/ObjectStorage/Utils.h
Kept antalya-26.6 shapes and re-applied the PR's changes on top: - S3::URI: appended `enable_url_encoding` after the base-branch `S3UriStyle uri_style` parameter and updated the two new call sites in Storages/ObjectStorage/Utils.cpp accordingly. - Iceberg/Compaction.cpp: kept `static` linkage that antalya-26.6 gives getOldFiles()/clearOldFiles() while taking the PR's new signatures. - IcebergIterator: dropped the PR's context-only `table_schema_id` / `setFileMetaInfo(DataFileMetaInfo...)` lines which do not exist on antalya-26.6; kept only `secondary_storages` and the requires_external_storage computation. - IcebergMetadata: kept `std::move(persistent_components_)` ctor and the `getManifestFileEntriesHandle` prefetch call of antalya-26.6, adding `*secondary_storages`; kept `const persistent_components`. - collectRetainedFiles()/collectExpiredFiles() moved out of Iceberg/Mutations.cpp into Iceberg/ExpireSnapshotsExecute.cpp on antalya-26.6: applied the PR's SecondaryStorages plumbing there, and likewise for the parallel helper in Iceberg/SnapshotFilesTraversal.cpp and for IcebergMetadata::getFilesForManifest, since getManifestList()/getManifestFileEntriesHandle() now require the parameter. - StorageObjectStorageStableTaskDistributor: getFileIdentifier() does not exist on antalya-26.6 (the identifier is computed inline), so the PR's "prefer the Iceberg metadata path" change was applied at the two inline sites. - StorageObjectStorageSource: kept base-branch `.storage_id` virtual column field, ProfileEvents counter, `configuration->compression_method` spelling and the process-list time-limit check; took the PR's `path_for_virtual_column`, resolved-storage read buffer and `resolveIcebergObjectStorageIfNeeded()`. - SettingsChangesHistory: uncommented the existing `s3_propagate_credentials_to_other_storages` row in place and dropped the cherry-pick's duplicate row.
zvonand
added
releasy
zvonand
added
the
forwardport
# Conflicts: # src/Storages/ObjectStorage/DataLakes/Iceberg/Utils.h
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
2 participants
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.