This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 97bee6abc1b9114b39f5c726b6f8fe247c5034f4 Merge: 30ed828c87 bfd93eafdd Author: Stefan Miklosovic <[email protected]> AuthorDate: Wed Nov 29 17:49:17 2023 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../tools/cassandrastress/CassandrastressTest.java | 5 + .../operations/predefined/CqlCounterAdder.java | 4 +- .../operations/predefined/CqlCounterGetter.java | 4 +- .../stress/operations/predefined/CqlInserter.java | 4 +- .../stress/operations/predefined/CqlOperation.java | 222 ++++++++++----------- .../stress/operations/predefined/CqlReader.java | 4 +- .../operations/predefined/PredefinedOperation.java | 11 - 8 files changed, 115 insertions(+), 140 deletions(-) diff --cc CHANGES.txt index d9d38d0163,21d6f9e745..d7a77cf7cf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -50,8 -53,8 +50,9 @@@ Merged from 4.1 * Internode legacy SSL storage port certificate is not hot reloaded on update (CASSANDRA-18681) * Nodetool paxos-only repair is no longer incremental (CASSANDRA-18466) Merged from 4.0: - * Retrieve keyspaces metadata and schema version concistently in DescribeStatement (CASSANDRA-18921) ++ * Fix cassandra-stress in simplenative mode with prepared statements (CASSANDRA-18744) + * Fix filtering system ks sstables for relocation on startup (CASSANDRA-18963) + * Remove completed coordinator sessions (CASSANDRA-18903) * Gossip NPE due to shutdown event corrupting empty statuses (CASSANDRA-18913) * Update hdrhistogram to 2.1.12 (CASSANDRA-18893) * Improve performance of compactions when table does not have an index (CASSANDRA-18773) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
