HHH-14892 Enable parallel testing for SQL Server

Author: beikov

docker_db.sh

@@ -577,7 +577,7 @@ mssql_2017() {
  do
  # We need a database that uses a non-lock based MVCC approach
  # https://github.com/microsoft/homebrew-mssql-release/issues/2#issuecomment-682285561
- $CONTAINER_CLI exec mssql bash -c 'echo "create database hibernate_orm_test collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test set READ_COMMITTED_SNAPSHOT ON" | /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' && break
+ $CONTAINER_CLI exec mssql bash -c 'echo "select 1" | /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' 2>&1 1>/dev/null && break
  echo "Waiting for SQL Server to start..."
  n=$((n+1))
  sleep 5
@@ -587,6 +587,12 @@ mssql_2017() {
  else
  echo "SQL Server successfully started"
  fi
+ echo "Creating databases..."
+ for n in $(seq 1 $(($(nproc)/2)))
+ 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
+ echo "SQL Server is ready"
 }
 
 mssql_2022() {
@@ -599,7 +605,7 @@ mssql_2022() {
  do
  # We need a database that uses a non-lock based MVCC approach
  # https://github.com/microsoft/homebrew-mssql-release/issues/2#issuecomment-682285561
- $CONTAINER_CLI exec mssql bash -c 'echo "create database hibernate_orm_test collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test set READ_COMMITTED_SNAPSHOT ON" | /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' && break
+ $CONTAINER_CLI exec mssql bash -c 'echo "select 1" | /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' 2>&1 1>/dev/null && break
  echo "Waiting for SQL Server to start..."
  n=$((n+1))
  sleep 5
@@ -609,6 +615,12 @@ mssql_2022() {
  else
  echo "SQL Server successfully started"
  fi
+ echo "Creating databases..."
+ for n in $(seq 1 $(($(nproc)/2)))
+ 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
+ echo "SQL Server is ready"
 }
 
 mssql_2025() {
@@ -621,7 +633,7 @@ mssql_2025() {
  do
  # We need a database that uses a non-lock based MVCC approach
  # https://github.com/microsoft/homebrew-mssql-release/issues/2#issuecomment-682285561
- $CONTAINER_CLI exec mssql bash -c 'echo "create database hibernate_orm_test collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test set READ_COMMITTED_SNAPSHOT ON" | /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' && break
+ $CONTAINER_CLI exec mssql bash -c 'echo "select 1" | /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' 2>&1 1>/dev/null && break
  echo "Waiting for SQL Server to start..."
  n=$((n+1))
  sleep 5
@@ -631,6 +643,12 @@ mssql_2025() {
  else
  echo "SQL Server successfully started"
  fi
+ echo "Creating databases..."
+ for n in $(seq 1 $(($(nproc)/2)))
+ 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
+ echo "SQL Server is ready"
 }
 
 sybase() {

hibernate-core/hibernate-core.gradle

@@ -262,7 +262,7 @@ tasks.withType( Test.class ).each { test ->
  // see GradleParallelTestingResolver for how the test worker id is resolved in JDBC configs
  if ( project.db == "h2" || project.db == "hsqldb" || project.db == "pgsql_ci" || project.db == "edb_ci"
  || project.db == "oracle_ci" || project.db == "oracle_xe_ci" || project.db == "mysql_ci" || project.db == "mariadb_ci"
- || project.db == "db2_ci") {
+ || project.db == "db2_ci" || project.db == "mssql_ci" ) {
  // Most systems have multi-threading and maxing out a core on both threads will hurt performance
  // Also, as soon as we hit 16+ threads, the returns are diminishing, so divide by 4
  def threadCount = Runtime.runtime.availableProcessors()

hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaExportSqlServerWithSequenceDefaultSchemaCatalog.java

@@ -30,6 +30,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
+import static org.hibernate.testing.jdbc.GradleParallelTestingResolver.resolveUsername;
 
 /**
  * @author Andrea Boriero
@@ -52,7 +53,7 @@ public void shouldCreateIndex() {
 public void setUp() {
 serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
 .applySetting( Environment.DEFAULT_SCHEMA, "dbo" )
-.applySetting( Environment.DEFAULT_CATALOG, "hibernate_orm_test" )
+.applySetting( Environment.DEFAULT_CATALOG, resolveUsername( "hibernate_orm_test_$worker" ) )
 .build();
 metadata = (MetadataImplementor) new MetadataSources( serviceRegistry )
 .addAnnotatedClass( MyEntity.class )

hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/JoinTableWithDefaultSchemaTest.java

@@ -31,6 +31,8 @@
 import org.hibernate.tool.schema.TargetType;
 import org.junit.Test;
 
+import static org.hibernate.testing.jdbc.GradleParallelTestingResolver.resolveUsername;
+
 /**
  * @author Chris Cranford
  */
@@ -41,7 +43,7 @@ public class JoinTableWithDefaultSchemaTest extends BaseUnitTestCase {
 @RequiresDialect(SQLServerDialect.class)
 public void testGetTableDataForJoinTableWithDefaultSchema() {
 StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
-.applySetting( AvailableSettings.DEFAULT_CATALOG, "hibernate_orm_test" )
+.applySetting( AvailableSettings.DEFAULT_CATALOG, resolveUsername( "hibernate_orm_test_$worker" ) )
 .build();
 try {
 final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )

hibernate-envers/hibernate-envers.gradle

@@ -58,7 +58,7 @@ tasks.withType( Test.class ).each { test ->
  // see GradleParallelTestingResolver for how the test worker id is resolved in JDBC configs
  if ( project.db == "h2" || project.db == "hsqldb" || project.db == "pgsql_ci" || project.db == "edb_ci"
  || project.db == "oracle_ci" || project.db == "oracle_xe_ci" || project.db == "mysql_ci" || project.db == "mariadb_ci"
- || project.db == "db2_ci") {
+ || project.db == "db2_ci" || project.db == "mssql_ci" ) {
  // Most systems have multi-threading and maxing out a core on both threads will hurt performance
  // Also, as soon as we hit 16+ threads, the returns are diminishing, so divide by 4
  def threadCount = Runtime.runtime.availableProcessors()

local-build-plugins/src/main/groovy/local.databases.gradle

@@ -314,7 +314,7 @@ ext {
  'jdbc.driver': 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
  'jdbc.user' : 'sa',
  'jdbc.pass' : 'Hibernate_orm_test',
- 'jdbc.url' : 'jdbc:sqlserver://' + dbHost + ';databaseName=hibernate_orm_test;sendTimeAsDatetime=false;trustServerCertificate=true',
+ 'jdbc.url' : 'jdbc:sqlserver://' + dbHost + ';databaseName=hibernate_orm_test_$worker;sendTimeAsDatetime=false;trustServerCertificate=true',
  'jdbc.datasource' : 'com.microsoft.sqlserver.jdbc.SQLServerDriver',
 // 'jdbc.datasource' : 'com.microsoft.sqlserver.jdbc.SQLServerDataSource',
  'connection.init_sql' : ''