Skip to content

Mac and locking fixes #10995

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 2 commits into from
Sep 24, 2025
Merged

Mac and locking fixes #10995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e75ce
Fix processor count determination on MacOS
beikov Sep 24, 2025
803e289
Fix applying lock timeout on follow-on lock action
beikov Sep 24, 2025
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
23 changes: 13 additions & 10 deletions docker_db.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@ else
fi
fi

DB_COUNT=1
if [[ "$(uname -s)" == "Darwin" ]]; then
IS_OSX=true
DB_COUNT=$(($(sysctl -n hw.physicalcpu)/2))
else
IS_OSX=false
DB_COUNT=$(($(nproc)/2))
fi

mysql() {
Expand Down Expand Up @@ -128,7 +131,7 @@ mysql_setup() {
fi

databases=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
databases+=("hibernate_orm_test_${n}")
done
Expand Down Expand Up @@ -203,7 +206,7 @@ mariadb_setup() {
mariadb_wait_until_start

databases=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
databases+=("hibernate_orm_test_${n}")
done
Expand Down Expand Up @@ -261,7 +264,7 @@ postgresql_17() {

postgresql_setup() {
databases=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
databases+=("hibernate_orm_test_${n}")
done
Expand Down Expand Up @@ -377,7 +380,7 @@ edb_17() {

edb_setup() {
databases=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
databases+=("hibernate_orm_test_${n}")
done
Expand Down Expand Up @@ -494,7 +497,7 @@ EOF

db2_setup() {
pids=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
$CONTAINER_CLI exec -t db2 su - orm_test bash -c ". /database/config/orm_test/sqllib/db2profile; /database/config/orm_test/sqllib/bin/db2 'connect to orm_test'; /database/config/orm_test/sqllib/bin/db2 'create tenant ORM_${n}';" &
pids[${i}]=$!
Expand Down Expand Up @@ -588,7 +591,7 @@ mssql_2017() {
echo "SQL Server successfully started"
fi
echo "Creating databases..."
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
$CONTAINER_CLI exec mssql bash -c "echo \"create database hibernate_orm_test_${n} collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test_${n} set READ_COMMITTED_SNAPSHOT ON\" | /opt/mssql-tools/bin/sqlcmd -C -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin"
done
Expand Down Expand Up @@ -616,7 +619,7 @@ mssql_2022() {
echo "SQL Server successfully started"
fi
echo "Creating databases..."
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
$CONTAINER_CLI exec mssql bash -c "echo \"create database hibernate_orm_test_${n} collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test_${n} set READ_COMMITTED_SNAPSHOT ON\" | /opt/mssql-tools/bin/sqlcmd -C -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin"
done
Expand Down Expand Up @@ -644,7 +647,7 @@ mssql_2025() {
echo "SQL Server successfully started"
fi
echo "Creating databases..."
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
$CONTAINER_CLI exec mssql bash -c "echo \"create database hibernate_orm_test_${n} collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test_${n} set READ_COMMITTED_SNAPSHOT ON\" | /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin"
done
Expand Down Expand Up @@ -795,7 +798,7 @@ oracle_setup() {
echo "Oracle successfully started"

users=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
users+=("hibernate_orm_test_${n}")
done
Expand Down Expand Up @@ -889,7 +892,7 @@ oracle_free_setup() {
echo "Oracle successfully started"

users=()
for n in $(seq 1 $(($(nproc)/2)))
for n in $(seq 1 $DB_COUNT)
do
users+=("hibernate_orm_test_${n}")
done
Expand Down
3 changes: 1 addition & 2 deletions hibernate-core/src/main/java/org/hibernate/sql/exec/internal/lock/FollowOnLockingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.Locking;
import org.hibernate.Timeouts;
import org.hibernate.engine.spi.CollectionKey;
import org.hibernate.engine.spi.EffectiveEntityGraph;
import org.hibernate.engine.spi.EntityKey;
Expand Down Expand Up @@ -202,7 +201,7 @@ private TableLock resolveTableLock(
private QueryOptions buildLockingOptions(ExecutionContext executionContext) {
final QueryOptionsImpl lockingQueryOptions = new QueryOptionsImpl();
lockingQueryOptions.getLockOptions().setLockMode( lockMode );
lockingQueryOptions.getLockOptions().setTimeout( Timeouts.WAIT_FOREVER );
lockingQueryOptions.getLockOptions().setTimeout( lockTimeout );
lockingQueryOptions.getLockOptions().setFollowOnStrategy( Locking.FollowOn.DISALLOW );
if ( executionContext.getQueryOptions().isReadOnly() == Boolean.TRUE ) {
lockingQueryOptions.setReadOnly( true );
Expand Down
Loading