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

expression : prevent function DATE_ADD/SUB_STRING_XXX pushed down to TiFlash #30154

Merged
merged 6 commits into from
Nov 25, 2021
Merged

expression : prevent function DATE_ADD/SUB_STRING_XXX pushed down to TiFlash #30154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69a237a
prevent function DATE_ADD/SUB_STRING_XXX pushed down to TiFlash
mengxin9014 Nov 25, 2021
519bb26
Merge branch 'master' into mx/preventDataAddAndSubStringXXXPushDownTo…
mengxin9014 Nov 25, 2021
ddc9e90
Merge branch 'master' into mx/preventDataAddAndSubStringXXXPushDownTo…
ti-chi-bot Nov 25, 2021
ca9a024
modify test
mengxin9014 Nov 25, 2021
5977312
Merge branch 'mx/preventDataAddAndSubStringXXXPushDownToTiflash' of g…
mengxin9014 Nov 25, 2021
7f9f6f4
Merge branch 'master' into mx/preventDataAddAndSubStringXXXPushDownTo…
windtalker Nov 25, 2021
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
4 changes: 0 additions & 4 deletions expression/expr_to_pb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,10 +853,6 @@ func TestExprPushDownToFlash(t *testing.T) {
require.NoError(t, err)
require.Equal(t, tipb.ScalarFuncSig_SubDateDatetimeInt, function.(*ScalarFunction).Function.PbCode())
exprs = append(exprs, function)
function, err = NewFunction(mock.NewContext(), ast.DateSub, types.NewFieldType(mysql.TypeDatetime), stringColumn, intColumn, stringColumn)
require.NoError(t, err)
require.Equal(t, tipb.ScalarFuncSig_SubDateStringInt, function.(*ScalarFunction).Function.PbCode())
exprs = append(exprs, function)
function, err = NewFunction(mock.NewContext(), ast.SubDate, types.NewFieldType(mysql.TypeDatetime), datetimeColumn, intColumn, stringColumn)
require.NoError(t, err)
require.Equal(t, tipb.ScalarFuncSig_SubDateDatetimeInt, function.(*ScalarFunction).Function.PbCode())
Expand Down
4 changes: 2 additions & 2 deletions expression/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,12 +1094,12 @@ func scalarExprSupportedByFlash(function *ScalarFunction) bool {
}
case ast.DateAdd, ast.AddDate:
switch function.Function.PbCode() {
case tipb.ScalarFuncSig_AddDateDatetimeInt, tipb.ScalarFuncSig_AddDateStringInt, tipb.ScalarFuncSig_AddDateStringReal:
case tipb.ScalarFuncSig_AddDateDatetimeInt:
return true
}
case ast.DateSub, ast.SubDate:
switch function.Function.PbCode() {
case tipb.ScalarFuncSig_SubDateDatetimeInt, tipb.ScalarFuncSig_SubDateStringInt:
case tipb.ScalarFuncSig_SubDateDatetimeInt:
return true
}
case ast.UnixTimestamp:
Expand Down