Caching changes and refactoring, includes Fix for Wobu - TestCacheCollectionIds test case

This commit is contained in:
Rob Bygrave committed 2014-04-25 03:06:22 +12:00
1 parent 696dabc658
commit ed0fe7fd57
17 files changed
+640 -254

No files matched your search

@@ -1,10 +1,13 @@
package com.avaje.ebeaninternal.server.cache;
import java.util.Arrays;
/**
* Data held in the bean cache for cached beans.
*/
public class CachedBeanData {
private final long whenCreated;
private final Object sharableBean;
private final boolean[] loaded;
private final Object[] data;
@@ -14,6 +17,7 @@ public class CachedBeanData {
private final Object oldNaturalKey;
public CachedBeanData(Object sharableBean, boolean[] loaded, Object[] data, Object naturalKey, Object oldNaturalKey) {
this.whenCreated = System.currentTimeMillis();
this.sharableBean = sharableBean;
this.loaded = loaded;
this.data = data;
@@ -22,6 +26,10 @@ public class CachedBeanData {
this.oldNaturalKey = oldNaturalKey;
}
public String toString() {
return Arrays.toString(data);
}
/**
* Return a copy of the property data.
*/
@@ -41,35 +49,52 @@ public class CachedBeanData {
}
return dest;
}
/**
* Return when the cached data was created.
*/
public long getWhenCreated() {
return whenCreated;
}
/**
* Return a sharable (immutable read only) bean.
*/
public Object getSharableBean() {
return sharableBean;
}
/**
* Return true if this data requires an update to the natural key cache.
*/
public boolean isNaturalKeyUpdate() {
return naturalKeyUpdate;
}
/**
* Return the new/current natural key value.
*/
public Object getNaturalKey() {
return naturalKey;
}
/**
* Return the old natural key (its entry should be removed).
*/
public Object getOldNaturalKey() {
return oldNaturalKey;
}
public boolean containsProperty(int propIndex) {
return loaded[propIndex];
}
public boolean[] getLoaded() {
return loaded;
}
/**
* Return the data for the specific property.
*/
public Object getData(int i) {
return data[i];
}
/**
* Return true if the property is contained in this data.
*/
public boolean isLoaded(int i) {
return loaded[i];
}
@@ -30,13 +30,7 @@ public class CachedBeanDataToBean {
BeanPropertyAssocMany<?>[] manys = desc.propertiesMany();
for (int i = 0; i < manys.length; i++) {
BeanPropertyAssocMany<?> prop = manys[i];
if (ebi.isLoadedProperty(prop.getPropertyIndex())) {
// already loaded property
} else {
// set a lazy loading proxy
prop.createReference(bean);
}
manys[i].createReferenceIfNull(bean);
}
ebi.setLoadedLazy();
@@ -30,7 +30,7 @@ public class CachedBeanDataUpdate {
int propertyIndex = props[i].getPropertyIndex();
if (ebi.isLoadedProperty(propertyIndex)) {
if (props[i].isNaturalKey()) {
newNaturalKey = updateBean._ebean_getField(i);
newNaturalKey = updateBean._ebean_getField(propertyIndex);
}
// set the cache safe value for the property and mark it as loaded
copyData[propertyIndex] = props[i].getCacheDataValue(updateBean);
@@ -16,6 +16,10 @@ public class CachedManyIds {
this.idList = idList;
}
public String toString() {
return idList.toString();
}
public List<Object> getIdList() {
return idList;
}