cherry pick pingcap#28466 to release-5.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Oct 8, 2021 · 98ec00a · 98ec00a
1 parent dc07933
commit 98ec00a
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 66 deletions.
diff --git a/expression/builtin_cast.go b/expression/builtin_cast.go
@@ -1883,6 +1883,12 @@ func WrapWithCastAsDecimal(ctx sessionctx.Context, expr Expression) Expression {
 	if expr.GetType().EvalType() == types.ETInt {
 		tp.Flen = mysql.MaxIntWidth
 	}
+<<<<<<< HEAD
+=======
+	if tp.Flen == types.UnspecifiedLength || tp.Flen > mysql.MaxDecimalWidth {
+		tp.Flen = mysql.MaxDecimalWidth
+	}
+>>>>>>> a18e05d2f... expression: limit valid decimal length (#28466)
 	types.SetBinChsClnFlag(tp)
 	tp.Flag |= expr.GetType().Flag & mysql.UnsignedFlag
 	return BuildCastFunction(ctx, expr, tp)

diff --git a/planner/core/integration_test.go b/planner/core/integration_test.go
@@ -3199,7 +3199,7 @@ func (s *testIntegrationSerialSuite) TestPushDownProjectionForTiFlash(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")
 	tk.MustExec("drop table if exists t")
-	tk.MustExec("create table t (id int, value decimal(6,3))")
+	tk.MustExec("create table t (id int, value decimal(6,3), name char(128))")
 	tk.MustExec("analyze table t")
 	tk.MustExec("set session tidb_allow_mpp=OFF")
 
@@ -3239,7 +3239,7 @@ func (s *testIntegrationSerialSuite) TestPushDownProjectionForMPP(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")
 	tk.MustExec("drop table if exists t")
-	tk.MustExec("create table t (id int, value decimal(6,3))")
+	tk.MustExec("create table t (id int, value decimal(6,3), name char(128))")
 	tk.MustExec("analyze table t")
 
 	// Create virtual tiflash replica info.

diff --git a/planner/core/testdata/integration_serial_suite_in.json b/planner/core/testdata/integration_serial_suite_in.json
@@ -217,7 +217,8 @@
       "desc format = 'brief' select * from t right join (select id-2 as b from t) A on A.b=t.id",
       "desc format = 'brief' select A.b, B.b from (select id-2 as b from t) B join (select id-2 as b from t) A on A.b=B.b",
       "desc format = 'brief' select A.id from t as A where exists (select 1 from t where t.id=A.id)",
-      "desc format = 'brief' select A.id from t as A where not exists  (select 1 from t where t.id=A.id)"
+      "desc format = 'brief' select A.id from t as A where not exists  (select 1 from t where t.id=A.id)",
+      "desc format = 'brief' SELECT FROM_UNIXTIME(name,'%Y-%m-%d')  FROM t;"
     ]
   },
   {
@@ -236,7 +237,8 @@
       "desc format = 'brief' select A.b, B.b from (select id-2 as b from t) B join (select id-2 as b from t) A on A.b=B.b",
       "desc format = 'brief' select id from t as A where exists (select 1 from t where t.id=A.id)",
       "desc format = 'brief' select id from t as A where not exists (select 1 from t where t.id=A.id)",
-      "desc format = 'brief' select b*2, id from (select avg(value+2) as b, id from t group by id) C order by id"
+      "desc format = 'brief' select b*2, id from (select avg(value+2) as b, id from t group by id) C order by id",
+      "desc format = 'brief' SELECT FROM_UNIXTIME(name,'%Y-%m-%d')  FROM t;"
     ]
   },
   {