Antalya 26.4: Change the interface for Iceberg inserts with the catalog#1891
Open
zvonand wants to merge 2 commits into
Open
Antalya 26.4: Change the interface for Iceberg inserts with the catalog#1891zvonand wants to merge 2 commits into
zvonand wants to merge 2 commits into
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1800 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-100334 Antalya 26.3: Change the interface for Iceberg inserts with the catalog # Conflicts: # src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h # src/TableFunctions/TableFunctionObjectStorage.cpp # tests/integration/test_database_iceberg/test.py
Kept `antalya-26.4` (ours) side for all three conflicted files: - `DataLakeConfiguration.h`: "theirs" side added `/* is_cluster_supported */ false` to `StorageLocalPaimonConfiguration` and a large `StorageIcebergConfiguration` class — neither is in source PR #1800's diff; they came from other changes bundled in the merge commit. - `TableFunctionObjectStorage.cpp`: "theirs" added extra `StorageObjectStorageCluster` constructor args (`comment`, `format_settings`, `mode`, `catalog`, etc.) that don't exist in `antalya-26.4`'s `StorageObjectStorageCluster` signature. - `test.py`: "theirs" used `{engine}` f-string variable which does not exist as a parameter in `antalya-26.4`'s `create_clickhouse_iceberg_database`; `antalya-26.4` uses `DataLakeCatalog` directly. The source PR's actual changes (new `getCatalog` signature taking `StorageID`, new include directives, `create_clickhouse_iceberg_table` refactor, settings handling changes) all applied cleanly without conflicts.
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):
Change the interface for Iceberg inserts with the catalog.
Deprecate settings: storage_catalog_type, storage_aws_access_key_id, etc (ClickHouse#100334 by @scanhex12).
Cherry-picked from ClickHouse#100334.
--- (#1800 by @zvonand).
Cherry-picked from #1800.
Documentation entry for user-facing changes