You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/09/17 13:52:19 UTC
[cassandra] branch cassandra-4.0 updated (57c1c61 -> dd3d83a)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 57c1c61 Merge branch 'cassandra-3.11' into cassandra-4.0
new b3af67f Add test to ensure Caffeine cache does not return stale entries
new fa6dbc4 Merge branch 'cassandra-3.11' into cassandra-4.0
new dd3d83a Upgrade Caffeine to 2.5.6
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
build.xml | 2 +-
.../org/apache/cassandra/auth/AuthCacheTest.java | 34 ++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/02: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fa6dbc4dda3897d575a2f56542665e30336be985
Merge: 57c1c61 b3af67f
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Sep 17 08:43:48 2021 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
.../org/apache/cassandra/auth/AuthCacheTest.java | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --cc test/unit/org/apache/cassandra/auth/AuthCacheTest.java
index 217821e,c99438f7..da97225
--- a/test/unit/org/apache/cassandra/auth/AuthCacheTest.java
+++ b/test/unit/org/apache/cassandra/auth/AuthCacheTest.java
@@@ -28,9 -27,7 +28,10 @@@ import org.apache.cassandra.db.Consiste
import org.apache.cassandra.exceptions.UnavailableException;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+ import static org.junit.Assert.fail;
public class AuthCacheTest
{
@@@ -211,6 -166,16 +235,16 @@@
return Integer.parseInt(s);
}
+ private Integer countingLoaderWithException(String s)
+ {
+ Integer loadedValue = countingLoader(s);
+
+ if (loadCounter > 1)
- throw new UnavailableException(ConsistencyLevel.QUORUM, 3, 1);
++ throw UnavailableException.create(ConsistencyLevel.QUORUM, 3, 1);
+
+ return loadedValue;
+ }
+
private static class TestCache<K, V> extends AuthCache<K, V>
{
private static int nameCounter = 0; // Allow us to create many instances of cache with same name prefix
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/02: Upgrade Caffeine to 2.5.6
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit dd3d83a819f5a513a603b8a9c2c929eff5b2fb81
Author: Aleksei Zotov <az...@gmail.com>
AuthorDate: Fri Sep 17 08:47:11 2021 -0500
Upgrade Caffeine to 2.5.6
Patch by Aleksei Zotov; reviewed by brandonwilliams and mck for
CASSANDRA-15153
---
CHANGES.txt | 1 +
build.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 59d8266..a529423 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0.2
+ * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
* Include SASI components to snapshots (CASSANDRA-15134)
* Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938)
* Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888)
diff --git a/build.xml b/build.xml
index ed66f63..c3f0746 100644
--- a/build.xml
+++ b/build.xml
@@ -626,7 +626,7 @@
</dependency>
<dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
<dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
- <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.3.5" />
+ <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.5.6" />
<dependency groupId="org.jctools" artifactId="jctools-core" version="3.1.0"/>
<dependency groupId="org.ow2.asm" artifactId="asm" version="${asm.version}"/>
<dependency groupId="org.ow2.asm" artifactId="asm-tree" version="${asm.version}" scope="test"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org