Skip to content

Max idle evictions applied eventually in Hibernate cache impl #731 #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2019
Merged

Max idle evictions applied eventually in Hibernate cache impl #731 #746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions ...boss/shamrock/example/infinispancachejpa/InfinispanCacheJPAFunctionalityTestEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import java.time.Duration;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.BiFunction;
import java.util.function.Supplier;

import javax.persistence.EntityManager;
Expand Down Expand Up @@ -85,7 +84,8 @@ private static void testReadOnlyNaturalId(EntityManagerFactory entityManagerFact
counts = new TreeMap<>();
counts.put(Country.class.getName(), new Counts(0, 1, 0, 3));
counts.put(Country.class.getName() + "##NaturalId", new Counts(0, 1, 0, 3));
verifyFindCountryByNaturalId(entityManagerFactory, "+41", "Switzerland", counts);
final Statistics stats = verifyFindCountryByNaturalId(entityManagerFactory, "+41", "Switzerland");
assertRegionStats(counts, stats);
}

private static void storeTestCountries(final EntityManagerFactory emf, Map<String, Counts> counts) {
Expand All @@ -109,10 +109,9 @@ private static void testMaxIdle(EntityManagerFactory entityManagerFactory) {
ManualTestService manualTestService = regionFactory.getTimeService();
manualTestService.advance(120, TimeUnit.SECONDS);

Map<String, Counts> counts = new TreeMap<>();
counts.put(Country.class.getName(), new Counts(1, 0, 1, 1));
counts.put(Country.class.getName() + "##NaturalId", new Counts(0, 1, 0, 3));
verifyFindCountryByNaturalId(entityManagerFactory, "+41", "Switzerland", counts);
final Statistics stats = verifyFindCountryByNaturalId(entityManagerFactory, "+41", "Switzerland");
assertRegionStatsEventually(new Counts(1, 0, 1, 1), Country.class.getName(), stats);
assertRegionStats(new Counts(0, 1, 0, 3), Country.class.getName() + "##NaturalId", stats);
}

private static void testReadWriteNaturalId(EntityManagerFactory entityManagerFactory) {
Expand All @@ -137,7 +136,7 @@ private static void testReadWriteNaturalId(EntityManagerFactory entityManagerFac
verifyFindCitizenByNaturalId(entityManagerFactory, "78902007R", "Stark", counts);
}

private static void verifyFindCountryByNaturalId(EntityManagerFactory emf, String callingCode, String expectedName, Map<String, Counts> counts) {
private static Statistics verifyFindCountryByNaturalId(EntityManagerFactory emf, String callingCode, String expectedName) {
Statistics stats = getStatistics(emf);

EntityManager em = emf.createEntityManager();
Expand All @@ -154,7 +153,7 @@ private static void verifyFindCountryByNaturalId(EntityManagerFactory emf, Strin
transaction.commit();
em.close();

assertRegionStats(counts, stats);
return stats;
}

private static void updateNaturalId(EntityManagerFactory emf, Map<String, Counts> counts) {
Expand Down Expand Up @@ -731,13 +730,10 @@ private static void assertRegionStats(Counts expected, String region, Statistics
}

private static void assertCountEquals(Counts expected, Counts actual, String msg) {
//FIXME this is currently failing often on CI, needs to be investigated.
//Seems to fail more often in native mode.
// - https://github.com/jbossas/protean-shamrock/issues/694
/*if (!expected.equals(actual))
if (!expected.equals(actual))
throw new RuntimeException(
"[" + msg + "] expected " + expected + " second level cache count, instead got: " + actual
);*/
);
}

private static void assertRegionStatsEventually(Counts expected, String region, Statistics stats) {
Expand Down