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

planner: fix range partition prune bug for IN expr (#22894) (#22938) #23074

Merged
merged 5 commits into from
Mar 18, 2021
+27 −1
Merged

planner: fix range partition prune bug for IN expr (#22894) (#22938) #23074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d093a5f
cherry pick #22938 to release-4.0
guo-shaoge Mar 3, 2021
f966699
Merge branch 'release-4.0' into release-4.0-3f7a573caacb
crazycs520 Mar 17, 2021
1069396
Merge branch 'release-4.0' into release-4.0-3f7a573caacb
ti-chi-bot Mar 18, 2021
04131f3
Merge branch 'release-4.0' into release-4.0-3f7a573caacb
ti-chi-bot Mar 18, 2021
4188a23
Merge branch 'release-4.0' into release-4.0-3f7a573caacb
ti-chi-bot Mar 18, 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
17 changes: 17 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4064,6 +4064,23 @@ func (s *testSuiteP1) TestSelectPartition(c *C) {
tk.MustQuery("select a, b from th where b>10").Check(testkit.Rows("11 11"))
tk.MustExec("commit")
tk.MustQuery("select a, b from th where b>10").Check(testkit.Rows("11 11"))

// test partition function is scalar func
tk.MustExec("drop table if exists tscalar")
tk.MustExec(`create table tscalar (c1 int) partition by range (c1 % 30) (
partition p0 values less than (0),
partition p1 values less than (10),
partition p2 values less than (20),
partition pm values less than (maxvalue));`)
tk.MustExec("insert into tscalar values(0), (10), (40), (50), (55)")
// test IN expression
tk.MustExec("insert into tscalar values(-0), (-10), (-40), (-50), (-55)")
tk.MustQuery("select * from tscalar where c1 in (55, 55)").Check(testkit.Rows("55"))
tk.MustQuery("select * from tscalar where c1 in (40, 40)").Check(testkit.Rows("40"))
tk.MustQuery("select * from tscalar where c1 in (40)").Check(testkit.Rows("40"))
tk.MustQuery("select * from tscalar where c1 in (-40)").Check(testkit.Rows("-40"))
tk.MustQuery("select * from tscalar where c1 in (-40, -40)").Check(testkit.Rows("-40"))
tk.MustQuery("select * from tscalar where c1 in (-1)").Check(testkit.Rows())
}

func (s *testSuiteP1) TestDeletePartition(c *C) {
Expand Down
11 changes: 10 additions & 1 deletion planner/core/rule_partition_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,16 @@ func partitionRangeForInExpr(sctx sessionctx.Context, args []expression.Expressi
default:
return pruner.fullRange()
}
val, err := constExpr.Value.ToInt64(sctx.GetSessionVars().StmtCtx)

var val int64
var err error
if pruner.partFn != nil {
// replace fn(col) to fn(const)
partFnConst := replaceColumnWithConst(pruner.partFn, constExpr)
val, _, err = partFnConst.EvalInt(sctx, chunk.Row{})
} else {
val, err = constExpr.Value.ToInt64(sctx.GetSessionVars().StmtCtx)
}
if err != nil {
return pruner.fullRange()
}
Expand Down