Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #2144 from Altinity/feature/antalya-26.6/auto-grp-pr-1694 Antalya 26.6: Hybrid tables # Conflicts: # docs/reference/engines/table-engines/special/hybrid.md # src/Common/FailPoint.cpp # src/Interpreters/ClusterProxy/executeQuery.h # src/Parsers/ASTIdentifier.h # src/Storages/StorageDistributed.cpp # src/Storages/StorageDistributed.h # src/Storages/registerStorages.cpp
All conflicts were additive: kept the antalya-26.8 side and the Hybrid additions from the port side next to each other. - src/Common/FailPoint.cpp, src/Storages/registerStorages.cpp, src/Interpreters/ClusterProxy/executeQuery.h, src/Parsers/ASTIdentifier.h, src/Storages/StorageDistributed.h: kept both sides (new fail point, registerStorageHybrid, <span>, resetSemanticTable(), Hybrid members) — base-branch lines untouched. - src/Storages/StorageDistributed.cpp: kept the base `Remote`/ `RemoteSecure` engine (registerStorageRemote, finalizeDistributedSettings, parseRemoteFunctionArguments include, ACCESS_DENIED) and added the port's registerStorageHybrid / Hybrid layout helpers / StorageTableFunction include / SUPPORT_IS_DISABLED alongside it. In buildQueryTreeDistributed() the port modified the local `ReplaseAliasColumnsVisitor`, which antalya-26.8 no longer has: commit 9ca234c (upstream ClickHouse#108855) moved ALIAS-column inlining out of StorageDistributed.cpp into `inlineAliasColumns()` in buildQueryTreeForShard.cpp. The call site was translated to the moved helper, keeping all Hybrid-specific parts of the hunk (segment predicate merged into WHERE, buildColumnNodesForTableExpression and ReplaceColumnNodesForTableExpressionVisitor). As a consequence the `__aliasMarker` injection that the port added inside that visitor has no landing site on this branch (the base solves the same mergeable-state naming problem in `inlineAliasColumns` + `buildShardCollapseFanOut`); the rest of the alias-marker support (setting, function, planner handling) came in unchanged from the port. Adapted: buildQueryTreeDistributed() now calls inlineAliasColumns() instead of the ReplaseAliasColumnsVisitor that antalya-26.8 moved to buildQueryTreeForShard.cpp (upstream ClickHouse#108855, commit 9ca234c)
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
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):
Add support for Hybrid tables, which combine local MergeTree storage with data in object storage behind a configurable watermark. Watermarks can be moved with ALTER TABLE MODIFY SETTING and inspected via the new system.hybrid_watermarks table, and queries now skip segments that cannot match the combination of the WHERE clause and the segment predicate.
DONE
Add support for Hybrid tables, which combine local MergeTree storage with data in object storage behind a configurable watermark. Watermarks can be moved with ALTER TABLE MODIFY SETTING and inspected via the new system.hybrid_watermarks table, and queries now skip segments that cannot match the combination of the WHERE clause and the segment predicate.
DONE (#1694 by @zvonand, #1723 by @mkmkme, #1788 by @mkmkme, #1789 by @mkmkme) (#2144 by @zvonand).
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #2144.