Skip to content

Commit 22e4e62

Browse files
committed
Fix Cockroach connection lock_timeout tests
1 parent 447a5e0 commit 22e4e62

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/CockroachLockingSupport.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import java.sql.Connection;
1717

18-
import static org.hibernate.Timeouts.NO_WAIT;
1918
import static org.hibernate.Timeouts.NO_WAIT_MILLI;
2019
import static org.hibernate.Timeouts.SKIP_LOCKED_MILLI;
2120
import static org.hibernate.Timeouts.WAIT_FOREVER;
@@ -82,11 +81,9 @@ public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor f
8281
return Helper.getLockTimeout(
8382
"show lock_timeout",
8483
(resultSet) -> {
85-
// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
8684
final int millis = resultSet.getInt( 1 );
8785
return switch ( millis ) {
88-
case 0 -> NO_WAIT;
89-
case 100000000 -> WAIT_FOREVER;
86+
case 0 -> WAIT_FOREVER;
9087
default -> Timeout.milliseconds( millis );
9188
};
9289
},
@@ -103,15 +100,14 @@ public void setLockTimeout(
103100
Helper.setLockTimeout(
104101
timeout,
105102
(t) -> {
106-
// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
107103
final int milliseconds = timeout.milliseconds();
108104
if ( milliseconds == SKIP_LOCKED_MILLI ) {
109105
throw new HibernateException( "Connection lock-timeout does not accept skip-locked" );
110106
}
111-
if ( milliseconds == WAIT_FOREVER_MILLI ) {
112-
return 100000000;
107+
if ( milliseconds == NO_WAIT_MILLI ) {
108+
throw new HibernateException( "Connection lock-timeout does not accept no-wait" );
113109
}
114-
return milliseconds;
110+
return milliseconds == WAIT_FOREVER_MILLI ? 0 : milliseconds;
115111
},
116112
"set lock_timeout = %s",
117113
connection,

0 commit comments

Comments
 (0)