lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复EntityCache复制反了的bug

Browse Source
This commit is contained in:
redkale
2023-12-21 13:25:32 +08:00
parent e5a3c4c102
commit 81da17ddd4
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/redkale/source/EntityCache.java
View File

@@ -169,7 +169,7 @@ public final class EntityCache<T> {
ConcurrentHashMap newmap2 = new ConcurrentHashMap(); ConcurrentHashMap newmap2 = new ConcurrentHashMap();
List<T> all2 = info.fullLoader.apply(info.source, info).join(); List<T> all2 = info.fullLoader.apply(info.source, info).join();
if (all2 != null) { if (all2 != null) {
all2.stream().filter(x -> x != null).forEach(x -> { all2.stream().filter(Objects::nonNull).forEach(x -> {
newmap2.put(this.primary.get(x), x); newmap2.put(this.primary.get(x), x);
}); });
} }
@@ -228,7 +228,7 @@ public final class EntityCache<T> {
return null; return null;
} }
T rs = map.get(pk); T rs = map.get(pk);
return rs == null ? null : (needCopy ? newCopier.apply(this.creator.create(), rs) : rs); return rs == null ? null : (needCopy ? newCopier.apply(rs, this.creator.create()) : rs);
} }
public T[] finds(Serializable... pks) { public T[] finds(Serializable... pks) {
@@ -242,7 +242,7 @@ public final class EntityCache<T> {
T[] result = arrayer.apply(ids.length); T[] result = arrayer.apply(ids.length);
for (int i = 0; i < result.length; i++) { for (int i = 0; i < result.length; i++) {
T rs = map.get(ids[i]); T rs = map.get(ids[i]);
result[i] = rs == null ? null : (needCopy ? newCopier.apply(this.creator.create(), rs) : rs); result[i] = rs == null ? null : (needCopy ? newCopier.apply(rs, this.creator.create()) : rs);
} }
return result; return result;
} else if (t == long[].class) { } else if (t == long[].class) {
@@ -250,7 +250,7 @@ public final class EntityCache<T> {
T[] result = arrayer.apply(ids.length); T[] result = arrayer.apply(ids.length);
for (int i = 0; i < result.length; i++) { for (int i = 0; i < result.length; i++) {
T rs = map.get(ids[i]); T rs = map.get(ids[i]);
result[i] = rs == null ? null : (needCopy ? newCopier.apply(this.creator.create(), rs) : rs); result[i] = rs == null ? null : (needCopy ? newCopier.apply(rs, this.creator.create()) : rs);
} }
return result; return result;
} }
@@ -259,7 +259,7 @@ public final class EntityCache<T> {
if (needCopy) { if (needCopy) {
for (int i = 0; i < result.length; i++) { for (int i = 0; i < result.length; i++) {
T rs = map.get(pks[i]); T rs = map.get(pks[i]);
result[i] = rs == null ? null : newCopier.apply(this.creator.create(), rs); result[i] = rs == null ? null : newCopier.apply(rs, this.creator.create());
} }
} else { } else {
for (int i = 0; i < result.length; i++) { for (int i = 0; i < result.length; i++) {
@@ -278,7 +278,7 @@ public final class EntityCache<T> {
return null; return null;
} }
if (selects == null) { if (selects == null) {
return needCopy ? newCopier.apply(this.creator.create(), rs) : rs; return needCopy ? newCopier.apply(rs, this.creator.create()) : rs;
} }
T t = this.creator.create(); T t = this.creator.create();
for (Attribute attr : this.info.attributes) { for (Attribute attr : this.info.attributes) {
@@ -317,7 +317,7 @@ public final class EntityCache<T> {
} }
if (selects == null) { if (selects == null) {
if (needCopy) { if (needCopy) {
rs = newCopier.apply(ctr.create(), rs); rs = newCopier.apply(rs, ctr.create());
} }
} else { } else {
T t = ctr.create(); T t = ctr.create();
@@ -344,7 +344,7 @@ public final class EntityCache<T> {
return null; return null;
} }
if (selects == null) { if (selects == null) {
return (needCopy ? newCopier.apply(this.creator.create(), opt.get()) : opt.get()); return needCopy ? newCopier.apply(opt.get(), this.creator.create()) : opt.get();
} }
T rs = opt.get(); T rs = opt.get();
T t = this.creator.create(); T t = this.creator.create();
@@ -650,7 +650,7 @@ public final class EntityCache<T> {
return defResult; return defResult;
} }
public <V> Number getNumberResult(final FilterFunc func, final Number defResult, final String column, final FilterNode node) { public Number getNumberResult(final FilterFunc func, final Number defResult, final String column, final FilterNode node) {
final Attribute<T, Serializable> attr = column == null ? null : info.getAttribute(column); //COUNT的column=null final Attribute<T, Serializable> attr = column == null ? null : info.getAttribute(column); //COUNT的column=null
final Function<T, Number> attrFunc = attr == null ? null : x -> (Number) attr.get(x); final Function<T, Number> attrFunc = attr == null ? null : x -> (Number) attr.get(x);
return getNumberResult(this.list, func, defResult, attr == null ? null : attr.type(), attrFunc, node); return getNumberResult(this.list, func, defResult, attr == null ? null : attr.type(), attrFunc, node);
@@ -725,7 +725,7 @@ public final class EntityCache<T> {
} }
final List<T> rs = new ArrayList<>(); final List<T> rs = new ArrayList<>();
if (selects == null) { if (selects == null) {
Consumer<? super T> action = x -> rs.add(needCopy ? newCopier.apply(creator.create(), x) : x); Consumer<? super T> action = x -> rs.add(needCopy ? newCopier.apply(x, creator.create()) : x);
if (comparator != null) { if (comparator != null) {
stream.forEachOrdered(action); stream.forEachOrdered(action);
} else { } else {
@@ -761,7 +761,7 @@ public final class EntityCache<T> {
if (entity == null) { if (entity == null) {
return 0; return 0;
} }
final T rs = newCopier.apply(this.creator.create(), entity); //确保同一主键值的map与list中的对象必须共用。 final T rs = newCopier.apply(entity, this.creator.create()); //确保同一主键值的map与list中的对象必须共用。
T old = this.map.putIfAbsent(this.primary.get(rs), rs); T old = this.map.putIfAbsent(this.primary.get(rs), rs);
if (old == null) { if (old == null) {
this.list.add(rs); this.list.add(rs);
@@ -825,7 +825,7 @@ public final class EntityCache<T> {
} }
tableLock.lock(); //表锁, 可优化成行锁 tableLock.lock(); //表锁, 可优化成行锁
try { try {
this.uptCopier.apply(rs, entity); this.uptCopier.apply(entity, rs);
} finally { } finally {
tableLock.unlock(); tableLock.unlock();
} }