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

*: disable read committed isolation level #7282

Merged
merged 2 commits into from
Aug 6, 2018
Merged

*: disable read committed isolation level #7282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a2bd8
*: disable read committed isolation level
coocood Aug 6, 2018
563acd6
fix test
coocood Aug 6, 2018
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
15 changes: 4 additions & 11 deletions distsql/request_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"math"

"github.com/juju/errors"
"github.com/pingcap/tidb/ast"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/sessionctx/stmtctx"
"github.com/pingcap/tidb/sessionctx/variable"
Expand Down Expand Up @@ -124,15 +123,9 @@ func (builder *RequestBuilder) SetKeepOrder(order bool) *RequestBuilder {
return builder
}

func (builder *RequestBuilder) getIsolationLevel(sv *variable.SessionVars) kv.IsoLevel {
var isoLevel string
if sv.TxnIsolationLevelOneShot.State == 2 {
isoLevel = sv.TxnIsolationLevelOneShot.Value
}
if isoLevel == "" {
isoLevel, _ = sv.GetSystemVar(variable.TxnIsolation)
}
if isoLevel == ast.ReadCommitted {
func (builder *RequestBuilder) getIsolationLevel() kv.IsoLevel {
switch builder.Tp {
case kv.ReqTypeAnalyze:
return kv.RC
}
return kv.SI
Expand All @@ -142,7 +135,7 @@ func (builder *RequestBuilder) getIsolationLevel(sv *variable.SessionVars) kv.Is
// "Concurrency", "IsolationLevel", "NotFillCache".
func (builder *RequestBuilder) SetFromSessionVars(sv *variable.SessionVars) *RequestBuilder {
builder.Request.Concurrency = sv.DistSQLScanConcurrency
builder.Request.IsolationLevel = builder.getIsolationLevel(sv)
builder.Request.IsolationLevel = builder.getIsolationLevel()
builder.Request.NotFillCache = sv.StmtCtx.NotFillCache
return builder
}
Expand Down
2 changes: 1 addition & 1 deletion distsql/request_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ func (s *testSuite) TestRequestBuilder5(c *C) {
KeepOrder: true,
Desc: false,
Concurrency: 0,
IsolationLevel: 0,
IsolationLevel: kv.SI,
Priority: 1,
NotFillCache: true,
SyncLog: false,
Expand Down
3 changes: 0 additions & 3 deletions executor/analyze.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/juju/errors"
"github.com/pingcap/tidb/distsql"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/metrics"
"github.com/pingcap/tidb/model"
"github.com/pingcap/tidb/mysql"
Expand Down Expand Up @@ -201,7 +200,6 @@ func (e *AnalyzeIndexExec) open() error {
SetPriority(e.priority).
Build()
kvReq.Concurrency = e.concurrency
kvReq.IsolationLevel = kv.RC
ctx := context.TODO()
e.result, err = distsql.Analyze(ctx, e.ctx.GetClient(), kvReq)
if err != nil {
Expand Down Expand Up @@ -317,7 +315,6 @@ func (e *AnalyzeColumnsExec) buildResp(ranges []*ranger.NewRange) (distsql.Selec
SetKeepOrder(e.keepOrder).
SetPriority(e.priority).
Build()
kvReq.IsolationLevel = kv.RC
kvReq.Concurrency = e.concurrency
if err != nil {
return nil, errors.Trace(err)
Expand Down
8 changes: 0 additions & 8 deletions executor/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/pingcap/tidb/ast"
"github.com/pingcap/tidb/domain"
"github.com/pingcap/tidb/expression"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/terror"
Expand Down Expand Up @@ -181,13 +180,6 @@ func (e *SetExecutor) setSysVariable(name string, v *expression.VarAssignment) e
log.Infof("con:%d %s=%s", sessionVars.ConnectionID, name, valStr)
}

if name == variable.TxnIsolation {
isoLevel, _ := sessionVars.GetSystemVar(variable.TxnIsolation)
if isoLevel == ast.ReadCommitted {
e.ctx.Txn().SetOption(kv.IsolationLevel, kv.RC)
}
}

return nil
}

Expand Down
4 changes: 0 additions & 4 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,10 +1360,6 @@ func (s *session) ActivePendingTxn() error {
return errors.Trace(err)
}
s.sessionVars.TxnCtx.StartTS = s.txn.StartTS()
isoLevel, _ := s.sessionVars.GetSystemVar(variable.TxnIsolation)
if isoLevel == ast.ReadCommitted {
s.txn.SetOption(kv.IsolationLevel, kv.RC)
}
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion session/session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,7 +1985,7 @@ func (s *testSessionSuite) TestSetTransactionIsolationOneShot(c *C) {

// Check isolation level is set to read committed.
ctx := context.WithValue(context.Background(), "CheckSelectRequestHook", func(req *kv.Request) {
c.Assert(req.IsolationLevel, Equals, kv.RC)
c.Assert(req.IsolationLevel, Equals, kv.SI)
})
tk.Se.Execute(ctx, "select * from t where k = 1")

Expand Down
16 changes: 0 additions & 16 deletions store/tikv/lock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,22 +181,6 @@ func (s *testLockSuite) TestGetTxnStatus(c *C) {
c.Assert(status.IsCommitted(), IsFalse)
}

func (s *testLockSuite) TestRC(c *C) {
s.putKV(c, []byte("key"), []byte("v1"))

txn, err := s.store.Begin()
c.Assert(err, IsNil)
txn.Set([]byte("key"), []byte("v2"))
s.prewriteTxn(c, txn.(*tikvTxn))

txn2, err := s.store.Begin()
c.Assert(err, IsNil)
txn2.SetOption(kv.IsolationLevel, kv.RC)
val, err := txn2.Get([]byte("key"))
c.Assert(err, IsNil)
c.Assert(string(val), Equals, "v1")
}

func (s *testLockSuite) prewriteTxn(c *C, txn *tikvTxn) {
committer, err := newTwoPhaseCommitter(txn, 0)
c.Assert(err, IsNil)
Expand Down
5 changes: 2 additions & 3 deletions store/tikv/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,8 @@ func (s *Scanner) getData(bo *Backoffer) error {
Version: s.startTS(),
},
Context: pb.Context{
IsolationLevel: pbIsolationLevel(s.snapshot.isolationLevel),
Priority: s.snapshot.priority,
NotFillCache: s.snapshot.notFillCache,
Priority: s.snapshot.priority,
NotFillCache: s.snapshot.notFillCache,
},
}
resp, err := sender.SendReq(bo, req, loc.Region, ReadTimeoutMedium)
Expand Down
28 changes: 12 additions & 16 deletions store/tikv/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,21 @@ const (

// tikvSnapshot implements the kv.Snapshot interface.
type tikvSnapshot struct {
store *tikvStore
version kv.Version
isolationLevel kv.IsoLevel
priority pb.CommandPri
notFillCache bool
syncLog bool
store *tikvStore
version kv.Version
priority pb.CommandPri
notFillCache bool
syncLog bool
}

var snapshotGP = gp.New(time.Minute)

// newTiKVSnapshot creates a snapshot of an TiKV store.
func newTiKVSnapshot(store *tikvStore, ver kv.Version) *tikvSnapshot {
return &tikvSnapshot{
store: store,
version: ver,
isolationLevel: kv.SI,
priority: pb.CommandPri_Normal,
store: store,
version: ver,
priority: pb.CommandPri_Normal,
}
}

Expand Down Expand Up @@ -146,9 +144,8 @@ func (s *tikvSnapshot) batchGetSingleRegion(bo *Backoffer, batch batchKeys, coll
Version: s.version.Ver,
},
Context: pb.Context{
Priority: s.priority,
IsolationLevel: pbIsolationLevel(s.isolationLevel),
NotFillCache: s.notFillCache,
Priority: s.priority,
NotFillCache: s.notFillCache,
},
}
resp, err := sender.SendReq(bo, req, batch.region, ReadTimeoutMedium)
Expand Down Expand Up @@ -228,9 +225,8 @@ func (s *tikvSnapshot) get(bo *Backoffer, k kv.Key) ([]byte, error) {
Version: s.version.Ver,
},
Context: pb.Context{
Priority: s.priority,
IsolationLevel: pbIsolationLevel(s.isolationLevel),
NotFillCache: s.notFillCache,
Priority: s.priority,
NotFillCache: s.notFillCache,
},
}
for {
Expand Down
5 changes: 0 additions & 5 deletions store/tikv/txn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ func (txn *tikvTxn) Delete(k kv.Key) error {
func (txn *tikvTxn) SetOption(opt kv.Option, val interface{}) {
txn.us.SetOption(opt, val)
switch opt {
case kv.IsolationLevel:
txn.snapshot.isolationLevel = val.(kv.IsoLevel)
case kv.Priority:
txn.snapshot.priority = kvPriorityToCommandPri(val.(int))
case kv.NotFillCache:
Expand All @@ -151,9 +149,6 @@ func (txn *tikvTxn) SetOption(opt kv.Option, val interface{}) {

func (txn *tikvTxn) DelOption(opt kv.Option) {
txn.us.DelOption(opt)
if opt == kv.IsolationLevel {
txn.snapshot.isolationLevel = kv.SI
}
}

func (txn *tikvTxn) Commit(ctx context.Context) error {
Expand Down