Skip to content

Fix TestCaffeineCache and TestThinCache testSimple failures with Caffein 3.3.0 #5205

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

Closed
iamsanjay wants to merge 1 commit into from
Closed

Fix TestCaffeineCache and TestThinCache testSimple failures with Caffein 3.3.0 #5205

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
8 changes: 5 additions & 3 deletions solr/core/src/test/org/apache/solr/search/TestCaffeineCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ public void testSimple() throws IOException {
assertEquals(3.0, hitDatapoint + missDatapoint, 0.001); // total lookups
assertEquals(2.0, hitDatapoint, 0.001);
assertEquals(101.0, insertDatapoint, 0.001);
assertNull(lfuCache.get(1));
// Exactly one entry is evicted; which one is up to Caffeine's eviction policy.
assertEquals(100, lfuCache.size());
assertEquals(1.0, evictionsDatapoint, 0.001);

// Test autowarming
newLFUCache.init(params, initObj, regenerator);
Expand All @@ -115,11 +117,11 @@ public void testSimple() throws IOException {
var newInsertDatapoint = cumInsertDatapoint - insertDatapoint;
var newEvictionDatapoint = cumEvictionsDatapoint - evictionsDatapoint;
assertEquals(3.0, newHitDatapoint + missDatapoint, 0.001); // total lookups
assertEquals(2.0, newMissDatapoint, 0.001);
assertEquals(1.0, newMissDatapoint, 0.001);
assertEquals(1.0, newInsertDatapoint, 0.001);
assertEquals(0.0, newEvictionDatapoint, 0.001);

assertEquals(7.0, cumHitDatapoint + cumMissDatapoint, 0.001); // total cumulative lookups
assertEquals(6.0, cumHitDatapoint + cumMissDatapoint, 0.001); // total cumulative lookups
assertEquals(4.0, cumHitDatapoint, 0.001);
assertEquals(102.0, cumInsertDatapoint, 0.001);

Expand Down
9 changes: 7 additions & 2 deletions solr/core/src/test/org/apache/solr/search/TestThinCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,12 @@ public void testSimple() throws IOException {
assertEquals(2L, hits);
assertEquals(101L, inserts);

assertNull(lfuCache.get(1)); // first item put in should be the first out
// Exactly one entry is evicted; which one is up to Caffeine's eviction policy.
// lfuCache isn't registered for removals here, so check the backing cache's size.
assertEquals(100, backing.size());

// The backing is full; make room so warming doesn't evict the new cache's own entries.
backing.setMaxSize(200);

// Test autowarming
newLFUCache.init(Map.of("autowarmCount", "25"), initObj, regenerator);
Expand All @@ -164,7 +169,7 @@ public void testSimple() throws IOException {
var newmiss = getNodeCacheLookups(metricManager, registry, newLfuCacheName, "miss");
var newinserts = getNodeCacheOp(metricManager, registry, newLfuCacheName, "inserts");
var evictions = getNodeCacheOp(metricManager, registry, newLfuCacheName, "evictions");
assertEquals(7L, newhits + newmiss);
assertEquals(6L, newhits + newmiss);
assertEquals(4L, newhits);
assertEquals(102L, newinserts);
assertEquals(0L, evictions);
Expand Down
Loading