#1585 - Change the L2 bean cache keys to be String based

This commit is contained in:
rob bygrave committed 2018-12-21 01:54:46 +13:00
1 parent 84f7fc5d81
commit 58f6c67d78
14 files changed
+141 -72

No files matched your search

@@ -10,14 +10,14 @@ import java.util.Map;
class CacheChangeBeanUpdate implements CacheChange {
private final BeanDescriptor<?> desc;
private final Object id;
private final String key;
private final Map<String, Object> changes;
private final boolean updateNaturalKey;
private final long version;
CacheChangeBeanUpdate(BeanDescriptor<?> desc, Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
CacheChangeBeanUpdate(BeanDescriptor<?> desc, String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
this.desc = desc;
this.id = id;
this.key = key;
this.changes = changes;
this.updateNaturalKey = updateNaturalKey;
this.version = version;
@@ -25,6 +25,6 @@ class CacheChangeBeanUpdate implements CacheChange {
@Override
public void apply() {
desc.cacheApplyBeanUpdate(id, changes, updateNaturalKey, version);
desc.cacheApplyBeanUpdate(key, changes, updateNaturalKey, version);
}
}
@@ -8,17 +8,17 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
class CacheChangeNaturalKeyPut implements CacheChange {
private final BeanDescriptor<?> descriptor;
private final Object id;
private final Object newKey;
private final String key;
private final String newKey;
CacheChangeNaturalKeyPut(BeanDescriptor<?> descriptor, Object id, Object newKey) {
CacheChangeNaturalKeyPut(BeanDescriptor<?> descriptor, String key, String newKey) {
this.descriptor = descriptor;
this.id = id;
this.key = key;
this.newKey = newKey;
}
@Override
public void apply() {
descriptor.cacheNaturalKeyPut(id, newKey);
descriptor.cacheNaturalKeyPut(key, newKey);
}
}
@@ -152,16 +152,16 @@ public class CacheChangeSet {
/**
* Update a bean entry.
*/
public <T> void addBeanUpdate(BeanDescriptor<T> desc, Object id, Map<String, Object> changes, boolean updateNaturalKey, long version) {
public <T> void addBeanUpdate(BeanDescriptor<T> desc, String key, Map<String, Object> changes, boolean updateNaturalKey, long version) {
touchedTables.add(desc.getBaseTable());
entries.add(new CacheChangeBeanUpdate(desc, id, changes, updateNaturalKey, version));
entries.add(new CacheChangeBeanUpdate(desc, key, changes, updateNaturalKey, version));
}
/**
* Update a natural key.
*/
public <T> void addNaturalKeyPut(BeanDescriptor<T> desc, Object id, Object val) {
entries.add(new CacheChangeNaturalKeyPut(desc, id, val));
public <T> void addNaturalKeyPut(BeanDescriptor<T> desc, String key, String val) {
entries.add(new CacheChangeNaturalKeyPut(desc, key, val));
}
/**