tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-18 02:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix[cache]: fixed a bug where expired data could not be deleted

Browse Source
This commit is contained in:
godotg
2024-08-16 17:58:02 +08:00
parent 02f6574c09
commit 96485d132b
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scheduler/src/main/java/com/zfoo/scheduler/util/LazyCache.java
+13 -4
View File
@@ -1,5 +1,6 @@
package com.zfoo.scheduler.util;
import com.zfoo.protocol.collection.CollectionUtils;
import com.zfoo.protocol.model.Pair;
import com.zfoo.protocol.util.AssertionUtils;
@@ -123,6 +124,16 @@ public class LazyCache<K, V> {
}
}
private void removeForCause(List<Pair<K, V>> list, RemovalCause removalCause) {
if (CollectionUtils.isEmpty(list)) {
return;
}
var removeList = list.stream()
.filter(it -> cacheMap.remove(it.getKey()) != null)
.toList();
removeListener.accept(removeList, removalCause);
}
public void forEach(BiConsumer<K, V> biConsumer) {
for (var entry : cacheMap.entrySet()) {
biConsumer.accept(entry.getKey(), entry.getValue().value);
@@ -143,8 +154,7 @@ public class LazyCache<K, V> {
.limit(Math.max(0, cacheMap.size() - maximumSize))
.map(it -> new Pair<>(it.getKey(), it.getValue().value))
.toList();
removeList.forEach(it -> cacheMap.remove(it.getKey()));
removeListener.accept(removeList, RemovalCause.SIZE);
removeForCause(removeList, RemovalCause.SIZE);
}
}
@@ -166,8 +176,7 @@ public class LazyCache<K, V> {
minTimestamp = expireTime;
}
}
removeList.forEach(it -> cacheMap.remove(it.getKey()));
removeListener.accept(removeList, RemovalCause.EXPIRED);
removeForCause(removeList, RemovalCause.EXPIRED);
if (minTimestamp < Long.MAX_VALUE) {
this.minExpireTime = minTimestamp;
}
scheduler/src/test/java/com/zfoo/scheduler/util/LazyCacheTesting.java
+15 -9
View File
@@ -23,7 +23,7 @@ public class LazyCacheTesting {
private static final BiConsumer<List<Pair<Integer, String>>, LazyCache.RemovalCause> myRemoveCallback = new BiConsumer<List<Pair<Integer, String>>, LazyCache.RemovalCause>() {
@Override
public void accept(List<Pair<Integer, String>> pairs, LazyCache.RemovalCause removalCause) {
for(var pair : pairs) {
for (var pair : pairs) {
logger.info("remove key:[{}] value:[{}] removalCause:[{}]", pair.getKey(), pair.getValue(), removalCause);
}
}
@@ -46,8 +46,10 @@ public class LazyCacheTesting {
lazyCache.put(11, "k");
lazyCache.put(12, "l");
ThreadUtils.sleep(3000);
System.out.println("first ->");
lazyCache.put(13, "m");
ThreadUtils.sleep(3000);
System.out.println("second ->");
lazyCache.put(14, "n");
ThreadUtils.sleep(3000);
}
@@ -109,17 +111,18 @@ public class LazyCacheTesting {
for (int i = 0; i < executors.length; i++) {
executors[i] = Executors.newSingleThreadExecutor();
}
var lazyCache = new LazyCache<Integer, String>(1_00, 10000000 * TimeUtils.MILLIS_PER_SECOND, 5 * TimeUtils.MILLIS_PER_SECOND, myRemoveCallback);
var lazyCache = new LazyCache<Integer, String>(1_00, 10000000 * TimeUtils.MILLIS_PER_SECOND, 5 * TimeUtils.MILLIS_PER_SECOND, null);
for (int i = 0; i < executors.length; i++) {
var executor = executors[i];
int i1 = i;
executor.execute(new Runnable() {
@Override
public void run() {
var startIndex = i1 * 1_0000;
for (int j = i1 * 1_0000; j < startIndex + 1_0000; j++) {
lazyCache.put(j, String.valueOf(j));
while (true) {
for (int j = i1 * 1_0000; j < startIndex + 1_0000; j++) {
lazyCache.put(j, String.valueOf(j));
}
}
}
});
@@ -138,7 +141,7 @@ public class LazyCacheTesting {
for (int i = 0; i < executors.length; i++) {
executors[i] = Executors.newSingleThreadExecutor();
}
var lazyCache = new LazyCache<Integer, String>(1_0000, 10000000 * TimeUtils.MILLIS_PER_SECOND, 0, myRemoveCallback);
var lazyCache = new LazyCache<Integer, String>(1_0000, 10000000 * TimeUtils.MILLIS_PER_SECOND, 0, null);
for (int i = 0; i < executors.length; i++) {
var executor = executors[i];
@@ -147,8 +150,11 @@ public class LazyCacheTesting {
@Override
public void run() {
var startIndex = i1 * 1_0000;
for (int j = i1 * 1_0000; j < startIndex + 1_0000; j++) {
lazyCache.put(j, String.valueOf(j));
while (true) {
for (int j = i1 * 1_0000; j < startIndex + 1_0000; j++) {
lazyCache.put(j, String.valueOf(j));
}
}
}
});
@@ -197,7 +203,7 @@ public class LazyCacheTesting {
for (int i = 0; i < executors.length; i++) {
executors[i] = Executors.newSingleThreadExecutor();
}
var lazyCache = new LazyCache<Integer, String>(1_0000, 100000 * TimeUtils.MILLIS_PER_SECOND, 5 * TimeUtils.MILLIS_PER_SECOND, myRemoveCallback);
var lazyCache = new LazyCache<Integer, String>(1_0000, 100000 * TimeUtils.MILLIS_PER_SECOND, 5 * TimeUtils.MILLIS_PER_SECOND, null);
for (int i = 0; i < executors.length; i++) {
var executor = executors[i];