Merge pull request #2960 from oah1021/fix-remove-keymap-issue

Fixed the removeObject method key-value pair removal issue
mybatis · Sep 22, 2023 · 512a216 · 512a216
2 parents b444fda + 40e86ab
commit 512a216
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java b/src/main/java/org/apache/ibatis/cache/decorators/LruCache.java
@@ -75,6 +75,7 @@ public Object getObject(Object key) {
 
   @Override
   public Object removeObject(Object key) {
+    keyMap.remove(key);
     return delegate.removeObject(key);
   }
 

diff --git a/src/test/java/org/apache/ibatis/cache/LruCacheTest.java b/src/test/java/org/apache/ibatis/cache/LruCacheTest.java
@@ -23,6 +23,9 @@
 import org.apache.ibatis.cache.impl.PerpetualCache;
 import org.junit.jupiter.api.Test;
 
+import java.lang.reflect.Field;
+import java.util.Map;
+
 class LruCacheTest {
 
   @Test
@@ -60,4 +63,18 @@ void shouldFlushAllItemsOnDemand() {
     assertNull(cache.getObject(4));
   }
 
+  @Test
+  void shouldCacheSizeEqualsKeyMapSize() throws Exception {
+    LruCache cache = new LruCache(new PerpetualCache("default"));
+    cache.setSize(5);
+    for (int i = 0; i < 5; i++) {
+      cache.putObject(i, i);
+    }
+    cache.removeObject(1);
+    Field keyMap = cache.getClass().getDeclaredField("keyMap");
+    keyMap.setAccessible(true);
+    Map<Object, Object> map = (Map<Object, Object>) keyMap.get(cache);
+    assertEquals(map.size(), cache.getSize());
+  }
+
 }