Skip to content

fix(plan): support GROUPING expressions in ROLLUP ORDER BY #25335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ck89119 wants to merge 21 commits into
base: main
Choose a base branch
from
Open

fix(plan): support GROUPING expressions in ROLLUP ORDER BY #25335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
124206c
fix(plan): resolve grouping in rollup order by
ck89119 Jul 1, 2026
b1ab107
Merge remote-tracking branch 'refs/remotes/mo/main' into issue-25287-…
ck89119 Jul 1, 2026
6a0dcf6
fix(plan): normalize grouping order matching
ck89119 Jul 1, 2026
a8ddcd2
Merge remote-tracking branch 'refs/remotes/mo/main' into issue-25287-…
ck89119 Jul 2, 2026
40f6cef
fix(plan): resolve grouping order columns before aliases
ck89119 Jul 2, 2026
a8e3cf5
Merge remote-tracking branch 'refs/remotes/mo/main' into issue-25287-…
ck89119 Jul 3, 2026
1af5616
fix(plan): rewrite nested grouping order expressions
ck89119 Jul 3, 2026
e4b19a9
Merge remote-tracking branch 'refs/remotes/mo/main' into issue-25287-…
ck89119 Jul 3, 2026
ca7653d
fix(plan): bind grouping order keys in branches
ck89119 Jul 3, 2026
e935fa6
Merge remote-tracking branch 'refs/remotes/mo/main' into issue-25287-…
ck89119 Jul 4, 2026
2b14bd5
fix: preserve rollup order by projections
ck89119 Jul 4, 2026
dd96c30
fix: update hint_cte rollup result after dedup fix
ck89119 Jul 5, 2026
08c1465
fix(plan): preserve SELECT DISTINCT contract for grouping-set order keys
ck89119 Jul 6, 2026
30bd365
fix(plan): normalize GROUPING() args for DISTINCT comparison
ck89119 Jul 6, 2026
6813f01
fix: gofmt alignment in query_builder_test.go
ck89119 Jul 7, 2026
05833c5
fix(plan): fold case and unwrap outer parens in DISTINCT grouping ord…
ck89119 Jul 7, 2026
c252970
Merge branch 'main' into issue-25287-main
ck89119 Jul 7, 2026
f663804
fix(plan): recurse into GROUPING() argument expressions during normal…
ck89119 Jul 7, 2026
6706420
fix(plan): scope qualifier stripping to GROUPING argument subtree only
ck89119 Jul 8, 2026
146fd6f
fix(plan): validate ORDER BY ordinals against visible select list in …
ck89119 Jul 8, 2026
6b86dce
fix(plan): resolve grouping-set ORDER BY ordinals after star-expansion
ck89119 Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/sql/plan/opt_misc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ func (builder *QueryBuilder) rewriteEffectlessAggToProject(nodeID int32) {
return
}
scan := builder.qry.Nodes[node.Children[0]]
if scan.NodeType != plan.Node_TABLE_SCAN {
if scan.NodeType != plan.Node_TABLE_SCAN || scan.TableDef == nil || scan.TableDef.Pkey == nil {
return
}
groupCol := make([]int32, 0)
Expand Down
Loading
Loading