executor: fix auto-id allocation during statements retry #20659
Merged
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
|
There is a failed case(https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/tidb_ghpr_check_2/detail/tidb_ghpr_check_2/57413/pipeline): PTAL @tangenta |
bb7133
reviewed
Oct 29, 2020
executor/insert_common.go
Outdated
| @@ -598,7 +599,7 @@ func (e *InsertValues) fillRow(ctx context.Context, row []types.Datum, hasValue | |||
|
|
|||
| // isAutoNull can help judge whether a datum is AutoIncrement Null quickly. | |||
| // This used to help lazyFillAutoIncrement to find consecutive N datum backwards for batch autoID alloc. | |||
| func (e *InsertValues) isAutoNull(ctx context.Context, d types.Datum, col *table.Column) bool { | |||
| func (e *InsertValues) isAutoNull(ctx context.Context, d *types.Datum, col *table.Column) bool { | |||
There was a problem hiding this comment.
IMHO we don't need to change it to pass-by-reference in case that it may be modified carelessly in the future?
bb7133
reviewed
Oct 29, 2020
executor/insert_common.go
Outdated
| } | ||
| } | ||
| return rows, nil | ||
| func setDatumAutoIDWithCast(ctx sessionctx.Context, d *types.Datum, id int64, col *table.Column) error { |
There was a problem hiding this comment.
Since we d.SetAutoID explicitly , the datum must be not null. HandleBadNull is meaningless.
tangenta
force-pushed
the
auto-id-retry
branch
from
59f609a
to
064e164
Compare
AilinKid
reviewed
Nov 5, 2020
| }() | ||
| wg.Wait() | ||
| for _, e := range err { | ||
| c.Assert(e, IsNil) |
There was a problem hiding this comment.
should we use the begin/commit to control the ts of txn2 between the begin and commit of txn1? that will make sure the retry is absolutely necessary.
There was a problem hiding this comment.
It seems the explicit commit does not trigger auto-retry:
mysql> create table t (id int auto_increment unique key, idx int unique key, c int);
Query OK, 0 rows affected (0.00 sec)
mysql> begin;
Query OK, 0 rows affected (0.00 sec)
mysql> insert into t(idx, c) values (1, 1) on duplicate key update c = 2;
Query OK, 1 row affected (0.01 sec)
mysql> commit;
Query OK, 0 rows affected (0.00 sec)mysql> begin;
Query OK, 0 rows affected (0.00 sec)
mysql> insert into t(idx, c) values (1, 1) on duplicate key update c = 2;
Query OK, 1 row affected (0.00 sec)
mysql> commit;
ERROR 9007 (HY000): Write conflict, txnStartTS=420644278338322432, conflictStartTS=420644277094973440, conflictCommitTS=420644294221365248, key={tableID=49, indexID=2, indexValues={1, }} primary=[]byte(nil) [try again later]There was a problem hiding this comment.
Because PessimisticTxn is set to true by default ...
ti-srebot
approved these changes
Nov 9, 2020
|
/run-all-tests |
tangenta
added a commit
to tangenta/tidb
that referenced
this pull request
Nov 16, 2020
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Nov 17, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-4.0 in PR #21105 |
bb7133
pushed a commit
that referenced
this pull request
Nov 25, 2020
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.
What problem does this PR solve?
Issue Number: close #20629
What is changed and how it works?
What's Changed:
Since the inserting rows might be different between transaction retries, the auto IDs array in
RetryInfocan be treated as a buffer: TiDB always try to reuse the IDs in this buffer. Only if the buffer is empty, a new auto ID is allocated from TiKV.Related changes
Check List
Tests
Side effects
N/A
Release note