executor, session: refine insert unsigned bigint autoIncreID #8181
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,7 +57,8 @@ type allocator struct { | |
| end int64 | ||
| store kv.Storage | ||
| // dbID is current database's ID. | ||
| dbID int64 | ||
| isUnsigned bool | ||
| } | ||
|
|
||
| // GetStep is only used by tests | ||
|
|
@@ -91,7 +92,10 @@ func (alloc *allocator) NextGlobalAutoID(tableID int64) (int64, error) { | |
| return errors.Trace(err1) | ||
| }) | ||
| metrics.AutoIDHistogram.WithLabelValues(metrics.GlobalAutoID, metrics.RetLabel(err)).Observe(time.Since(startTime).Seconds()) | ||
| if alloc.isUnsigned { | ||
| return int64(uint64(autoID) + 1), err | ||
| } | ||
| return autoID + 1, err | ||
| } | ||
|
|
||
| // Rebase implements autoid.Allocator Rebase interface. | ||
|
|
@@ -104,40 +108,69 @@ func (alloc *allocator) Rebase(tableID, requiredBase int64, allocIDs bool) error | |
|
|
||
| alloc.mu.Lock() | ||
| defer alloc.mu.Unlock() | ||
|
|
||
| // Satisfied by alloc.base, nothing to do. | ||
| if !alloc.isUnsigned && requiredBase <= alloc.base { | ||
| return nil | ||
| } else if alloc.isUnsigned && uint64(requiredBase) <= uint64(alloc.base) { | ||
| return nil | ||
| } | ||
|
|
||
| // Satisfied by alloc.end, need to update alloc.base. | ||
| if !alloc.isUnsigned && requiredBase <= alloc.end { | ||
| alloc.base = requiredBase | ||
| return nil | ||
| } else if alloc.isUnsigned && uint64(requiredBase) <= uint64(alloc.end) { | ||
| alloc.base = requiredBase | ||
| return nil | ||
| } | ||
| var newBase, newEnd int64 | ||
| var uNewBase, uNewEnd uint64 | ||
| startTime := time.Now() | ||
| err := kv.RunInNewTxn(alloc.store, true, func(txn kv.Transaction) error { | ||
| m := meta.NewMeta(txn) | ||
| currentEnd, err1 := m.GetAutoTableID(alloc.dbID, tableID) | ||
| if err1 != nil { | ||
| return errors.Trace(err1) | ||
| } | ||
| uCurrentEnd, uRequiredBase := uint64(currentEnd), uint64(requiredBase) | ||
| if allocIDs { | ||
| if alloc.isUnsigned { | ||
|
There was a problem hiding this comment. You want to prevent overflow? There was a problem hiding this comment. Yes, There was a problem hiding this comment. Well, maybe error or warning... There was a problem hiding this comment. This check is used to prevent the It may be reasonable to change alloc.end to math.Uint64 if it will overflow? There was a problem hiding this comment. If alloc.end overflow, what will happen? There was a problem hiding this comment. @tiancaiamao tidb> create table t(a bigint signed not null auto_increment, unique key(a));
Query OK, 0 rows affected (0.02 sec)
tidb> insert into t value(9223372036854775806);
Query OK, 1 row affected (0.00 sec)
tidb> insert into t value();
Query OK, 1 row affected (0.00 sec)
tidb> insert into t value();
Query OK, 1 row affected (0.00 sec)
tidb> insert into t value();
Query OK, 1 row affected (0.00 sec)
tidb> insert into t value();
Query OK, 1 row affected (0.00 sec)
tidb> select * from t;
+----------------------+
| a |
+----------------------+
| -9223372036854775808 |
| -9223372036854775806 |
| -9223372036854775804 |
| -9223372036854775802 |
| 9223372036854775806 |
+----------------------+
5 rows in set (0.00 sec)There was a problem hiding this comment. Overwrite the old row id is dangerous for data consistency. There was a problem hiding this comment. As a tradeoff, #8181 (review) may be better? There was a problem hiding this comment. I think throw error is simple, easier, and more robust. |
||
| uNewBase = mathutil.MaxUint64(uCurrentEnd, uRequiredBase) | ||
| uNewEnd = uNewBase + uint64(step) | ||
| } else { | ||
| newBase = mathutil.MaxInt64(currentEnd, requiredBase) | ||
| newEnd = newBase + step | ||
| } | ||
| } else { | ||
|
|
||
| if !alloc.isUnsigned && currentEnd >= requiredBase { | ||
|
There was a problem hiding this comment. !alloc.isUnsigned will always be true here? |
||
| newBase = currentEnd | ||
| newEnd = currentEnd | ||
| // Required base satisfied, we don't need to update KV. | ||
| return nil | ||
| } else if alloc.isUnsigned && uCurrentEnd >= uRequiredBase { | ||
| uNewBase = uCurrentEnd | ||
| uNewEnd = uCurrentEnd | ||
| return nil | ||
| } | ||
| // If we don't want to allocate IDs, for example when creating a table with a given base value, | ||
| // We need to make sure when other TiDB server allocates ID for the first time, requiredBase + 1 | ||
| // will be allocated, so we need to increase the end to exactly the requiredBase. | ||
| if !alloc.isUnsigned { | ||
| newBase = requiredBase | ||
| newEnd = requiredBase | ||
| } else { | ||
| uNewBase = uRequiredBase | ||
| uNewEnd = uRequiredBase | ||
| } | ||
|
|
||
| } | ||
| if !alloc.isUnsigned { | ||
| _, err1 = m.GenAutoTableID(alloc.dbID, tableID, newEnd-currentEnd) | ||
| } else { | ||
| _, err1 = m.GenAutoTableID(alloc.dbID, tableID, int64(uNewEnd-uCurrentEnd)) | ||
| } | ||
| return errors.Trace(err1) | ||
| }) | ||
| metrics.AutoIDHistogram.WithLabelValues(metrics.TableAutoIDRebase, metrics.RetLabel(err)).Observe(time.Since(startTime).Seconds()) | ||
|
|
@@ -237,10 +270,11 @@ func (alloc *memoryAllocator) Alloc(tableID int64) (int64, error) { | |
| } | ||
|
|
||
| // NewAllocator returns a new auto increment id generator on the store. | ||
| func NewAllocator(store kv.Storage, dbID int64, isUnsigned bool) Allocator { | ||
| return &allocator{ | ||
| store: store, | ||
| dbID: dbID, | ||
| isUnsigned: isUnsigned, | ||
| } | ||
| } | ||
|
|
||
|
|
||
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is better to extract these lines to a function.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you mean line1024~1028?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I see some similar code in this PR.