Repository navigation
Antalya 26.8: __aliasMarker refactoring to cover complex cases with ALIASes - #2662
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #2409 from Altinity/mkmkme/26.6/alias-marker Antalya 26.6: __aliasMarker refactoring to cover complex cases with ALIASes # Conflicts: # src/Analyzer/Utils.cpp # src/Interpreters/ClusterProxy/executeQuery.cpp # src/Planner/PlannerActionsVisitor.cpp # src/Storages/StorageDistributed.cpp # src/Storages/StorageMerge.cpp # src/Storages/buildQueryTreeForShard.cpp # src/Storages/buildQueryTreeForShard.h # tests/queries/0_stateless/03648_alias_marker_with_mergeable_state.sh
antalya-26.8 already carries the upstream marker-less inlineAliasColumns
(free functions inlineAliasColumnsImpl / inlineAliasColumnsInExpression);
replace it with the source PR's AliasColumnInliner and the new
inlineAliasColumns(tree, context) signature.
Adapted: parallel-replicas callers of inlineAliasColumns (executeQuery.cpp, findParallelReplicasQuery.cpp) pass context for the re-signatured function
Adapted: actionNameAfterAliasInlining uses AliasColumnInliner{..., false}.inlineExpression in place of the removed inlineAliasColumnsInExpression
Adapted: getExpressionSource keeps the TableExpressionNodePtr return type of antalya-26.8
Adapted: RowPolicyData constructor keeps the antalya-26.8 __row_policy_filter alias approach, which already covers the bare-column policy case
… 0 for collapse rejection A `JOIN USING` entry wrapped in `__aliasMarker` is rendered as the bare key name, so the shard receives `USING (a)` instead of `USING (x AS a)` and cannot resolve a key that exists only as an `ALIAS` column of the `Distributed` table. Inline the `USING` sides without markers. With markers on, duplicate `ALIAS` columns are not collapsed on the shard, so the `GROUPING SETS` collapse rejection in 04357 is reachable only with `enable_alias_marker = 0`. Addresses 2 failing test(s) in Fast test on #2662. Still-failing set shrank from 2 → 0. https://altinity-build-artifacts.s3.amazonaws.com/json.html?PR=2662&sha=ee946d812b073a89b9dcd42db857e46510f76f32&name_0=PR&name_1=Fast%20test
This comment was marked as outdated.
This comment was marked as outdated.
CI triage — PR #2662Verdict: 4 red checks → 0 caused by this PR's source changes. 1 is a stale-branch issue (one merge fixes it), 3 are flaky/infra. SQLLogic has since gone green.
1. Integration tests (arm_binary, distributed plan, 1/4) — stale branch, fixable by merging baseAll 21 failures are in a single file, This is not your alias-marker change:
Root cause is that this branch is ~1 day behind # tests/integration/test_storage_iceberg_with_spark/configs/users.d/users.xml (present on base, absent here)
<named_collection_control>1</named_collection_control>
+ <show_named_collections_secrets>1</show_named_collections_secrets>
Concrete fix: merge 2 & 3. Regression swarms (release + aarch64) — flaky/infra, safe to re-runBoth arches fail the identical 3 leaf scenarios — being arch-independent is itself a strong infra signal:
These are the swarm resilience suite (deliberate node-kill / CPU-overload fault injection against MinIO/object-storage clusters). The errors are transport-level (connect failures, socket timeouts under induced load) — a planner/alias-marker regression would surface as a logical error or wrong result during analysis, not a 300s socket timeout under CPU overload. 1518/1535 scenarios pass. Classification: flaky/infra — safe to re-run; not PR-related. Bottom line: nothing here points at the 🤖 Generated with Claude Code |
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fixed
ALIAScolumns read throughDistributed,MergeoverDistributed, and Hybrid tables. AJOINwhose two sides declare a same-namedALIAScolumn failed withMULTIPLE_EXPRESSIONS_FOR_ALIAS; reading anALIAScolumn of aMergetable over aDistributedchild failed withNOT_FOUND_COLUMN_IN_BLOCKor returned defaults; reading anALIAScolumn of a Hybrid table from inside a subquery failed withTHERE_IS_NO_COLUMN; and anALIAScolumn referenced from inside a lambda over aDistributedtable failed on the shard (#2409 by @mkmkme).CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #2409.
This is the attempt of forward-porting #1844 to 26.6 considering the improvements done in the upstream.
Documentation entry for user-facing changes
...