honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add caching test

This commit is contained in:
James Agnew 2019-02-20 11:18:02 -05:00
parent 72c4726328
commit e7b7ba1a6d
6 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu2Config.java
View File

@ -99,7 +99,7 @@ public class BaseDstu2Config extends BaseConfig {
@Bean(name = "myResourceCountsCache") @Bean(name = "myResourceCountsCache")
public ResourceCountCache resourceCountsCache() { public ResourceCountCache resourceCountsCache() {
ResourceCountCache retVal = new ResourceCountCache(() -> systemDaoDstu2().getResourceCounts()); ResourceCountCache retVal = new ResourceCountCache(() -> systemDaoDstu2().getResourceCounts());
retVal.setCacheMillis(60 * DateUtils.MILLIS_PER_SECOND); retVal.setCacheMillis(4 * DateUtils.MILLIS_PER_HOUR);
return retVal; return retVal;
} }

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/BaseDstu3Config.java
View File

@ -106,7 +106,7 @@ public class BaseDstu3Config extends BaseConfig {
@Bean(name = "myResourceCountsCache") @Bean(name = "myResourceCountsCache")
public ResourceCountCache resourceCountsCache() { public ResourceCountCache resourceCountsCache() {
ResourceCountCache retVal = new ResourceCountCache(() -> systemDaoDstu3().getResourceCounts()); ResourceCountCache retVal = new ResourceCountCache(() -> systemDaoDstu3().getResourceCounts());
retVal.setCacheMillis(60 * DateUtils.MILLIS_PER_SECOND); retVal.setCacheMillis(4 * DateUtils.MILLIS_PER_HOUR);
return retVal; return retVal;
} }

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/BaseR4Config.java
View File

@ -121,7 +121,7 @@ public class BaseR4Config extends BaseConfig {
@Bean(name = "myResourceCountsCache") @Bean(name = "myResourceCountsCache")
public ResourceCountCache resourceCountsCache() { public ResourceCountCache resourceCountsCache() {
ResourceCountCache retVal = new ResourceCountCache(() -> systemDaoR4().getResourceCounts()); ResourceCountCache retVal = new ResourceCountCache(() -> systemDaoR4().getResourceCounts());
retVal.setCacheMillis(10 * DateUtils.MILLIS_PER_MINUTE); retVal.setCacheMillis(4 * DateUtils.MILLIS_PER_HOUR);
return retVal; return retVal;
} }

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java
View File

@ -933,7 +933,7 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
TransactionTemplate tt = new TransactionTemplate(myTransactionMgr); TransactionTemplate tt = new TransactionTemplate(myTransactionMgr);
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
tt.execute(new TransactionCallbackWithoutResult() { tt.execute(new TransactionCallbackWithoutResult() {
private void createParentsString(StringBuilder theParentsBuilder, Long theConceptPid) { private void createParentsString(StringBuilder theParentsBuilder, Long theConceptPid) {
Validate.notNull(theConceptPid, "theConceptPid must not be null"); Validate.notNull(theConceptPid, "theConceptPid must not be null");
List<Long> parents = myChildToParentPidCache.get(theConceptPid); List<Long> parents = myChildToParentPidCache.get(theConceptPid);

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/SingleItemLoadingCache.java
View File

@ -49,7 +49,7 @@ public class SingleItemLoadingCache<T> {
} }
public synchronized void clear() { public synchronized void clear() {
ourLog.info("Clearning cache"); ourLog.info("Clearing cache");
myCapabilityStatement.set(null); myCapabilityStatement.set(null);
myLastFetched = 0; myLastFetched = 0;
} }

33
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/util/SingleItemLoadingCacheTest.java
View File

@ -6,13 +6,12 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
@ -62,4 +61,32 @@ public class SingleItemLoadingCacheTest {
} }
@Test
public void testCacheWithLoadingDisabled() {
long start = System.currentTimeMillis();
SingleItemLoadingCache.setNowForUnitTest(start);
// Cache of 0 means "never load"
SingleItemLoadingCache<CapabilityStatement> cache = new SingleItemLoadingCache<>(myFetcher);
cache.setCacheMillis(0);
/*
* No matter how long we wait it should never load...
*/
assertEquals(null, cache.get());
cache.update();
assertEquals(null, cache.get());
SingleItemLoadingCache.setNowForUnitTest(start + 400);
cache.update();
assertEquals(null, cache.get());
SingleItemLoadingCache.setNowForUnitTest(start + 80000);
cache.update();
assertEquals(null, cache.get());
}
} }