This commit is contained in:
wentch
2015-12-14 14:53:57 +08:00
parent eafd4cb25d
commit 0854597352
2 changed files with 2 additions and 2 deletions

View File

@@ -1127,7 +1127,7 @@ public final class DataDefaultSource implements DataSource, Nameable, Function<C
final EntityCache cache = info.getCache();
if (cache != null && (info.isVirtualEntity() || cache.isFullLoaded())) {
if (node == null || node.isCacheUseable(this)) {
return cache.getMapResult(keyColumn, func, funcColumn, node);
return cache.queryColumnMap(keyColumn, func, funcColumn, node);
}
}
final String sqlkey = info.getSQLColumn(null, keyColumn);

View File

@@ -149,7 +149,7 @@ public final class EntityCache<T> {
return (filter != null) && this.list.stream().filter(filter).findFirst().isPresent();
}
public <K, V> Map<Serializable, Number> getMapResult(final String keyColumn, final FuncEnum func, final String funcColumn, FilterNode node) {
public <K, V> Map<Serializable, Number> queryColumnMap(final String keyColumn, final FuncEnum func, final String funcColumn, FilterNode node) {
final Attribute<T, Serializable> keyAttr = info.getAttribute(keyColumn);
final Predicate filter = node == null ? null : node.createPredicate(this);
final Attribute funcAttr = funcColumn == null ? null : info.getAttribute(funcColumn);