Repository navigation
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1804 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-102115 Antalya 26.3: Query condition cache for iceberg tables # Conflicts: # src/Databases/DataLake/DatabaseDataLake.cpp # src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp # src/Processors/Formats/Impl/ParquetBlockInputFormat.h # src/Storages/ObjectStorage/IObjectIterator.h # src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
All of #1804's changes are already present on antalya-26.6 (ported earlier): FormatFilterInfo::condition_hash, ParquetV3BlockInputFormat:: getMatchedBuckets / ParquetFileBucketInfo::filterByMatchingRowGroups, the query-condition-cache read/write paths in StorageObjectStorageSource / IObjectIterator, table UUIDs in DatabaseDataLake. Therefore every conflict hunk resolves to "ours": * DatabaseDataLake.cpp: keep the base-branch shape (StorageID already carries table_uuid; `cluster_name` was replaced by `parallel_replicas_cluster_name`, and `context_copy` is still a StorageObjectStorage ctor argument on antalya-26.6). * IObjectIterator.h: keep `#include <IO/Progress.h>`; the PR's includes and the ObjectIteratorSplitByBuckets storage_id/format_filter_info members are already there. * StorageObjectStorageSource.cpp: keep the existing includes and the already-present query-condition-cache loop; the incoming duplicate and its `relative_path_with_metadata.getCommand()` retry block (not part of #1804's diff, context from another Antalya PR) are dropped. * ParquetBlockInputFormat.{cpp,h}: these files were deleted on antalya-26.6 by 011cbc8 ("move ParquetFileBucketInfo into ParquetV3BlockInputFormat, delete old files") / 80f3bb8 ("Remove old Parquet writer and reader implementations"); the modify/delete conflict re-added them. Removed again — #1804's filterByMatchingRowGroups already lives in ParquetV3BlockInputFormat.cpp on the base branch.
zvonand
added
releasy
zvonand
added
the
forwardport
54 tasks done
Collaborator
|
The PR is empty. This makes sense since ClickHouse#102115 was merged to 26.5.1. We need to close it |
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
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):
Query condition cache for iceberg tables (ClickHouse#102115 by @scanhex12).
Cherry-picked from ClickHouse#102115.
--- (#1804 by @zvonand).
Cherry-picked from #1804.
Documentation entry for user-facing changes