Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-11147 - Integrate enhanced-proxy support with BatchFetchQueue

This commit is contained in:
Steve Ebersole 2019-06-27 08:46:16 -05:00
parent b5d845c89d
commit d983e29e87
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java
View File

@ -15,7 +15,6 @@ import javax.persistence.Id;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.Query;
import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOne;
import org.hibernate.annotations.LazyToOneOption; import org.hibernate.annotations.LazyToOneOption;
@ -33,9 +32,10 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
/** /**
@ -49,11 +49,36 @@ public class BatchFetchProxyTest extends BaseNonConfigCoreFunctionalTestCase {
private static int NUMBER_OF_ENTITIES = 20; private static int NUMBER_OF_ENTITIES = 20;
@Test
@TestForIssue(jiraKey = "HHH-11147")
public void testBatchAssociationFetch() {
inTransaction(
session -> {
final Statistics statistics = sessionFactory().getStatistics();
statistics.clear();
List<Employee> employees = session.createQuery( "from Employee", Employee.class ).getResultList();
assertEquals( 1, statistics.getPrepareStatementCount() );
assertEquals( NUMBER_OF_ENTITIES, employees.size() );
// trigger loading all of the Employee#employer references which should trigger the batch fetching
for ( Employee employee : employees ) {
Hibernate.initialize( employee.employer );
}
// assert that all 20 Employee and all 20 Employers have been loaded
assertThat( statistics.getEntityLoadCount(), is( 40L ) );
// but assert that it only took 3 queries (the initial plus the 2 batch fetches)
assertThat( statistics.getPrepareStatementCount(), is( 3L ) );
}
);
}
@Test @Test
@TestForIssue(jiraKey = "HHH-11147") @TestForIssue(jiraKey = "HHH-11147")
public void testBatchAssociation() { public void testBatchAssociation() {
doInHibernate( inTransaction(
this::sessionFactory, session -> { session -> {
final Statistics statistics = sessionFactory().getStatistics(); final Statistics statistics = sessionFactory().getStatistics();
statistics.clear(); statistics.clear();
List<Employee> employees = session.createQuery( "from Employee", Employee.class ).getResultList(); List<Employee> employees = session.createQuery( "from Employee", Employee.class ).getResultList();
@ -81,8 +106,8 @@ public class BatchFetchProxyTest extends BaseNonConfigCoreFunctionalTestCase {
@Test @Test
@TestForIssue(jiraKey = "HHH-11147") @TestForIssue(jiraKey = "HHH-11147")
public void testBatchEntityLoad() { public void testBatchEntityLoad() {
doInHibernate( inTransaction(
this::sessionFactory, session -> { session -> {
final Statistics statistics = sessionFactory().getStatistics(); final Statistics statistics = sessionFactory().getStatistics();
statistics.clear(); statistics.clear();
@ -121,8 +146,8 @@ public class BatchFetchProxyTest extends BaseNonConfigCoreFunctionalTestCase {
@Before @Before
public void setUpData() { public void setUpData() {
doInHibernate( inTransaction(
this::sessionFactory, session -> { session -> {
for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) {
final Employee employee = new Employee(); final Employee employee = new Employee();
employee.id = i + 1; employee.id = i + 1;
@ -139,8 +164,8 @@ public class BatchFetchProxyTest extends BaseNonConfigCoreFunctionalTestCase {
@After @After
public void cleanupDate() { public void cleanupDate() {
doInHibernate( inTransaction(
this::sessionFactory, session -> { session -> {
session.createQuery( "delete from Employee" ).executeUpdate(); session.createQuery( "delete from Employee" ).executeUpdate();
session.createQuery( "delete from Employer" ).executeUpdate(); session.createQuery( "delete from Employer" ).executeUpdate();
} }
@ -153,6 +178,7 @@ public class BatchFetchProxyTest extends BaseNonConfigCoreFunctionalTestCase {
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, "true" ); ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, "true" );
ssrb.applySetting( AvailableSettings.FORMAT_SQL, "false" ); ssrb.applySetting( AvailableSettings.FORMAT_SQL, "false" );
ssrb.applySetting( AvailableSettings.GENERATE_STATISTICS, "true" ); ssrb.applySetting( AvailableSettings.GENERATE_STATISTICS, "true" );
ssrb.applySetting( AvailableSettings.SHOW_SQL, true );
} }
@Override @Override