Antalya 26.5: 26.3 Antalya port - fixes for s3Cluster distributed calls#1940
Open
zvonand wants to merge 2 commits into
Open
Antalya 26.5: 26.3 Antalya port - fixes for s3Cluster distributed calls#1940zvonand wants to merge 2 commits into
zvonand wants to merge 2 commits into
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1646 from Altinity/frontport/antalya-26.3/fix_remote_calls 26.3 Antalya port - fixes for s3Cluster distributed calls # Conflicts: # src/Planner/Planner.cpp # src/Processors/QueryPlan/ObjectFilterStep.cpp # src/Processors/QueryPlan/ObjectFilterStep.h # src/Processors/QueryPlan/ReadFromRemote.cpp # src/QueryPipeline/RemoteQueryExecutor.h # src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp # tests/integration/test_database_iceberg/test.py # tests/integration/test_s3_cluster/test.py
Forward-port onto antalya-26.5, which already carries more-evolved
versions of the touched code:
- ObjectFilterStep.{cpp,h}: kept ours (detailed distributed-call
comment, `const SharedHeader &` ctor, `hasCorrelatedExpressions`).
- ReadFromRemote.cpp / RemoteQueryExecutor.h: kept both ours'
`setDistributedFanout` and the source PR's `setRemoteFunction` /
`setShardCount`.
- Planner.cpp: kept both the `ReadFromQueryResultCacheStep.h` and the
source PR's `ObjectFilterStep.h` includes.
- StorageObjectStorageCluster.cpp: kept ours' snapshot-based virtuals
expression (the `virtual_columns` member the PR replaced is already
gone on antalya-26.5).
- Integration tests: added the source PR's new tests (test_remote_hedged,
test_remote_no_hedged, test_joins in test_s3_cluster; _test_cluster_joins
in test_database_iceberg), keeping ours' evolved test_hive_partitioning.
- SettingsChangesHistory.cpp: uncommented `object_storage_cluster_join_mode`
in place (it already existed as a commented row) and dropped the
cherry-pick's duplicate version block, fixing the broken braces.
Co-Authored-By: Claude Opus 4.8 (1M context) <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):
Frontports for Antalya 26.3
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #1646.