From 9dbd63a5b9aa2f2398b02ee5c72d8e977f56867d Mon Sep 17 00:00:00 2001 From: Jacek Lewandowski Date: Thu, 5 Oct 2023 09:09:07 +0200 Subject: [PATCH] Fix KeyCacheTest for cases when early open is disabled Patch by Jacek Lewandowski; reviewed by Berenguer Blasi, Branimir Lambov, Caleb Rackliffe for CASSANDRA-18911 --- .../apache/cassandra/io/sstable/keycache/KeyCacheTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java b/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java index 5ef70c4b09..15c37ea60a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/keycache/KeyCacheTest.java @@ -340,12 +340,11 @@ public class KeyCacheTest throw new IllegalStateException(); Util.compactAll(cfs, Integer.MAX_VALUE).get(); - boolean noEarlyOpen = DatabaseDescriptor.getSSTablePreemptiveOpenIntervalInMiB() < 0; // after compaction cache should have entries for new SSTables, // but since we have kept a reference to the old sstables, // if we had 2 keys in cache previously it should become 4 - assertKeyCacheSize(noEarlyOpen ? 2 : 4, KEYSPACE1, cf); + assertKeyCacheSize(4, KEYSPACE1, cf); refs.release(); @@ -358,7 +357,7 @@ public class KeyCacheTest Util.getAll(Util.cmd(cfs, "key1").build()); Util.getAll(Util.cmd(cfs, "key2").build()); - assertKeyCacheSize(noEarlyOpen ? 4 : 2, KEYSPACE1, cf); + assertKeyCacheSize( 2, KEYSPACE1, cf); } @Test