HHH-15854 Write batch loading test

Author: theigl

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaPerformanceTest.java

@@ -5,6 +5,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EntityManager;
@@ -19,68 +20,40 @@
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 
-import org.hibernate.engine.internal.StatefulPersistenceContext;
-import org.hibernate.engine.spi.CollectionKey;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.loader.BatchFetchStyle;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
-@Ignore("Manual performance test")
 public class CriteriaPerformanceTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Override
 	public Class[] getAnnotatedClasses() {
 		return new Class[] {
 				CriteriaPerformanceTest.Author.class,
-				CriteriaPerformanceTest.Book.class,
-				CriteriaPerformanceTest.Other.class
+				CriteriaPerformanceTest.Book.class
 		};
 	}
 
-	/**
-	 * This test demonstrates that fetching entities with associations fires expensive initializers in 6.1 even
-	 * if the entities are already present in the 1LC.
-	 * <p>
-	 * To verify this behavior, set a breakpoint in {@link StatefulPersistenceContext#getCollection(CollectionKey)}.
-	 * In 6.1, breakpoint will be hit for every collection of books associated with each author.
-	 * In 5.6, breakpoint will never be hit.
-	 */
-	@Test
-	public void testFetchEntityWithAssociations() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			for ( int i = 0; i < 1000; i++ ) {
-				populateData( entityManager );
-			}
-
-			final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
-			final CriteriaQuery<Author> query = builder.createQuery( Author.class );
-			query.from( Author.class );
-
-			final List<Author> author = entityManager.createQuery( query ).getResultList();
-			assertNotNull( author );
-		} );
+	@Override
+	protected void addConfigOptions(Map options) {
+		options.put( AvailableSettings.BATCH_FETCH_STYLE, BatchFetchStyle.DYNAMIC );
+		options.put( AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, 10 );
 	}
 
-	/**
-	 * This test demonstrates the difference in performance for a simple criteria query between 5.6 and 6.1.
-	 * (5.6 is about 30% faster on my machine)
-	 * <p>
-	 * The difference in performance seems to have two main causes:
-	 * <p>
-	 * 1. Elevated access to the persistence context as demonstrated by the test above
-	 * 2. Missing query plan cache for criteria queries (possibly)
-	 */
 	@Test
 	public void testFetchEntityWithAssociationsPerformance() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			for ( int i = 0; i < 1000; i++ ) {
 				populateData( entityManager );
 			}
-
+		} );
+		doInJPA( this::entityManagerFactory, entityManager -> {
 			final Instant startTime = Instant.now();
 
 			for ( int i = 0; i < 100_000; i++ ) {
@@ -89,6 +62,7 @@ public void testFetchEntityWithAssociationsPerformance() {
 				query.from( Author.class );
 				final List<Author> authors = entityManager.createQuery( query ).getResultList();
 				assertNotNull( authors );
+				authors.forEach( author -> assertFalse( author.books.isEmpty() ) );
 			}
 
 			System.out.println( MessageFormat.format(
@@ -99,100 +73,6 @@ public void testFetchEntityWithAssociationsPerformance() {
 		} );
 	}
 
-	/**
-	 * This test demonstrates the difference in performance for a simple criteria query between 5.6 and 6.1.
-	 * (5.6 is about 30% faster on my machine)
-	 * <p>
-	 * The difference in performance seems to have two main causes:
-	 * <p>
-	 * 1. Elevated access to the persistence context as demonstrated by the test above
-	 * 2. Missing query plan cache for criteria queries (possibly)
-	 */
-	@Test
-	public void testFetchEntityPerformance() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			for ( int i = 0; i < 1000; i++ ) {
-				populateSimpleData( entityManager );
-			}
-
-			final Instant startTime = Instant.now();
-
-			for ( int i = 0; i < 100_000; i++ ) {
-				final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
-				final CriteriaQuery<Other> query = builder.createQuery( Other.class );
-				query.from( Other.class );
-				final List<Other> others = entityManager.createQuery( query ).getResultList();
-				assertNotNull( others );
-			}
-
-			System.out.println( MessageFormat.format(
-					"{0} took {1}",
-					"Simple Query",
-					Duration.between( startTime, Instant.now() )
-			) );
-		} );
-	}
-
-	/**
-	 * This test demonstrates the difference in performance for a simple criteria query between 5.6 and 6.1.
-	 * (5.6 is about 5-7% faster on my machine)
-	 */
-	@Test
-	public void testFetchEntityPerformanceSmallTransactions() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			for ( int i = 0; i < 1000; i++ ) {
-				populateSimpleData( entityManager );
-			}
-		} );
-
-		final Instant startTime = Instant.now();
-
-		for ( int i = 0; i < 100_000; i++ ) {
-			doInJPA( this::entityManagerFactory, entityManager -> {
-				final CriteriaBuilder builder = entityManager.getCriteriaBuilder();
-				final CriteriaQuery<Other> query = builder.createQuery( Other.class );
-				query.from( Other.class );
-				final List<Other> others = entityManager.createQuery( query ).getResultList();
-				assertNotNull( others );
-			} );
-		}
-
-		System.out.println( MessageFormat.format(
-				"{0} took {1}",
-				"Simple Query Criteria",
-				Duration.between( startTime, Instant.now() )
-		) );
-	}
-
-	/**
-	 * This test demonstrates the difference in performance for a simple HQL query between 5.6 and 6.1.
-	 * (5.6 is about 5-7% faster on my machine)
-	 */
-	@Test
-	public void testFetchEntityPerformanceSmallTransactionsHql() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			for ( int i = 0; i < 1000; i++ ) {
-				populateSimpleData( entityManager );
-			}
-		} );
-
-		final Instant startTime = Instant.now();
-
-		for ( int i = 0; i < 100_000; i++ ) {
-			doInJPA( this::entityManagerFactory, entityManager -> {
-				final List<Other> others = entityManager.createQuery( "SELECT p FROM Other p", Other.class )
-						.getResultList();
-				assertNotNull( others );
-			} );
-		}
-
-		System.out.println( MessageFormat.format(
-				"{0} took {1}",
-				"Simple Query HQL",
-				Duration.between( startTime, Instant.now() )
-		) );
-	}
-
 	public void populateData(EntityManager entityManager) {
 		final Book book = new Book();
 		book.name = "HTTP Definitive guide";
@@ -204,13 +84,7 @@ public void populateData(EntityManager entityManager) {
 		book.author = author;
 
 		entityManager.persist( author );
-	}
-
-	public void populateSimpleData(EntityManager entityManager) {
-		final Other other = new Other();
-		other.name = "Other";
-
-		entityManager.persist( other );
+		entityManager.persist( book );
 	}
 
 	@Entity(name = "Author")
@@ -241,15 +115,4 @@ public static class Book {
 		@JoinColumn(name = "author_id", nullable = false)
 		public Author author;
 	}
-
-	@Entity(name = "Other")
-	@Table(name = "Other")
-	public static class Other {
-		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
-		public Long otherId;
-
-		@Column
-		public String name;
-	}
 }