natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2025-09-19 14:16:51 +02:00
parent bff43df7db d966547d01
commit 02ef8f8a0d
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,5 +1,7 @@
4.1.11
* Redact security-sensitive information in system_views.settings (CASSANDRA-20856)
Merged from 4.0:
* update shaded cassandra-driver-core to 3.11.5 (CASSANDRA-20904)
4.1.10

2
build.xml
View File

@ -689,7 +689,7 @@
<dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2">
<exclusion groupId="it.unimi.dsi" artifactId="fastutil" />
</dependency>
<dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.11.0" classifier="shaded">
<dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.11.5" classifier="shaded">
<exclusion groupId="io.netty" artifactId="netty-buffer"/>
<exclusion groupId="io.netty" artifactId="netty-codec"/>
<exclusion groupId="io.netty" artifactId="netty-handler"/>

6
test/unit/org/apache/cassandra/tools/nodetool/ClientStatsTest.java
View File

@ -165,7 +165,7 @@ public class ClientStatsTest
tool.assertOnCleanExit();
String stdout = tool.getStdout();
assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version");
assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.0");
assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5");
assertThat(stdout).contains("Total connected clients: 2");
assertThat(stdout).contains("User Connections");
assertThat(stdout).contains("anonymous 2");
@ -178,9 +178,9 @@ public class ClientStatsTest
tool.assertOnCleanExit();
String stdout = tool.getStdout();
assertThat(stdout).containsPattern("Address +SSL +Cipher +Protocol +Version +User +Keyspace +Requests +Driver-Name +Driver-Version +Client-Options");
assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.0");
assertThat(stdout).containsPattern("/127.0.0.1:[0-9]+ false undefined undefined [0-9]+ +anonymous +[0-9]+ +DataStax Java Driver 3.11.5");
assertThat(stdout).containsPattern("DRIVER_NAME=DataStax Java Driver");
assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.0");
assertThat(stdout).containsPattern("DRIVER_VERSION=3.11.5");
assertThat(stdout).containsPattern("CQL_VERSION=3.0.0");
assertThat(stdout).contains("Total connected clients: 2");
assertThat(stdout).contains("User Connections");