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

Jump to bottom

planner: fix window func support #9605

Merged
merged 4 commits into from Mar 7, 2019
Merged

planner: fix window func support #9605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34285b9
planner: fix window func support
AndrewDi Mar 7, 2019
a9b802f
planner: fix window func support
AndrewDi Mar 7, 2019
baac16e
fix ci
AndrewDi Mar 7, 2019
b75497c
Merge branch 'master' into view/fix_windows_func_support
zz-jason Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Expand Up @@ -3488,6 +3488,17 @@ func (s *testSuite) TestSelectView(c *C) {
tk.MustQuery("select * from view3;").Check(testkit.Rows("1 2"))
tk.MustExec("drop table view_t;")
tk.MustExec("drop view view1,view2,view3;")

tk.MustExec("set @@tidb_enable_window_function = 1")
defer func() {
tk.MustExec("set @@tidb_enable_window_function = 0")
}()
tk.MustExec("create table t(a int, b int)")
tk.MustExec("insert into t values (1,1),(1,2),(2,1),(2,2)")
tk.MustExec("create definer='root'@'localhost' view v as select a, first_value(a) over(rows between 1 preceding and 1 following), last_value(a) over(rows between 1 preceding and 1 following) from t")
result := tk.MustQuery("select * from v")
result.Check(testkit.Rows("1 1 1", "1 1 2", "2 1 2", "2 2 2"))
tk.MustExec("drop view v;")
}

type testSuite2 struct {
Expand Down
4 changes: 3 additions & 1 deletion planner/core/logical_plan_builder.go
View file
Open in desktop
Expand Up @@ -2173,7 +2173,9 @@ func (b *PlanBuilder) buildDataSource(tn *ast.TableName) (LogicalPlan, error) {
// BuildDataSourceFromView is used to build LogicalPlan from view
func (b *PlanBuilder) BuildDataSourceFromView(dbName model.CIStr, tableInfo *model.TableInfo) (LogicalPlan, error) {
charset, collation := b.ctx.GetSessionVars().GetCharsetInfo()
selectNode, err := parser.New().ParseOneStmt(tableInfo.View.SelectStmt, charset, collation)
viewParser := parser.New()
viewParser.EnableWindowFunc(b.ctx.GetSessionVars().EnableWindowFunction)
selectNode, err := viewParser.ParseOneStmt(tableInfo.View.SelectStmt, charset, collation)
if err != nil {
return nil, err
}
Expand Down