This is an automated email from the ASF dual-hosted git repository. netudima pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b6f175bfc23532436a406a0c158df010564db4e3 Merge: 0625a4d525 51a58ef22e Author: Dmitry Konstantinov <[email protected]> AuthorDate: Wed May 13 13:32:42 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Uncompressed size is being used for compressed tables in maintenance operations CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 4 ++- .../cassandra/db/compaction/ActiveCompactions.java | 5 +-- .../cassandra/db/compaction/CompactionInfo.java | 41 ++++++++++++++-------- .../db/compaction/CompactionIterator.java | 7 ++++ .../cassandra/db/compaction/CompactionTask.java | 2 +- .../cassandra/db/compaction/CursorCompactor.java | 9 ++++- .../apache/cassandra/db/view/ViewBuilderTask.java | 4 +-- .../cassandra/db/virtual/SSTableTasksTable.java | 4 +++ .../index/accord/RouteSecondaryIndexBuilder.java | 12 ++++++- .../index/internal/CollatedViewIndexBuilder.java | 4 ++- .../index/sai/StorageAttachedIndexBuilder.java | 1 + .../cassandra/index/sasi/SASIIndexBuilder.java | 1 + .../io/sstable/format/SortedTableScrubber.java | 1 + .../io/sstable/format/SortedTableVerifier.java | 1 + .../indexsummary/IndexSummaryRedistribution.java | 2 +- .../cassandra/metrics/CompactionMetrics.java | 3 ++ .../apache/cassandra/streaming/StreamSession.java | 2 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 1 + .../cassandra/tools/nodetool/CompactionStats.java | 25 ++++++++++--- .../distributed/test/CompactionDiskSpaceTest.java | 4 +-- .../test/SecondaryIndexCompactionTest.java | 6 ++-- .../distributed/test/StreamsDiskSpaceTest.java | 4 +-- .../db/compaction/CompactionInfoTest.java | 4 +-- .../db/compaction/CompactionsCQLTest.java | 31 ++++++++++++---- .../db/repair/PendingAntiCompactionTest.java | 6 ++-- .../db/virtual/SSTableTasksTableTest.java | 5 +-- .../indexsummary/IndexSummaryManagerTest.java | 2 +- .../tools/nodetool/CompactionStatsTest.java | 39 +++++++++++--------- 29 files changed, 164 insertions(+), 67 deletions(-) diff --cc CHANGES.txt index 78cacab692,22dfcf7e66..32b6f2d435 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,3 +1,15 @@@ +7.0 + * 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: + * Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246) + * Differentiate between legitimate cases where the first entry is the same as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() (CASSANDRA-21255) + * Introduce minimum_threshold for data resurrection startup check (CASSANDRA-21293) +Merged from 5.0: ++ * Use estimated compressed size for tables to check if there is enough free space for a compaction (CASSANDRA-21245) + * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348) + + 6.0-alpha2 * Reduce memory allocations in SelectStatement.getQuery (CASSANDRA-21351) * Avoid allocation by getFunctions in SelectStatement.authorize (CASSANDRA-21347) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
