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: disable LOCK IN SHARE MODE by default (#19506) #21005

Merged
merged 3 commits into from
Nov 17, 2020
Merged

planner: disable LOCK IN SHARE MODE by default (#19506) #21005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
046fd4f
cherry pick #19506 to release-4.0
Sep 18, 2020
8d7f6ff
Fix conflicts.
Nov 16, 2020
e1317e3
Merge branch 'release-4.0' into release-4.0-9876de896127
ti-srebot Nov 17, 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
13 changes: 13 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6980,6 +6980,19 @@ func (s *testIntegrationSerialSuite) TestIssue19045(c *C) {
tk.MustQuery(`select ( SELECT t1.a FROM t1, t2 WHERE t1.b = t2.a AND t2.b = '03' AND t1.c = a.a) invode from t a ;`).Check(testkit.Rows("a011", "a011"))
}

func (s *testIntegrationSerialSuite) TestIssue19383(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("DROP TABLE IF EXISTS t1")
tk.MustExec("CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY)")
tk.MustExec("INSERT INTO t1 VALUES (1),(2),(3)")
_, err := tk.Exec("SELECT * FROM t1 LOCK IN SHARE MODE")
message := `function LOCK IN SHARE MODE has only noop implementation in tidb now, use tidb_enable_noop_functions to enable these functions`
c.Assert(strings.Contains(err.Error(), message), IsTrue)
tk.MustExec("SET tidb_enable_noop_functions=1")
tk.MustExec("SELECT * FROM t1 LOCK IN SHARE MODE")
}

func (s *testIntegrationSerialSuite) TestIssue19315(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down
6 changes: 5 additions & 1 deletion planner/core/logical_plan_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2503,7 +2503,7 @@ func (b *PlanBuilder) buildSelect(ctx context.Context, sel *ast.SelectStmt) (p L
// table hints are only visible in the current SELECT statement.
b.popTableHints()
}()

enableNoopFuncs := b.ctx.GetSessionVars().EnableNoopFuncs
if sel.SelectStmtOpts != nil {
origin := b.inStraightJoin
b.inStraightJoin = sel.SelectStmtOpts.StraightJoin
Expand Down Expand Up @@ -2572,6 +2572,10 @@ func (b *PlanBuilder) buildSelect(ctx context.Context, sel *ast.SelectStmt) (p L
}

if sel.LockTp != ast.SelectLockNone {
if sel.LockTp == ast.SelectLockInShareMode && !enableNoopFuncs {
err = expression.ErrFunctionsNoopImpl.GenWithStackByArgs("LOCK IN SHARE MODE")
return nil, err
}
p = b.buildSelectLock(p, sel.LockTp)
}
b.handleHelper.popMap()
Expand Down