Antalya 26.5: Antalya 26.3 port - improvements for cluster requests#1950
Open
zvonand wants to merge 2 commits into
Open
Antalya 26.5: Antalya 26.3 port - improvements for cluster requests#1950zvonand wants to merge 2 commits into
zvonand wants to merge 2 commits into
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1687 from Altinity/feature/antalya-26.3/pr-1414-1 Antalya 26.3 port - improvements for cluster requests # Conflicts: # src/Common/ProfileEvents.cpp # src/Core/Settings.cpp # src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFileIterator.cpp # src/Storages/ObjectStorage/StorageObjectStorageSource.cpp # src/Storages/StorageFileCluster.cpp # src/Storages/StorageURLCluster.cpp # tests/integration/test_s3_cluster/test.py # tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql
ProfileEvents.cpp: kept ours (JoinBuildPostProcessing, AI* entries) and added bucket-1 ObjectStorageCluster entries from source PR after RuntimeFilterRowsSkipped. Settings.cpp: kept ours (query_plan_use_logical_join_step, query_plan_use_new_logical_join_step) and added bucket-1 allow_retries_in_cluster_requests from source PR. ManifestFileIterator.cpp: took theirs (removed deserializeFieldFromBinaryRepr namespace block) since the function was moved to IcebergFieldParseHelpers.cpp by the source PR. StorageObjectStorageSource.cpp: combined QueryConditionCachePtr init (ours) with not_a_path init (theirs); kept while(true) loop structure (ours) to preserve continue semantics of query_condition_cache skip logic; added ProfileEvents::ObjectStorageClusterProcessedTasks increment after loop (theirs). StorageFileCluster.cpp: took theirs (FileTaskIterator class refactoring); adapted getVirtualsList() to metadata->virtuals.getSampleBlock(...) since getVirtualsList() does not exist on antalya-26.5, and kept StorageMetadataPtr metadata as named parameter to supply virtual columns. StorageURLCluster.cpp: same as StorageFileCluster.cpp for UrlTaskIterator. test_s3_cluster/test.py: kept all three imports (threading+time from theirs, uuid from ours); kept both test_hive_partitioning (ours) and test_graceful_shutdown (theirs). 03413_experimental_settings_cannot_be_enabled_by_default.sql: merged NOT IN lists from both sides, adding allow_experimental_iceberg_read_optimization. Adapted: StorageFileCluster and StorageURLCluster getVirtualsList() → metadata->virtuals.getSampleBlock(VirtualsKind::All, VirtualsMaterializationPlace::Reader).getNamesAndTypesList() because getVirtualsList() does not exist on antalya-26.5; the named metadata parameter was preserved from ours to supply the equivalent expression.
zvonand
added
releasy
27 tasks
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):
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #1687.
Cherry-picked from #1414, also has changes from #1597.