planner: fix some window specific check bug for window function. (#12394

) (#12404)
pingcap · Oct 13, 2019 · 4fdfdf8 · 4fdfdf8
1 parent 21b49ac
commit 4fdfdf8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/planner/core/logical_plan_builder.go b/planner/core/logical_plan_builder.go
@@ -3309,7 +3309,10 @@ func (b *PlanBuilder) checkOriginWindowSpecs(funcs []*ast.WindowFuncExpr, orderB
 		if end.Type == ast.Preceding && end.UnBounded {
 			return ErrWindowFrameEndIllegal.GenWithStackByArgs(getWindowName(spec.Name.O))
 		}
-		if start.Type == ast.Following && end.Type == ast.Preceding {
+		if start.Type == ast.Following && (end.Type == ast.Preceding || end.Type == ast.CurrentRow) {
+			return ErrWindowFrameIllegal.GenWithStackByArgs(getWindowName(spec.Name.O))
+		}
+		if (start.Type == ast.Following || start.Type == ast.CurrentRow) && end.Type == ast.Preceding {
 			return ErrWindowFrameIllegal.GenWithStackByArgs(getWindowName(spec.Name.O))
 		}
 

diff --git a/planner/core/logical_plan_test.go b/planner/core/logical_plan_test.go
@@ -2485,6 +2485,18 @@ func (s *testPlanSuite) TestWindowFunction(c *C) {
 			sql:    "SELECT NTH_VALUE(fieldA, -1) OVER (w1 PARTITION BY fieldB ORDER BY fieldB , fieldA ) AS 'ntile', fieldA, fieldB FROM ( SELECT a AS fieldA, b AS fieldB FROM t ) as temp WINDOW w1 AS ( ORDER BY fieldB ASC, fieldA DESC )",
 			result: "[planner:1210]Incorrect arguments to nth_value",
 		},
+		{
+			sql:    "SELECT SUM(a) OVER w AS 'sum' FROM t WINDOW w AS (ROWS BETWEEN 1 FOLLOWING AND CURRENT ROW )",
+			result: "[planner:3586]Window 'w': frame start or end is negative, NULL or of non-integral type",
+		},
+		{
+			sql:    "SELECT SUM(a) OVER w AS 'sum' FROM t WINDOW w AS (ROWS BETWEEN CURRENT ROW AND 1 PRECEDING )",
+			result: "[planner:3586]Window 'w': frame start or end is negative, NULL or of non-integral type",
+		},
+		{
+			sql:    "SELECT SUM(a) OVER w AS 'sum' FROM t WINDOW w AS (ROWS BETWEEN 1 FOLLOWING AND 1 PRECEDING )",
+			result: "[planner:3586]Window 'w': frame start or end is negative, NULL or of non-integral type",
+		},
 		// Test issue 11943
 		{
 			sql:    "SELECT ROW_NUMBER() OVER (partition by b) + a FROM t",