This is an automated email from the ASF dual-hosted git repository.
frankgh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new ef6273c2 CASSSIDECAR-332: Upgrade caffeine dependency (#245)
ef6273c2 is described below
commit ef6273c2a7ad70cd6a3d0458915c04c0564d76c9
Author: Francisco Guerrero <[email protected]>
AuthorDate: Wed Oct 29 06:48:26 2025 -0700
CASSSIDECAR-332: Upgrade caffeine dependency (#245)
Patch by Francisco Guerrero; reviewed by Saranya Krishnakumar for
CASSSIDECAR-332
---
CHANGES.txt | 1 +
gradle.properties | 1 +
.../apache/cassandra/sidecar/metrics/CacheStatsCounter.java | 12 ++----------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 76fc37d6..90d1f9c3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.3.0
-----
+ * Upgrade caffeine dependency (CASSSIDECAR-332)
* Add Live Migration Status endpoint to persist Live Migration status and for
safety (CASSSIDECAR-345)
* Sidecar endpoint for draining a node (CASSSIDECAR-342)
* Avoid resuming stream early during SSTable upload (CASSSIDECAR-359)
diff --git a/gradle.properties b/gradle.properties
index 822398d3..79bf9ce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,6 +26,7 @@ guiceVersion=7.0.0
slf4jVersion=2.0.17
logbackVersion=1.5.15
jacksonVersion=2.14.3
+caffeineVersion=3.2.2
dtestApiVersion=0.0.17
assertjCoreVersion=3.24.2
# trunk is currently 5.1 - update when trunk moves
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheStatsCounter.java
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheStatsCounter.java
index 08004ff8..a90dd880 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheStatsCounter.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/metrics/CacheStatsCounter.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.LongAdder;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.RemovalCause;
import com.github.benmanes.caffeine.cache.stats.CacheStats;
import com.github.benmanes.caffeine.cache.stats.StatsCounter;
import org.checkerframework.checker.index.qual.NonNegative;
@@ -102,16 +103,7 @@ public class CacheStatsCounter implements StatsCounter
}
@Override
- public void recordEviction()
- {
- recordEviction(1);
- }
-
- /**
- * @deprecated
- */
- @Deprecated
- public void recordEviction(int weight)
+ public void recordEviction(int weight, RemovalCause cause)
{
evictions.metric.update(weight);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
