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

planner: fix the issue that binding cannot work when sql_select_limit is enabled #29789

Merged
merged 17 commits into from
Nov 23, 2021
Merged

planner: fix the issue that binding cannot work when sql_select_limit is enabled #29789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
eb14afa
fixup
qw4990 Nov 15, 2021
86d36e3
fixup
qw4990 Nov 15, 2021
7d06be8
Merge branch 'master' into sql_select_limit
qw4990 Nov 23, 2021
ccbae05
fixup
qw4990 Nov 23, 2021
851cf90
fixup
qw4990 Nov 23, 2021
78a5242
fixup
qw4990 Nov 23, 2021
1cc20a2
fixup
qw4990 Nov 23, 2021
38581f6
fixup
qw4990 Nov 23, 2021
526c9e2
fixup
qw4990 Nov 23, 2021
7a1eb2f
Merge branch 'master' into sql_select_limit
qw4990 Nov 23, 2021
05f1b18
fixup
qw4990 Nov 23, 2021
d1b7be1
Merge branch 'sql_select_limit' of https://github.com/qw4990/tidb int…
qw4990 Nov 23, 2021
adef698
fixup
qw4990 Nov 23, 2021
364f239
Merge branch 'master' into sql_select_limit
qw4990 Nov 23, 2021
192d65f
fixup
qw4990 Nov 23, 2021
7ffb832
Merge branch 'sql_select_limit' of https://github.com/qw4990/tidb int…
qw4990 Nov 23, 2021
fc9115d
Merge branch 'master' into sql_select_limit
ti-chi-bot Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion executor/compiler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ func (c *Compiler) Compile(ctx context.Context, stmtNode ast.StmtNode) (*ExecStm
if err != nil {
return nil, err
}
stmtNode = plannercore.TryAddExtraLimit(c.Ctx, stmtNode)

finalPlan, names, err := planner.Optimize(ctx, c.Ctx, stmtNode, ret.InfoSchema)
if err != nil {
Expand Down
20 changes: 20 additions & 0 deletions planner/core/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4719,6 +4719,26 @@ func (s *testIntegrationSuite) TestIssue27797(c *C) {
result.Check(testkit.Rows("<nil>"))
}

func (s *testIntegrationSuite) TestIssue27949(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t27949")
tk.MustExec("create table t27949 (a int, b int, key(b))")
tk.MustQuery("explain format = 'brief' select * from t27949 where b=1").Check(testkit.Rows("IndexLookUp 10.00 root ",
"├─IndexRangeScan(Build) 10.00 cop[tikv] table:t27949, index:b(b) range:[1,1], keep order:false, stats:pseudo",
"└─TableRowIDScan(Probe) 10.00 cop[tikv] table:t27949 keep order:false, stats:pseudo"))
tk.MustExec("create global binding for select * from t27949 where b=1 using select * from t27949 ignore index(b) where b=1")
tk.MustQuery("explain format = 'brief' select * from t27949 where b=1").Check(testkit.Rows("TableReader 10.00 root data:Selection",
"└─Selection 10.00 cop[tikv] eq(test.t27949.b, 1)",
" └─TableFullScan 10000.00 cop[tikv] table:t27949 keep order:false, stats:pseudo"))
tk.MustExec("set @@sql_select_limit=100")
tk.MustQuery("explain format = 'brief' select * from t27949 where b=1").Check(testkit.Rows("Limit 10.00 root offset:0, count:100",
"└─TableReader 10.00 root data:Limit",
" └─Limit 10.00 cop[tikv] offset:0, count:100",
" └─Selection 10.00 cop[tikv] eq(test.t27949.b, 1)",
" └─TableFullScan 10000.00 cop[tikv] table:t27949 keep order:false, stats:pseudo"))
}

func (s *testIntegrationSuite) TestIssue28154(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down
10 changes: 6 additions & 4 deletions planner/optimize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,10 @@ func Optimize(ctx context.Context, sctx sessionctx.Context, node ast.Node, is in
useBinding = false
}
}
if useBinding && sessVars.SelectLimit != math.MaxUint64 {
sessVars.StmtCtx.AppendWarning(errors.New("sql_select_limit is set, ignore SQL bindings"))
useBinding = false
if ok {
// add the extra Limit after matching the bind record
stmtNode = plannercore.TryAddExtraLimit(sctx, stmtNode)
node = stmtNode
}

var names types.NameSlice
Expand Down Expand Up @@ -234,7 +235,8 @@ func Optimize(ctx context.Context, sctx sessionctx.Context, node ast.Node, is in
defer func() {
sessVars.StmtCtx.StmtHints = savedStmtHints
}()
if sessVars.EvolvePlanBaselines && bestPlanFromBind != nil {
if sessVars.EvolvePlanBaselines && bestPlanFromBind != nil &&
sessVars.SelectLimit == math.MaxUint64 { // do not evolve this query if sql_select_limit is enabled
// Check bestPlanFromBind firstly to avoid nil stmtNode.
if _, ok := stmtNode.(*ast.SelectStmt); ok && !bindRecord.Bindings[0].Hint.ContainTableHint(plannercore.HintReadFromStorage) {
sessVars.StmtCtx.StmtHints = originStmtHints
Expand Down