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 ad9db90a1f687639ab984cdd94bf3cba0b92e3e6 Merge: 04064783bf 03450cdea6 Author: Stefan Miklosovic <[email protected]> AuthorDate: Fri May 29 16:20:50 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 1 + src/java/org/apache/cassandra/db/ReadCommand.java | 1 + .../org/apache/cassandra/metrics/TableMetrics.java | 6 +++ .../apache/cassandra/metrics/TableMetricsTest.java | 56 ++++++++++++++++++++++ 5 files changed, 65 insertions(+) diff --cc CHANGES.txt index e70f10e6b2,f89d347673..d36a94b908 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -6.0-alpha2 +7.0 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394) + * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767) + * Add a guardrail for misprepared statements (CASSANDRA-21139) +Merged from 6.0: + * Add TotalRowsRead and TotalRowsMutated counters to TableMetrics for accurate per-table row throughput tracking (CASSANDRA-21321) * Move exception handling of SPI startup checks when iterating over them (CASSANDRA-21409) * Avoid type lookup in SerializationHeader#getType if schema and SSTable are aligned (CASSANDRA-21402) * Replace LongAdder in metric-like logic with ThreadLocalCounter (CASSANDRA-21400) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
