tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-20 06:24:12 +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 16:48:54 +08:00
parent c8839f126c
commit 02f6574c09
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scheduler/src/main/java/com/zfoo/scheduler/util/LazyCache.java
+3 -4
View File
@@ -85,9 +85,6 @@ public class LazyCache<K, V> {
var cacheValue = new CacheValue<V>();
cacheValue.value = value;
cacheValue.expireTime = TimeUtils.now() + expireAfterAccessMillis;
if (cacheValue.expireTime < this.minExpireTime) {
this.minExpireTime = cacheValue.expireTime;
}
var oldCacheValue = cacheMap.put(key, cacheValue);
if (oldCacheValue != null) {
removeListener.accept(List.of(new Pair<>(key, oldCacheValue.value)), RemovalCause.REPLACED);
@@ -146,6 +143,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);
}
}
@@ -168,8 +166,9 @@ public class LazyCache<K, V> {
minTimestamp = expireTime;
}
}
removeList.forEach(it -> cacheMap.remove(it.getKey()));
removeListener.accept(removeList, RemovalCause.EXPIRED);
if (this.minExpireTime < Long.MAX_VALUE) {
if (minTimestamp < Long.MAX_VALUE) {
this.minExpireTime = minTimestamp;
}
}
scheduler/src/test/java/com/zfoo/scheduler/util/LazyCacheTesting.java
+14 -16
View File
@@ -45,28 +45,26 @@ public class LazyCacheTesting {
lazyCache.put(10, "j");
lazyCache.put(11, "k");
lazyCache.put(12, "l");
ThreadUtils.sleep(1000);
ThreadUtils.sleep(3000);
lazyCache.put(13, "m");
ThreadUtils.sleep(1000);
ThreadUtils.sleep(3000);
lazyCache.put(14, "n");
ThreadUtils.sleep(1000);
ThreadUtils.sleep(3000);
}
@Test
public void expireTest() {
var lazyCache = new LazyCache<Integer, String>(10, 10 * TimeUtils.MILLIS_PER_SECOND, 5 * TimeUtils.MILLIS_PER_SECOND, myRemoveCallback);
var lazyCache = new LazyCache<Integer, String>(10, 3 * TimeUtils.MILLIS_PER_SECOND, 1 * TimeUtils.MILLIS_PER_SECOND, myRemoveCallback);
lazyCache.put(1, "a");
lazyCache.put(2, "b");
lazyCache.put(3, "c");
lazyCache.put(4, "d");
lazyCache.put(5, "e");
ThreadUtils.sleep(11 * TimeUtils.MILLIS_PER_SECOND);
System.out.println(lazyCache.get(1));
System.out.println(lazyCache.get(2));
System.out.println(lazyCache.get(3));
System.out.println(lazyCache.get(4));
System.out.println(lazyCache.get(5));
for (int i = 0; i < 10; i++) {
lazyCache.put(1, "a");
lazyCache.put(2, "b");
lazyCache.put(3, "c");
lazyCache.put(4, "d");
lazyCache.put(5, "e");
ThreadUtils.sleep(5 * TimeUtils.MILLIS_PER_SECOND);
System.out.println(lazyCache.get(1));
}
}
@Test
@@ -78,7 +76,7 @@ public class LazyCacheTesting {
lazyCache.put(3, "c");
lazyCache.put(4, "d");
lazyCache.put(5, "e");
for (int i = 0; i < 11; i++) {
for (int i = 0; i < 12; i++) {
lazyCache.get(1);
lazyCache.get(2);
ThreadUtils.sleep(1 * TimeUtils.MILLIS_PER_SECOND);