Skip to content

Fix Cockroach connection lock_timeout tests #10769

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

Merged
merged 1 commit into from
Aug 18, 2025
Merged

Fix Cockroach connection lock_timeout tests #10769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions ...rnate-core/src/main/java/org/hibernate/dialect/lock/internal/CockroachLockingSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import java.sql.Connection;

import static org.hibernate.Timeouts.NO_WAIT;
import static org.hibernate.Timeouts.NO_WAIT_MILLI;
import static org.hibernate.Timeouts.SKIP_LOCKED_MILLI;
import static org.hibernate.Timeouts.WAIT_FOREVER;
Expand Down Expand Up @@ -82,11 +81,9 @@ public Timeout getLockTimeout(Connection connection, SessionFactoryImplementor f
return Helper.getLockTimeout(
"show lock_timeout",
(resultSet) -> {
// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
final int millis = resultSet.getInt( 1 );
return switch ( millis ) {
case 0 -> NO_WAIT;
case 100000000 -> WAIT_FOREVER;
case 0 -> WAIT_FOREVER;
default -> Timeout.milliseconds( millis );
};
},
Expand All @@ -103,15 +100,14 @@ public void setLockTimeout(
Helper.setLockTimeout(
timeout,
(t) -> {
// see https://dev.mysql.com/doc/refman/8.4/en/innodb-parameters.html#sysvar_innodb_lock_wait_timeout
final int milliseconds = timeout.milliseconds();
if ( milliseconds == SKIP_LOCKED_MILLI ) {
throw new HibernateException( "Connection lock-timeout does not accept skip-locked" );
}
if ( milliseconds == WAIT_FOREVER_MILLI ) {
return 100000000;
if ( milliseconds == NO_WAIT_MILLI ) {
throw new HibernateException( "Connection lock-timeout does not accept no-wait" );
}
return milliseconds;
return milliseconds == WAIT_FOREVER_MILLI ? 0 : milliseconds;
},
"set lock_timeout = %s",
connection,
Expand Down
Loading