You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jl...@apache.org on 2023/09/25 10:53:43 UTC
[cassandra] branch trunk updated (b3879ccb51 -> 02cdaf5b92)
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from b3879ccb51 Merge branch 'cassandra-5.0' into trunk
add 3658ba58c7 JMH improvements - faster build and async profiler
add 2747dbf091 Merge branch 'cassandra-4.0' into cassandra-4.1
add 54ef3a1c7e Merge branch 'cassandra-4.1' into cassandra-5.0
new 02cdaf5b92 Merge branch 'cassandra-5.0' into trunk
The 1 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:
.build/build-bench.xml | 137 +++++++++++++++++++
CHANGES.txt | 1 +
build.xml | 116 ++++++++--------
.../cassandra/anttasks/TestNameCheckTask.java | 151 +++++++++++++++++----
test/bin/jmh | 12 +-
.../{ReadWriteTest.java => ReadWriteBench.java} | 2 +-
.../microbench/{Sample.java => SampleBench.java} | 2 +-
...gBenchmark.java => ZeroCopyStreamingBench.java} | 2 +-
.../instance/{ReadTest.java => ReadBenchBase.java} | 2 +-
...rtitions.java => ReadSmallPartitionsBench.java} | 2 +-
...artitions.java => ReadWidePartitionsBench.java} | 2 +-
.../instance/{WriteTest.java => WriteBench.java} | 4 +-
12 files changed, 330 insertions(+), 103 deletions(-)
create mode 100644 .build/build-bench.xml
rename test/microbench/org/apache/cassandra/test/microbench/{ReadWriteTest.java => ReadWriteBench.java} (98%)
rename test/microbench/org/apache/cassandra/test/microbench/{Sample.java => SampleBench.java} (99%)
rename test/microbench/org/apache/cassandra/test/microbench/{ZeroCopyStreamingBenchmark.java => ZeroCopyStreamingBench.java} (99%)
rename test/microbench/org/apache/cassandra/test/microbench/instance/{ReadTest.java => ReadBenchBase.java} (99%)
rename test/microbench/org/apache/cassandra/test/microbench/instance/{ReadTestSmallPartitions.java => ReadSmallPartitionsBench.java} (97%)
rename test/microbench/org/apache/cassandra/test/microbench/instance/{ReadTestWidePartitions.java => ReadWidePartitionsBench.java} (98%)
rename test/microbench/org/apache/cassandra/test/microbench/instance/{WriteTest.java => WriteBench.java} (95%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlewandowski pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 02cdaf5b922dcefbea59c98b14bda5d49d1bbe16
Merge: b3879ccb51 54ef3a1c7e
Author: Jacek Lewandowski <le...@gmail.com>
AuthorDate: Mon Sep 25 12:39:40 2023 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
JMH improvements - faster build and async profiler
.build/build-bench.xml | 137 +++++++++++++++++++
CHANGES.txt | 1 +
build.xml | 116 ++++++++--------
.../cassandra/anttasks/TestNameCheckTask.java | 151 +++++++++++++++++----
test/bin/jmh | 12 +-
.../{ReadWriteTest.java => ReadWriteBench.java} | 2 +-
.../microbench/{Sample.java => SampleBench.java} | 2 +-
...gBenchmark.java => ZeroCopyStreamingBench.java} | 2 +-
.../instance/{ReadTest.java => ReadBenchBase.java} | 2 +-
...rtitions.java => ReadSmallPartitionsBench.java} | 2 +-
...artitions.java => ReadWidePartitionsBench.java} | 2 +-
.../instance/{WriteTest.java => WriteBench.java} | 4 +-
12 files changed, 330 insertions(+), 103 deletions(-)
diff --cc CHANGES.txt
index f0be56e5e4,fe15bbd4ab..78d3fa9a01
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,23 -29,6 +33,24 @@@ Merged from 3.0
* Remove commitlog_sync_batch_window_in_ms (CASSANDRA-17161)
* Upgrade JMH from 1.21 to 1.36 (CASSANDRA-18696)
* Add guardrail for vector dimensions (CASSANDRA-18730)
+Merged from 4.1:
+ * Waiting indefinitely on ReceivedMessage response in StreamSession#receive() can cause deadlock (CASSANDRA-18733)
+ * Allow empty keystore_password in encryption_options (CASSANDRA-18778)
+Merged from 4.0:
++ * JMH improvements - faster build and async profiler (CASSANDRA-18871)
+Merged from 3.11:
+ * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739)
+Merged from 3.0:
+ * Add cqlshrc.sample and credentials.sample into Debian package (CASSANDRA-18818)
+ * Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
+ * Make alternation of a user type validate the same way as creation of a user type does (CASSANDRA-18585)
+ * Fix missing speculative retries in tablestats (CASSANDRA-18767)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
+
+
+5.0
* Upgraded Netty to 4.1.96, added BouncyCastle dependency (CASSANDRA-17992)
* Fix for (unsupported) big endian unaligned architecture, eg s390x (CASSANDRA-17723)
* CIDR filtering authorizer (CASSANDRA-18592)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org