tidb, variable: refactor retry, add TransactionContext #2256
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
All variables that has transaction scope can be cleaned up at once.
tiancaiamao
reviewed
Dec 15, 2016
| if err := s.checkSchemaValid(); err != nil { | ||
| if !s.sessionVars.RetryInfo.Retrying && s.isRetryableError(err) { |
There was a problem hiding this comment.
is it safe to remove retry here? @zimulala
There was a problem hiding this comment.
oh, I see... it's just moved to somewhere else...
tiancaiamao
reviewed
Dec 15, 2016
| return s | ||
| } | ||
|
|
||
| func (s *testSessionSuite) TestRetryAttempts(c *C) { |
There was a problem hiding this comment.
we don't use it any more?
|
LGTM |
zimulala
reviewed
Dec 15, 2016
| @@ -594,6 +564,7 @@ func (s *session) ExecutePreparedStmt(stmtID uint32, args ...interface{}) (ast.R | |||
| if err != nil { | |||
| return nil, errors.Trace(err) | |||
| } | |||
| PrepareTxnCtx(s) | |||
| st := executor.CompileExecutePreparedStmt(s, stmtID, args...) | |||
There was a problem hiding this comment.
executor.GetInfoSchema(s) can be used in the function of CompileExecutePreparedStmt.
zimulala
reviewed
Dec 15, 2016
| if s.txn == nil { | ||
| return nil | ||
| } | ||
| defer func() { | ||
| s.txn = nil | ||
| s.sessionVars.SetStatusFlag(mysql.ServerStatusInTrans, false) | ||
| binloginfo.ClearBinlog(s) |
There was a problem hiding this comment.
Is it safe to remove clear binlog value?
There was a problem hiding this comment.
Binlog isn't stored in context.SetValue anymore, it will be cleared when TransactionContext is cleared.
|
LGTM |
zimulala
approved these changes
Dec 16, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add TransactionContext which is used to store transaction scope variables, so we can clean up multiple variables at once.
Refactor session Retry related code, improves readability.