Skip to content
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

planner: fix window which depends on another (#11040) #16153

Merged
merged 3 commits into from
Apr 15, 2020
Merged

planner: fix window which depends on another (#11040) #16153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3ab0f1
planner: fix window which depends on another (#11040)
b41sh Jul 4, 2019
2d57ac8
Merge branch 'release-3.0' into release-3.0-577f6884d8cc
sre-bot Apr 8, 2020
8ee17b6
Merge branch 'release-3.0' into release-3.0-577f6884d8cc
zz-jason Apr 14, 2020
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
6 changes: 3 additions & 3 deletions planner/core/logical_plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3560,15 +3560,15 @@ func mergeWindowSpec(spec, ref *ast.WindowSpec) error {
if ref.Frame != nil {
return ErrWindowNoInherentFrame.GenWithStackByArgs(ref.Name.O)
}
if spec.PartitionBy != nil {
return errors.Trace(ErrWindowNoChildPartitioning)
}
if ref.OrderBy != nil {
if spec.OrderBy != nil {
return ErrWindowNoRedefineOrderBy.GenWithStackByArgs(getWindowName(spec.Name.O), ref.Name.O)
}
spec.OrderBy = ref.OrderBy
}
if spec.PartitionBy != nil {
return errors.Trace(ErrWindowNoChildPartitioning)
}
spec.PartitionBy = ref.PartitionBy
spec.Ref = model.NewCIStr("")
return nil
Expand Down
4 changes: 4 additions & 0 deletions planner/core/logical_plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,6 +2329,10 @@ func (s *testPlanSuite) TestWindowFunction(c *C) {
sql: "select sum(a) over(w partition by a) from t window w as ()",
result: "[planner:3581]A window which depends on another cannot define partitioning.",
},
{
sql: "SELECT FIRST_VALUE(a) RESPECT NULLS OVER (w1 PARTITION BY b ORDER BY b ASC, a DESC ROWS 2 PRECEDING) AS 'first_value', a, b FROM ( SELECT a, b FROM `t` ) as t WINDOW w1 AS (PARTITION BY b ORDER BY b ASC, a ASC );",
result: "[planner:3581]A window which depends on another cannot define partitioning.",
},
{
sql: "select sum(a) over(w) from t window w as (rows between 1 preceding AND 1 following)",
result: "[planner:3582]Window 'w' has a frame definition, so cannot be referenced by another window.",
Expand Down