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.

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

*: use StaticExprContext instead of mock context to build expression #54101

Merged
merged 2 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions pkg/ddl/partition.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import (
"github.com/pingcap/tidb/pkg/util/dbterror"
"github.com/pingcap/tidb/pkg/util/hack"
"github.com/pingcap/tidb/pkg/util/mathutil"
"github.com/pingcap/tidb/pkg/util/mock"
decoder "github.com/pingcap/tidb/pkg/util/rowDecoder"
"github.com/pingcap/tidb/pkg/util/slice"
"github.com/pingcap/tidb/pkg/util/stringutil"
Expand Down Expand Up @@ -4259,9 +4258,7 @@ func (cns columnNameSlice) At(i int) string {
}

func isPartExprUnsigned(ectx expression.EvalContext, tbInfo *model.TableInfo) bool {
// We should not rely on any configuration, system or session variables, so use a mock ctx!
// Same as in tables.newPartitionExpr
ctx := mock.NewContext()
ctx := tables.NewPartitionExprBuildCtx()
expr, err := expression.ParseSimpleExpr(ctx, tbInfo.Partition.Expr, expression.WithTableInfo("", tbInfo))
if err != nil {
logutil.DDLLogger().Error("isPartExpr failed parsing expression!", zap.Error(err))
Expand Down
2 changes: 1 addition & 1 deletion pkg/table/tables/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ go_library(
"//pkg/errno",
"//pkg/expression",
"//pkg/expression/context",
"//pkg/expression/contextstatic",
"//pkg/kv",
"//pkg/meta",
"//pkg/meta/autoid",
Expand All @@ -43,7 +44,6 @@ go_library(
"//pkg/util/generatedexpr",
"//pkg/util/hack",
"//pkg/util/logutil",
"//pkg/util/mock",
"//pkg/util/ranger",
"//pkg/util/rowcodec",
"//pkg/util/sqlexec",
Expand Down
28 changes: 24 additions & 4 deletions pkg/table/tables/partition.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/errctx"
"github.com/pingcap/tidb/pkg/expression"
"github.com/pingcap/tidb/pkg/expression/contextstatic"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/parser"
"github.com/pingcap/tidb/pkg/parser/ast"
Expand All @@ -44,7 +45,6 @@ import (
"github.com/pingcap/tidb/pkg/util/dbterror"
"github.com/pingcap/tidb/pkg/util/hack"
"github.com/pingcap/tidb/pkg/util/logutil"
"github.com/pingcap/tidb/pkg/util/mock"
"github.com/pingcap/tidb/pkg/util/ranger"
"github.com/pingcap/tidb/pkg/util/stringutil"
"go.uber.org/zap"
Expand Down Expand Up @@ -238,10 +238,30 @@ func initPartition(t *partitionedTable, def model.PartitionDefinition) (*partiti
return &newPart, nil
}

// NewPartitionExprBuildCtx returns a context to build partition expression.
func NewPartitionExprBuildCtx() expression.BuildContext {
return contextstatic.NewStaticExprContext(
contextstatic.WithEvalCtx(contextstatic.NewStaticEvalContext(
// Set a non-strict SQL mode and allow all date values if possible to make sure constant fold can work to
// estimate some undetermined result when locating a row to a partition.
// See issue: https://github.com/pingcap/tidb/issues/54271 for details.
contextstatic.WithSQLMode(mysql.ModeAllowInvalidDates),
contextstatic.WithTypeFlags(types.StrictFlags.
WithIgnoreTruncateErr(true).
WithIgnoreZeroDateErr(true).
WithIgnoreZeroInDate(true).
WithIgnoreInvalidDateErr(true),
),
contextstatic.WithErrLevelMap(errctx.LevelMap{
errctx.ErrGroupTruncate: errctx.LevelIgnore,
}),
)),
)
}

func newPartitionExpr(tblInfo *model.TableInfo, tp model.PartitionType, expr string, partCols []model.CIStr, defs []model.PartitionDefinition) (*PartitionExpr, error) {
// a partitioned table cannot rely on session context/sql modes, so use a default one!
ctx := mock.NewContext()
dbName := model.NewCIStr(ctx.GetSessionVars().CurrentDB)
ctx := NewPartitionExprBuildCtx()
dbName := model.NewCIStr(ctx.GetEvalCtx().CurrentDB())
columns, names, err := expression.ColumnInfos2ColumnsAndNames(ctx, dbName, tblInfo.Name, tblInfo.Cols(), tblInfo)
if err != nil {
return nil, err
Expand Down
17 changes: 17 additions & 0 deletions tests/integrationtest/r/table/partition.result
Original file line number Diff line number Diff line change
Expand Up @@ -569,3 +569,20 @@ a
-1
0
1
set @@sql_mode='allow_invalid_dates';
create table t_54271(a datetime primary key) partition by range columns(a) (
partition p0 values less than ('2020-02-31 00:00:00'),
partition p1 values less than (MAXVALUE)
);
insert into t_54271 values('2020-03-01 00:00:00');
set @@sql_mode='';
insert into t_54271 values('2020-03-01 00:00:00');
Error 1062 (23000): Duplicate entry '2020-03-01 00:00:00' for key 't_54271.PRIMARY'
select * from t_54271;
a
2020-03-01 00:00:00
select * from t_54271 partition (p0);
a
select * from t_54271 partition (p1);
a
2020-03-01 00:00:00
14 changes: 14 additions & 0 deletions tests/integrationtest/t/table/partition.test
Original file line number Diff line number Diff line change
Expand Up @@ -430,3 +430,17 @@ alter table t partition by range(a) (partition p0 values less than (0), partitio
alter table t remove partitioning;
select * from t;

# Issue #54271
set @@sql_mode='allow_invalid_dates';
create table t_54271(a datetime primary key) partition by range columns(a) (
partition p0 values less than ('2020-02-31 00:00:00'),
partition p1 values less than (MAXVALUE)
);
insert into t_54271 values('2020-03-01 00:00:00');
set @@sql_mode='';
--error 1062
insert into t_54271 values('2020-03-01 00:00:00');
select * from t_54271;
select * from t_54271 partition (p0);
select * from t_54271 partition (p1);