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

Bugfix: UUIDGenerator generates duplicated id #2972

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Bugfix: UUIDGenerator generates duplicated id #2972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31d0e57
修复生成重复UUID，造成branchId冲突
yujianfei1986 Aug 4, 2020
de83808
Merge branch 'develop' into duplicate_branchId
l81893521 Aug 5, 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
19 changes: 9 additions & 10 deletions common/src/main/java/io/seata/common/util/IdWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,25 +94,24 @@ public IdWorker(long workerId) {
*
* @return SnowflakeId
*/
public long nextId() {
public synchronized long nextId() {
long timestamp = timeGen();

if (timestamp < lastTimestamp) {
throw new RuntimeException(String.format(
"clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
}

synchronized (this) {
if (lastTimestamp == timestamp) {
sequence = (sequence + 1) & sequenceMask;
if (sequence == 0) {
timestamp = tilNextMillis(lastTimestamp);
}
} else {
sequence = 0L;
if (lastTimestamp == timestamp) {
sequence = (sequence + 1) & sequenceMask;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the sequence is different, why cause the duplicated id?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my fault.

if (sequence == 0) {
timestamp = tilNextMillis(lastTimestamp);
}
lastTimestamp = timestamp;
} else {
sequence = 0L;
}
lastTimestamp = timestamp;

return ((timestamp - twepoch) << timestampLeftShift) | (workerId << workerIdShift) | sequence;
}

Expand Down