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

expression: pushdown expr to tiflash without check new collation status #17683

Merged
merged 6 commits into from
Jun 5, 2020
Merged

expression: pushdown expr to tiflash without check new collation status #17683

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73473f9
pushdown expr to tiflash if new collation is enabled
windtalker Jun 4, 2020
0f016a0
fix build
windtalker Jun 4, 2020
ae00fc8
Merge branch 'master' into collation
windtalker Jun 5, 2020
9022601
Merge branch 'master' into collation
sre-bot Jun 5, 2020
dfc4c10
Merge branch 'master' into collation
windtalker Jun 5, 2020
9f030de
Merge branch 'master' into collation
windtalker Jun 5, 2020
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
3 changes: 1 addition & 2 deletions expression/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/types/json"
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tidb/util/collate"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tipb/go-tipb"
"go.uber.org/zap"
Expand Down Expand Up @@ -1059,7 +1058,7 @@ func canScalarFuncPushDown(scalarFunc *ScalarFunction, pc PbConverter, storeType
}

func canExprPushDown(expr Expression, pc PbConverter, storeType kv.StoreType) bool {
if storeType == kv.TiFlash && (expr.GetType().Tp == mysql.TypeDuration || collate.NewCollationEnabled()) {
if storeType == kv.TiFlash && expr.GetType().Tp == mysql.TypeDuration {
return false
}
switch x := expr.(type) {
Expand Down