Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

solve the unremoved result in keyList #2935

Merged
merged 1 commit into from
Sep 8, 2023
Merged

solve the unremoved result in keyList #2935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/apache/ibatis/cache/decorators/FifoCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -64,6 +64,7 @@ public Object getObject(Object key) {

@Override
public Object removeObject(Object key) {
keyList.remove(key);
return delegate.removeObject(key);
}

Expand Down
12 changes: 12 additions & 0 deletions src/test/java/org/apache/ibatis/cache/FifoCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,16 @@ void shouldFlushAllItemsOnDemand() {
assertNull(cache.getObject(4));
}

@Test
void shouldRiseConflictInBeyondFiveEntries() {
FifoCache cache = new FifoCache(new PerpetualCache("default"));
cache.setSize(5);
for (int i = 0; i < 5; i++) {
cache.putObject(i, i);
}
cache.removeObject(1);
cache.putObject(1, 1);
assertNotNull(cache.getObject(0));
}

}