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

Re-enabled additional tests

This commit is contained in:
Andrea Boriero 2022-03-01 11:26:12 +01:00 committed by Andrea Boriero
parent cc02b926fb
commit 52d15cf769
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java
View File

@ -17,7 +17,6 @@ import org.hibernate.stat.Statistics;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.Jpa;
import org.hibernate.testing.orm.junit.NotImplementedYet;
import org.hibernate.testing.orm.junit.Setting; import org.hibernate.testing.orm.junit.Setting;
import org.hibernate.testing.orm.junit.SettingProvider; import org.hibernate.testing.orm.junit.SettingProvider;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -28,7 +27,6 @@ import jakarta.persistence.TypedQuery;
import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE; import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
/** /**
* @author Gail Badner * @author Gail Badner
*/ */
@ -57,8 +55,6 @@ public class CachedQueryTest {
@Test @Test
// todo (6.0): implement shallow query cache structure
@NotImplementedYet(strict = false, reason = "Different query cache structure")
public void testCacheableQuery(EntityManagerFactoryScope scope) { public void testCacheableQuery(EntityManagerFactoryScope scope) {
scope.inTransaction( scope.inTransaction(
em -> { em -> {
@ -92,19 +88,16 @@ public class CachedQueryTest {
assertEquals( 0, stats.getQueryCacheHitCount() ); assertEquals( 0, stats.getQueryCacheHitCount() );
assertEquals( 1, stats.getQueryCacheMissCount() ); assertEquals( 1, stats.getQueryCacheMissCount() );
assertEquals( 1, stats.getQueryCachePutCount() ); assertEquals( 1, stats.getQueryCachePutCount() );
// the first time the query executes, stats.getSecondLevelCacheHitCount() is 0 because the
// entities are read from the query ResultSet (not from the entity cache).
assertEquals( 0, stats.getSecondLevelCacheHitCount() ); assertEquals( 0, stats.getSecondLevelCacheHitCount() );
assertEquals( 0, stats.getSecondLevelCacheMissCount() ); assertEquals( 0, stats.getSecondLevelCacheMissCount() );
assertEquals( 0, stats.getSecondLevelCachePutCount() ); assertEquals( 0, stats.getSecondLevelCachePutCount() );
} }
); );
stats.clear(); stats.clear();
// Second time the query is executed, list of entities are read from query cache and // Second time the query is executed, list of entities are read from query cache
// the entities themselves are read from the entity cache.
scope.inTransaction( scope.inTransaction(
em -> { em -> {
@ -115,9 +108,8 @@ public class CachedQueryTest {
assertEquals( 1, stats.getQueryCacheHitCount() ); assertEquals( 1, stats.getQueryCacheHitCount() );
assertEquals( 0, stats.getQueryCacheMissCount() ); assertEquals( 0, stats.getQueryCacheMissCount() );
assertEquals( 0, stats.getQueryCachePutCount() ); assertEquals( 0, stats.getQueryCachePutCount() );
// the first time the query executes, stats.getSecondLevelCacheHitCount() is 0 because the
// entities are read from the query ResultSet (not from the entity cache). assertEquals( 0, stats.getSecondLevelCacheHitCount() );
assertEquals( 10, stats.getSecondLevelCacheHitCount() );
assertEquals( 0, stats.getSecondLevelCacheMissCount() ); assertEquals( 0, stats.getSecondLevelCacheMissCount() );
assertEquals( 0, stats.getSecondLevelCachePutCount() ); assertEquals( 0, stats.getSecondLevelCachePutCount() );
} }
@ -140,12 +132,10 @@ public class CachedQueryTest {
assertEquals( 1, stats.getQueryCacheHitCount() ); assertEquals( 1, stats.getQueryCacheHitCount() );
assertEquals( 0, stats.getQueryCacheMissCount() ); assertEquals( 0, stats.getQueryCacheMissCount() );
assertEquals( 0, stats.getQueryCachePutCount() ); assertEquals( 0, stats.getQueryCachePutCount() );
// since entity regions were evicted, the 10 entities are not found, and are re-put after loading
// as each entity ID is read from the query cache, Hibernate will look the entity up in the
// cache and will not find it; that's why the "miss" and "put" counts are both 10.
assertEquals( 0, stats.getSecondLevelCacheHitCount() ); assertEquals( 0, stats.getSecondLevelCacheHitCount() );
assertEquals( 10, stats.getSecondLevelCacheMissCount() ); assertEquals( 0, stats.getSecondLevelCacheMissCount() );
assertEquals( 10, stats.getSecondLevelCachePutCount() ); assertEquals( 0, stats.getSecondLevelCachePutCount() );
} }
); );
@ -171,8 +161,7 @@ public class CachedQueryTest {
assertEquals( 0, stats.getQueryCacheHitCount() ); assertEquals( 0, stats.getQueryCacheHitCount() );
assertEquals( 1, stats.getQueryCacheMissCount() ); assertEquals( 1, stats.getQueryCacheMissCount() );
assertEquals( 1, stats.getQueryCachePutCount() ); assertEquals( 1, stats.getQueryCachePutCount() );
// stats.getSecondLevelCacheHitCount() is 0 because the
// entities are read from the query ResultSet (not from the entity cache).
assertEquals( 0, stats.getSecondLevelCacheHitCount() ); assertEquals( 0, stats.getSecondLevelCacheHitCount() );
assertEquals( 0, stats.getSecondLevelCacheMissCount() ); assertEquals( 0, stats.getSecondLevelCacheMissCount() );
assertEquals( 10, stats.getSecondLevelCachePutCount() ); assertEquals( 10, stats.getSecondLevelCachePutCount() );