cherry pick pingcap#24670 to release-5.0

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · May 20, 2021 · ec8566d · ec8566d
1 parent 41c0f17
commit ec8566d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/expression/expression.go b/expression/expression.go
@@ -1109,11 +1109,37 @@ func canFuncBePushed(sf *ScalarFunction, storeType kv.StoreType) bool {
 			tipb.ScalarFuncSig_Substring3ArgsUTF8:
 			ret = true
 		}
+<<<<<<< HEAD
 	case ast.Rand:
 		switch sf.Function.PbCode() {
 		case
 			tipb.ScalarFuncSig_RandWithSeedFirstGen:
 			ret = true
+=======
+	case ast.Cast:
+		switch function.Function.PbCode() {
+		case tipb.ScalarFuncSig_CastIntAsInt, tipb.ScalarFuncSig_CastIntAsDecimal, tipb.ScalarFuncSig_CastIntAsString, tipb.ScalarFuncSig_CastIntAsTime,
+			tipb.ScalarFuncSig_CastRealAsInt, tipb.ScalarFuncSig_CastRealAsDecimal, tipb.ScalarFuncSig_CastRealAsString, tipb.ScalarFuncSig_CastRealAsTime,
+			tipb.ScalarFuncSig_CastStringAsInt, tipb.ScalarFuncSig_CastStringAsDecimal, tipb.ScalarFuncSig_CastStringAsString, tipb.ScalarFuncSig_CastStringAsTime,
+			tipb.ScalarFuncSig_CastDecimalAsInt, tipb.ScalarFuncSig_CastDecimalAsDecimal, tipb.ScalarFuncSig_CastDecimalAsString, tipb.ScalarFuncSig_CastDecimalAsTime,
+			tipb.ScalarFuncSig_CastTimeAsInt, tipb.ScalarFuncSig_CastTimeAsDecimal, tipb.ScalarFuncSig_CastTimeAsTime, tipb.ScalarFuncSig_CastIntAsReal, tipb.ScalarFuncSig_CastRealAsReal:
+			return true
+		}
+	case ast.DateAdd:
+		switch function.Function.PbCode() {
+		case tipb.ScalarFuncSig_AddDateDatetimeInt, tipb.ScalarFuncSig_AddDateStringInt:
+			return true
+		}
+	case ast.Round:
+		switch function.Function.PbCode() {
+		case tipb.ScalarFuncSig_RoundInt, tipb.ScalarFuncSig_RoundReal:
+			return true
+		}
+	case ast.Extract:
+		switch function.Function.PbCode() {
+		case tipb.ScalarFuncSig_ExtractDatetime:
+			return true
+>>>>>>> 5be8a6563... expression: support cast real/int as real (#24670)
 		}
 	}
 	if ret {

diff --git a/planner/core/testdata/integration_serial_suite_out.json b/planner/core/testdata/integration_serial_suite_out.json
@@ -13,8 +13,13 @@
       {
         "SQL": "explain format = 'brief' select * from t where cast(t.a as float) + 3 = 5.1",
         "Plan": [
+<<<<<<< HEAD
           "Selection 10000.00 root  eq(plus(cast(test.t.a), 3), 5.1)",
           "└─TableReader 10000.00 root  data:TableFullScan",
+=======
+          "TableReader 8000.00 root  data:Selection",
+          "└─Selection 8000.00 cop[tiflash]  eq(plus(cast(test.t.a, float BINARY), 3), 5.1)",
+>>>>>>> 5be8a6563... expression: support cast real/int as real (#24670)
           "  └─TableFullScan 10000.00 cop[tiflash] table:t keep order:false, stats:pseudo"
         ]
       },