HHH-17989 - Fix for StatisticsImplementor.closeStatement() never called

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcEventHandler.java

@@ -80,6 +80,10 @@ public void jdbcPrepareStatementStart() {
 		if ( sessionListener != null ) {
 			sessionListener.jdbcPrepareStatementStart();
 		}
+
+		if ( statistics != null && statistics.isStatisticsEnabled() ) {
+			statistics.prepareStatement();
+		}
 	}
 
 	public void jdbcPrepareStatementEnd() {
@@ -88,7 +92,7 @@ public void jdbcPrepareStatementEnd() {
 		}
 
 		if ( statistics != null && statistics.isStatisticsEnabled() ) {
-			statistics.prepareStatement();
+			statistics.closeStatement();
 		}
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionStatisticsTest.java

@@ -37,17 +37,22 @@ void test(SessionFactoryScope scope) {
 		assertEquals(0, statistics.getEntityUpdateCount());
 		assertEquals(0, statistics.getEntityDeleteCount());
 		assertEquals(0, statistics.getEntityLoadCount());
+		assertEquals(0, statistics.getPrepareStatementCount());
 		Person person = new Person();
 		person.name = "Gavin";
 		person.handles.add("@1ovthafew");
 		scope.inStatelessTransaction(s -> s.insert(person));
 		assertEquals(1, statistics.getEntityInsertCount());
 		assertEquals(1, statistics.getCollectionRecreateCount());
+		assertEquals(3, statistics.getPrepareStatementCount());
+		assertEquals(3, statistics.getCloseStatementCount());
 		scope.inStatelessSession(s -> s.get(Person.class, person.id));
 		assertEquals(1, statistics.getEntityLoadCount());
 		assertEquals(0, statistics.getEntityFetchCount());
 		assertEquals(1, statistics.getCollectionLoadCount());
 		assertEquals(0, statistics.getCollectionFetchCount());
+		assertEquals(4, statistics.getPrepareStatementCount());
+		assertEquals(4, statistics.getCloseStatementCount());
 		person.name = "Gavin King";
 		scope.inStatelessTransaction(s -> s.update(person));
 		assertEquals(1, statistics.getEntityUpdateCount());
@@ -56,25 +61,37 @@ void test(SessionFactoryScope scope) {
 		assertEquals(2, statistics.getEntityLoadCount());
 		assertEquals(2, statistics.getCollectionLoadCount());
 		assertEquals(0, statistics.getCollectionFetchCount());
+		assertEquals(8, statistics.getPrepareStatementCount());
+		assertEquals(8, statistics.getCloseStatementCount());
 		scope.inStatelessSession(s -> s.get(s.createEntityGraph(Person.class), FETCH, person.id));
 		assertEquals(3, statistics.getEntityLoadCount());
 		assertEquals(2, statistics.getCollectionLoadCount());
 		assertEquals(0, statistics.getCollectionFetchCount());
+		assertEquals(9, statistics.getPrepareStatementCount());
+		assertEquals(9, statistics.getCloseStatementCount());
 		scope.inStatelessSession(s -> s.fetch(s.get(s.createEntityGraph(Person.class), FETCH, person.id).handles));
 		assertEquals(4, statistics.getEntityLoadCount());
 		assertEquals(3, statistics.getCollectionLoadCount());
 		assertEquals(1, statistics.getCollectionFetchCount());
+		assertEquals(11, statistics.getPrepareStatementCount());
+		assertEquals(11, statistics.getCloseStatementCount());
 		scope.inStatelessSession(s -> s.createQuery("from Person", Person.class).getSingleResult());
 		assertEquals(5, statistics.getEntityLoadCount());
 		assertEquals(4, statistics.getCollectionLoadCount());
 		assertEquals(2, statistics.getCollectionFetchCount());
+		assertEquals(13, statistics.getPrepareStatementCount());
+		assertEquals(13, statistics.getCloseStatementCount());
 		person.handles.add("hello world");
 		scope.inStatelessTransaction(s -> s.upsert(person));
 		assertEquals(2, statistics.getCollectionUpdateCount());
+		assertEquals(17, statistics.getPrepareStatementCount());
+		assertEquals(17, statistics.getCloseStatementCount());
 		scope.inStatelessTransaction(s -> s.delete(person));
 		assertEquals(1, statistics.getEntityDeleteCount());
 		assertEquals(1, statistics.getCollectionRemoveCount());
 		assertEquals(4, statistics.getTransactionCount());
+		assertEquals(19, statistics.getPrepareStatementCount());
+		assertEquals(19, statistics.getCloseStatementCount());
 	}
 
 	@Entity(name="Person")

hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatisticsWithNoCachingTest.java

@@ -21,11 +21,11 @@
 @DomainModel
 @SessionFactory
 @ServiceRegistry(
-		settingProviders = @SettingProvider(provider = StatisticsWithNoCachingTest.RegionFacrotySettingProvider.class, settingName = AvailableSettings.CACHE_REGION_FACTORY)
+		settingProviders = @SettingProvider(provider = StatisticsWithNoCachingTest.RegionFactorySettingProvider.class, settingName = AvailableSettings.CACHE_REGION_FACTORY)
 )
 public class StatisticsWithNoCachingTest {
 
-	public static class RegionFacrotySettingProvider implements SettingProvider.Provider<String> {
+	public static class RegionFactorySettingProvider implements SettingProvider.Provider<String> {
 
 		@Override
 		public String getSetting() {