mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-16 14:52:35 +00:00
#1427 - QueryCache should be cleared, if one of a dependent bean is updated
Refactor on PostCommitProcessing with fixes for dependent table invalidation
This commit is contained in:
1 parent
9159cec36c
commit
ed566ca153
19 files changed
+262
-127
No files matched your search
+33
-29
@@ -23,9 +23,13 @@ import org.tests.model.basic.ResetBasicData;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
public class TestCacheCollectionIds extends BaseTestCase {
|
||||
|
||||
ServerCacheManager cacheManager = Ebean.getServerCacheManager();
|
||||
private ServerCacheManager cacheManager = Ebean.getServerCacheManager();
|
||||
|
||||
@Test
|
||||
public void test() {
|
||||
@@ -45,7 +49,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
List<Customer> list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT)
|
||||
.order().asc("id").findList();
|
||||
|
||||
Assert.assertTrue(list.size() > 1);
|
||||
assertTrue(list.size() > 1);
|
||||
// Assert.assertEquals(list.size(),
|
||||
// custCache.getStatistics(false).getSize());
|
||||
|
||||
@@ -53,7 +57,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
List<Contact> contacts = customer.getContacts();
|
||||
// Assert.assertEquals(0, custManyIdsCache.getStatistics(false).getSize());
|
||||
contacts.size();
|
||||
Assert.assertTrue(contacts.size() > 1);
|
||||
assertTrue(contacts.size() > 1);
|
||||
// Assert.assertEquals(1, custManyIdsCache.getStatistics(false).getSize());
|
||||
// Assert.assertEquals(0,
|
||||
// custManyIdsCache.getStatistics(false).getHitCount());
|
||||
@@ -77,7 +81,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
awaitL2Cache();
|
||||
|
||||
int currentNumContacts2 = fetchCustomer(customer.getId());
|
||||
Assert.assertEquals(currentNumContacts + 1, currentNumContacts2);
|
||||
assertEquals(currentNumContacts + 1, currentNumContacts2);
|
||||
|
||||
// cleanup
|
||||
Ebean.delete(newContact);
|
||||
@@ -119,8 +123,8 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId());
|
||||
|
||||
// confirm the starting data and cache entry
|
||||
Assert.assertEquals(2, dummyToLoad.getCountries().size());
|
||||
Assert.assertEquals(2, cachedManyIds.getIdList().size());
|
||||
assertEquals(2, dummyToLoad.getCountries().size());
|
||||
assertEquals(2, cachedManyIds.getIdList().size());
|
||||
|
||||
|
||||
// act
|
||||
@@ -136,10 +140,10 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(result.getId());
|
||||
|
||||
// assert that data and cache both show correct data
|
||||
Assert.assertEquals(1, result.getCountries().size());
|
||||
Assert.assertEquals(1, cachedManyIds.getIdList().size());
|
||||
Assert.assertFalse(cachedManyIds.getIdList().contains("NZ"));
|
||||
Assert.assertTrue(cachedManyIds.getIdList().contains("AU"));
|
||||
assertEquals(1, result.getCountries().size());
|
||||
assertEquals(1, cachedManyIds.getIdList().size());
|
||||
assertFalse(cachedManyIds.getIdList().contains("NZ"));
|
||||
assertTrue(cachedManyIds.getIdList().contains("AU"));
|
||||
}
|
||||
|
||||
|
||||
@@ -167,8 +171,8 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId());
|
||||
|
||||
// confirm the starting data and cache entry
|
||||
Assert.assertEquals(2, dummyToLoad.getCountries().size());
|
||||
Assert.assertEquals(2, cachedManyIds.getIdList().size());
|
||||
assertEquals(2, dummyToLoad.getCountries().size());
|
||||
assertEquals(2, cachedManyIds.getIdList().size());
|
||||
|
||||
|
||||
// act - this time update the name property so the bean is dirty
|
||||
@@ -185,10 +189,10 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(result.getId());
|
||||
|
||||
// assert that data and cache both show correct data
|
||||
Assert.assertEquals(1, result.getCountries().size());
|
||||
Assert.assertEquals(1, cachedManyIds.getIdList().size());
|
||||
Assert.assertFalse(cachedManyIds.getIdList().contains("NZ"));
|
||||
Assert.assertTrue(cachedManyIds.getIdList().contains("AU"));
|
||||
assertEquals(1, result.getCountries().size());
|
||||
assertEquals(1, cachedManyIds.getIdList().size());
|
||||
assertFalse(cachedManyIds.getIdList().contains("NZ"));
|
||||
assertTrue(cachedManyIds.getIdList().contains("AU"));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -209,20 +213,20 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
// clear the cache
|
||||
ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries");
|
||||
cachedBeanCountriesCache.clear();
|
||||
Assert.assertEquals(0, cachedBeanCountriesCache.size());
|
||||
assertEquals(0, cachedBeanCountriesCache.size());
|
||||
|
||||
// load the cache
|
||||
OCachedBean dummyLoad = Ebean.find(OCachedBean.class, cachedBean.getId());
|
||||
List<Country> dummyCountries = dummyLoad.getCountries();
|
||||
Assert.assertEquals(2, dummyCountries.size());
|
||||
assertEquals(2, dummyCountries.size());
|
||||
|
||||
// assert that the cache contains the expected entry
|
||||
Assert.assertEquals("countries cache now loaded with 1 entry", 1, cachedBeanCountriesCache.size());
|
||||
assertEquals("countries cache now loaded with 1 entry", 1, cachedBeanCountriesCache.size());
|
||||
CachedManyIds dummyEntry = (CachedManyIds) cachedBeanCountriesCache.get(dummyLoad.getId());
|
||||
Assert.assertNotNull(dummyEntry);
|
||||
Assert.assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size());
|
||||
Assert.assertTrue(dummyEntry.getIdList().contains("NZ"));
|
||||
Assert.assertTrue(dummyEntry.getIdList().contains("AU"));
|
||||
assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size());
|
||||
assertTrue(dummyEntry.getIdList().contains("NZ"));
|
||||
assertTrue(dummyEntry.getIdList().contains("AU"));
|
||||
|
||||
|
||||
// act - this should invalidate our cache entry
|
||||
@@ -234,18 +238,18 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
Ebean.update(update);
|
||||
awaitL2Cache();
|
||||
|
||||
Assert.assertEquals("countries entry still there (but updated)", 1, cachedBeanCountriesCache.size());
|
||||
assertEquals("countries entry still there (but updated)", 1, cachedBeanCountriesCache.size());
|
||||
|
||||
CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(update.getId());
|
||||
|
||||
// assert cache updated
|
||||
Assert.assertEquals(1, cachedManyIds.getIdList().size());
|
||||
Assert.assertFalse(cachedManyIds.getIdList().contains("NZ"));
|
||||
Assert.assertTrue(cachedManyIds.getIdList().contains("AU"));
|
||||
assertEquals(1, cachedManyIds.getIdList().size());
|
||||
assertFalse(cachedManyIds.getIdList().contains("NZ"));
|
||||
assertTrue(cachedManyIds.getIdList().contains("AU"));
|
||||
|
||||
// assert countries good
|
||||
OCachedBean result = Ebean.find(OCachedBean.class, cachedBean.getId());
|
||||
Assert.assertEquals(1, result.getCountries().size());
|
||||
assertEquals(1, result.getCountries().size());
|
||||
|
||||
}
|
||||
|
||||
@@ -300,7 +304,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
Update<OrderDetail> update = Ebean.createUpdate(OrderDetail.class, updStatement);
|
||||
update.set("id", orderDetail1.getId());
|
||||
int rows = update.execute();
|
||||
Assert.assertEquals(1, rows);
|
||||
assertEquals(1, rows);
|
||||
|
||||
// read the order from cache
|
||||
Order orderFromCache = Ebean.find(Order.class, 1L);
|
||||
@@ -335,7 +339,7 @@ public class TestCacheCollectionIds extends BaseTestCase {
|
||||
SqlUpdate update = Ebean.createSqlUpdate(updStatement);
|
||||
update.setParameter("id", orderDetail1.getId());
|
||||
int rows = update.execute();
|
||||
Assert.assertEquals(1, rows);
|
||||
assertEquals(1, rows);
|
||||
|
||||
// We need to notify the cache manually
|
||||
Ebean.externalModification("o_order_detail", false, false, true);
|
||||
|
||||
+5
-4
@@ -2,10 +2,11 @@ package org.tests.cache;
|
||||
|
||||
import io.ebean.BaseTestCase;
|
||||
import io.ebean.Ebean;
|
||||
import org.junit.Test;
|
||||
import org.tests.model.basic.OCachedBean;
|
||||
import org.tests.model.basic.OCachedBeanChild;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
/**
|
||||
* Test class testing deleting/invalidating of cached beans
|
||||
@@ -27,7 +28,7 @@ public class TestCacheDelete extends BaseTestCase {
|
||||
Ebean.save(parentBean);
|
||||
|
||||
// confirm there are 2 children loaded from the parent
|
||||
Assert.assertEquals(2, Ebean.find(OCachedBean.class, parentBean.getId()).getChildren().size());
|
||||
assertEquals(2, Ebean.find(OCachedBean.class, parentBean.getId()).getChildren().size());
|
||||
|
||||
// ensure cache has been populated
|
||||
Ebean.find(OCachedBeanChild.class, child.getId());
|
||||
@@ -39,6 +40,6 @@ public class TestCacheDelete extends BaseTestCase {
|
||||
awaitL2Cache();
|
||||
|
||||
OCachedBean beanFromCache = Ebean.find(OCachedBean.class, parentBean.getId());
|
||||
Assert.assertEquals(1, beanFromCache.getChildren().size());
|
||||
assertEquals(1, beanFromCache.getChildren().size());
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import io.ebean.Ebean;
|
||||
import io.ebean.cache.ServerCache;
|
||||
import org.junit.Test;
|
||||
import org.tests.model.basic.Address;
|
||||
import org.tests.model.basic.Contact;
|
||||
import org.tests.model.basic.Customer;
|
||||
import org.tests.model.basic.ResetBasicData;
|
||||
|
||||
@@ -46,7 +47,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase {
|
||||
.where().eq("billingAddress.line2", "St Lukes")
|
||||
.findCount();
|
||||
|
||||
assertThat(custs).isEqualTo(2); // cache says 3
|
||||
assertThat(custs).isEqualTo(2);
|
||||
|
||||
|
||||
custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
@@ -55,5 +56,70 @@ public class TestQueryCacheTableDependency extends BaseTestCase {
|
||||
|
||||
assertThat(custs).isEqualTo(1);
|
||||
|
||||
Ebean.update(Address.class)
|
||||
.set("line2", "St Lucky2")
|
||||
.where().eq("line2", "St Lucky")
|
||||
.update();
|
||||
|
||||
custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
.where().eq("billingAddress.line2", "St Lucky")
|
||||
.findCount();
|
||||
|
||||
assertThat(custs).isEqualTo(0);
|
||||
|
||||
custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
.where().eq("billingAddress.line2", "St Lucky2")
|
||||
.findCount();
|
||||
assertThat(custs).isEqualTo(1);
|
||||
|
||||
Ebean.createSqlUpdate("update O_ADDRESS set line_2=? where line_2=?")
|
||||
.setNextParameter("St Lucky3")
|
||||
.setNextParameter("St Lucky2")
|
||||
.execute();
|
||||
|
||||
custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
.where().eq("billingAddress.line2", "St Lucky2")
|
||||
.findCount();
|
||||
assertThat(custs).isEqualTo(0);
|
||||
|
||||
custs = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
.where().eq("billingAddress.line2", "St Lucky3")
|
||||
.findCount();
|
||||
|
||||
assertThat(custs).isEqualTo(1);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFindCountOnOtherL2Cached() {
|
||||
|
||||
ResetBasicData.reset();
|
||||
|
||||
Customer fi = Ebean.find(Customer.class).where().eq("name", "Fiona").findOne();
|
||||
|
||||
int custCount0 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
.where()
|
||||
.eq("name", "Fiona")
|
||||
.isNull("contacts.phone")
|
||||
.findCount();
|
||||
|
||||
assertThat(custCount0).isEqualTo(1);
|
||||
|
||||
int updateRows = Ebean.update(Contact.class)
|
||||
.set("phone", "1234")
|
||||
.where()
|
||||
.eq("customer.id", fi.getId())
|
||||
.update();
|
||||
|
||||
assertThat(updateRows).isGreaterThan(0);
|
||||
|
||||
int custCount1 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true)
|
||||
.where()
|
||||
.eq("name", "Fiona")
|
||||
.isNull("contacts.phone")
|
||||
.findCount();
|
||||
|
||||
assertThat(custCount1).isEqualTo(0);
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user