HHH-18377 Fixed bug with sequence resetting

cigaly · cigaly · commit 48fa03fa2fbf · 2024-09-30T09:32:22.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion6Strategy.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/UuidVersion6Strategy.java
@@ -98,9 +98,9 @@ public UUID generateUuid(SharedSessionContractImplementor session) {
 	private long getSequence(final long currentTimestamp) {
 		lock.lock();
 		try {
-			if ( this.currentTimestamp > currentTimestamp ) {
+			if ( this.currentTimestamp < currentTimestamp ) {
 				this.currentTimestamp = currentTimestamp;
-				clockSequence.set( 0 );
+				clockSequence.updateAndGet( l -> l & 0x1FFFL );
 			}
 		}
 		finally {

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,9 @@ public UUID generateUuid(SharedSessionContractImplementor session) {`
`98`	`98`	`private long getSequence(final long currentTimestamp) {`
`99`	`99`	`lock.lock();`
`100`	`100`	`try {`
`101`		`- if ( this.currentTimestamp > currentTimestamp ) {`
	`101`	`+ if ( this.currentTimestamp < currentTimestamp ) {`
`102`	`102`	`this.currentTimestamp = currentTimestamp;`
`103`		`- clockSequence.set( 0 );`
	`103`	`+ clockSequence.updateAndGet( l -> l & 0x1FFFL );`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`finally {`