#1217 - L2 query cache not caching empty result set

This commit is contained in:
Rob Bygrave committed 2017-11-22 22:03:35 +13:00
1 parent b9380aa5b8
commit fd2d083971
2 files changed
+51 -10

No files matched your search

@@ -162,7 +162,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
request.mergeCacheHits(result); request.mergeCacheHits(result);
if (!result.isEmpty() && query.getUseQueryCache().isPut()) { if (query.getUseQueryCache().isPut()) {
// load the query result into the query cache // load the query result into the query cache
result.setReadOnly(true); result.setReadOnly(true);
request.putToQueryCache(result); request.putToQueryCache(result);
+50 -9
View File
@@ -3,31 +3,72 @@ package org.tests.cache;
import io.ebean.BaseTestCase; import io.ebean.BaseTestCase;
import io.ebean.Ebean; import io.ebean.Ebean;
import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCache;
import io.ebean.cache.ServerCacheManager;
import io.ebean.cache.ServerCacheStatistics; import io.ebean.cache.ServerCacheStatistics;
import org.tests.model.basic.Country;
import org.tests.model.basic.ResetBasicData;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.tests.model.basic.Country;
import org.tests.model.basic.ResetBasicData;
import java.util.List; import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
public class TestQueryCacheCountry extends BaseTestCase { public class TestQueryCacheCountry extends BaseTestCase {
private ServerCacheManager cacheManager = Ebean.getServerCacheManager();
private ServerCache queryCache = cacheManager.getQueryCache(Country.class);
private ServerCache beanCache = cacheManager.getBeanCache(Country.class);
private void clearCache() {
queryCache.clear();
beanCache.clear();
queryCache.getStatistics(true);
}
@Test
public void emptyQueryResult_expect_cached() {
ResetBasicData.reset();
clearCache();
List<Country> countryList0 = Ebean.find(Country.class)
.setUseQueryCache(true)
.where().startsWith("name", "XLKMG")
.order().asc("name")
.findList();
assertThat(countryList0).isEmpty();
ServerCacheStatistics queryStats = queryCache.getStatistics(false);
assertEquals(1, queryStats.getMissCount());
assertEquals(1, queryStats.getSize());
List<Country> countryList1 = Ebean.find(Country.class)
.setUseQueryCache(true)
.where().startsWith("name", "XLKMG")
.order().asc("name")
.findList();
assertThat(countryList1).isEmpty();
ServerCacheStatistics queryStats1 = queryCache.getStatistics(false);
assertEquals(1, queryStats1.getMissCount());
assertEquals(1, queryStats1.getSize());
assertEquals(1, queryStats1.getHitCount());
}
@Test @Test
public void test() { public void test() {
ResetBasicData.reset(); ResetBasicData.reset();
awaitL2Cache(); awaitL2Cache();
clearCache();
ServerCache queryCache = Ebean.getServerCacheManager().getQueryCache(Country.class);
queryCache.clear();
ServerCache beanCache = Ebean.getServerCacheManager().getBeanCache(Country.class);
beanCache.clear();
assertEquals(0, queryCache.getStatistics(false).getSize()); assertEquals(0, queryCache.getStatistics(false).getSize());
@@ -62,7 +103,7 @@ public class TestQueryCacheCountry extends BaseTestCase {
.order().asc("name") .order().asc("name")
.findList(); .findList();
Assert.assertNotSame(countryList2, countryList0); assertNotSame(countryList2, countryList0);
} }
} }