[#2534] Add test for session.find() will not respect NOWAIT locks starting from HR 3.1

Author: dreab8

hibernate-reactive-core/src/test/java/org/hibernate/reactive/FindByIdWithLockTest.java

@@ -5,11 +5,17 @@
  */
 package org.hibernate.reactive;
 
+import org.hibernate.LockMode;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.reactive.testing.SqlStatementTracker;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import io.vertx.junit5.Timeout;
@@ -22,11 +28,38 @@
 import jakarta.persistence.OneToMany;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.reactive.containers.DatabaseConfiguration.dbType;
 
 @Timeout(value = 10, timeUnit = TimeUnit.MINUTES)
 public class FindByIdWithLockTest extends BaseReactiveTest {
 	private static final Long CHILD_ID = 1L;
 
+	private static SqlStatementTracker sqlTracker;
+
+	@Override
+	protected Configuration constructConfiguration() {
+		Configuration configuration = super.constructConfiguration();
+
+		// Construct a tracker that collects query statements via the SqlStatementLogger framework.
+		// Pass in configuration properties to hand off any actual logging properties
+		sqlTracker = new SqlStatementTracker( FindByIdWithLockTest::selectQueryFilter, configuration.getProperties() );
+		return configuration;
+	}
+
+	@BeforeEach
+	public void clearTracker() {
+		sqlTracker.clear();
+	}
+
+	@Override
+	protected void addServices(StandardServiceRegistryBuilder builder) {
+		sqlTracker.registerService( builder );
+	}
+
+	private static boolean selectQueryFilter(String s) {
+		return s.toLowerCase().startsWith( "select " );
+	}
+
 	@Override
 	protected Collection<Class<?>> annotatedEntities() {
 		return List.of( Parent.class, Child.class );
@@ -50,6 +83,44 @@ context, getMutinySessionFactory()
 		);
 	}
 
+	@Test
+	public void testFindUpgradeNoWait(VertxTestContext context) {
+		Child child = new Child( CHILD_ID, "And" );
+		test(
+				context, getMutinySessionFactory()
+						.withTransaction( session -> session.persistAll( child ) )
+						.invoke( () -> sqlTracker.clear() )
+						.chain( () -> getMutinySessionFactory().withTransaction( session -> session
+								.find( Child.class, CHILD_ID, LockMode.UPGRADE_NOWAIT )
+								.invoke( c -> {
+											 assertThat( c ).isNotNull();
+											 assertThat( c.getId() ).isEqualTo( CHILD_ID );
+											 String selectQuery = sqlTracker.getLoggedQueries().get( 0 );
+											 assertThat( sqlTracker.getLoggedQueries() ).hasSize( 1 );
+											 assertThat( selectQuery )
+													 .matches( this::noWaitLockingPredicate, "SQL query with nowait lock for " + dbType().name() );
+										 }
+								) ) )
+		);
+	}
+
+	/**
+	 * @return true if the query contains the expected nowait keyword for the selected database
+ 	 */
+	private boolean noWaitLockingPredicate(String selectQuery) {
+		return switch ( dbType() ) {
+			case POSTGRESQL -> selectQuery.endsWith( "for no key update of c1_0 nowait" );
+			case COCKROACHDB -> selectQuery.endsWith( "for update of c1_0 nowait" );
+			case SQLSERVER -> selectQuery.contains( "with (updlock,holdlock,rowlock,nowait)" );
+			case ORACLE -> selectQuery.contains( "for update of c1_0.id nowait" );
+			// DB2 does not support nowait
+			case DB2 -> selectQuery.contains( "for read only with rs use and keep update locks" );
+			case MARIA -> selectQuery.contains( "for update nowait" );
+			case MYSQL -> selectQuery.contains( "for update of c1_0 nowait" );
+			default -> throw new IllegalArgumentException( "Database not recognized: " + dbType().name() );
+		};
+	}
+
 	@Entity(name = "Parent")
 	public static class Parent {
 
@@ -59,7 +130,7 @@ public static class Parent {
 		private String name;
 
 		@OneToMany(fetch = FetchType.EAGER)
-		public List<Child> children;
+		public List<Child> children = new ArrayList<>();
 
 		public Parent() {
 		}
@@ -70,9 +141,6 @@ public Parent(Long id, String name) {
 		}
 
 		public void add(Child child) {
-			if ( children == null ) {
-				children = new ArrayList<>();
-			}
 			children.add( child );
 		}
 
@@ -89,7 +157,6 @@ public List<Child> getChildren() {
 		}
 	}
 
-
 	@Entity(name = "Child")
 	public static class Child {
 
@@ -109,13 +176,6 @@ public Child(Long id, String name) {
 			this.name = name;
 		}
 
-		public Child(Long id, String name, Parent parent) {
-			this.id = id;
-			this.name = name;
-			this.parent = parent;
-			parent.add( this );
-		}
-
 		public Long getId() {
 			return id;
 		}
@@ -128,6 +188,4 @@ public Parent getParent() {
 			return parent;
 		}
 	}
-
-
 }