This is an automated email from the ASF dual-hosted git repository. rustyrazorblade pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6ae5ef8b9065f3262468a9d2c932a74f693d9a1b Merge: 80dc41bae5 38a7a78300 Author: Jon Haddad <[email protected]> AuthorDate: Fri Sep 4 14:03:42 2026 -0700 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + conf/cassandra_latest.yaml | 3 + .../config/CassandraRelevantProperties.java | 3 + .../apache/cassandra/db/ClusteringComparator.java | 10 +- src/java/org/apache/cassandra/db/DeletionTime.java | 19 +- .../apache/cassandra/db/ReusableLivenessInfo.java | 18 +- .../db/compaction/AbstractCompactionPipeline.java | 67 +- .../db/compaction/CursorCompactionPipeline.java | 50 +- .../cassandra/db/compaction/CursorCompactor.java | 1683 ++++++++++++-------- .../db/compaction/IteratorCompactionPipeline.java | 50 +- .../db/compaction/PreSortedBubbleInsert.java | 9 +- .../cassandra/db/compaction/StatefulCursor.java | 162 +- .../apache/cassandra/db/rows/CellLivenessInfo.java | 40 +- src/java/org/apache/cassandra/db/rows/Cells.java | 10 +- .../cassandra/db/rows/DeserializationHelper.java | 53 +- .../db/rows/ReusableCellLivenessInfo.java | 11 +- .../cassandra/io/sstable/BigCursorIndexWriter.java | 70 +- .../cassandra/io/sstable/ClusteringDescriptor.java | 1 - .../cassandra/io/sstable/CursorIndexWriter.java | 40 +- .../io/sstable/SSTableCursorKeyReader.java | 2 +- .../cassandra/io/sstable/SSTableCursorReader.java | 893 +++++++---- .../cassandra/io/sstable/SSTableCursorWriter.java | 506 +++++- .../cassandra/io/sstable/UnfilteredDescriptor.java | 182 ++- .../io/sstable/format/SSTableSimpleScanner.java | 8 + .../io/sstable/metadata/MetadataCollector.java | 16 +- .../apache/cassandra/io/util/DataOutputBuffer.java | 27 + .../apache/cassandra/schema/ColumnMetadata.java | 34 +- .../BigVolumeDifferentialCompactionTest.java | 60 +- test/conf/latest_diff.yaml | 2 + .../cassandra/distributed/impl/InstanceConfig.java | 2 + .../sstable/CompactionComplexColumnBench.java | 114 ++ .../cassandra/db/ReusableLivenessInfoTest.java | 9 +- .../db/compaction/CursorCellPathOrderingTest.java | 141 ++ .../CursorRangeTombstonePairingTest.java | 189 +++ .../db/compaction/CursorSegmentBoundsTest.java | 601 +++++++ .../CursorTerminalStateComparatorTest.java | 86 + .../db/compaction/StatefulCursorTest.java | 303 +++- .../AccordTableDifferentialCompactionTest.java | 52 +- .../BasicDifferentialCompactionTest.java | 31 +- ...logicalWideTableDifferentialCompactionTest.java | 44 + ...tionElementMergeDifferentialCompactionTest.java | 338 ++++ .../differential/ComplexColumnCursorReadTest.java | 521 ++++++ .../CursorCompactionAllocationGateTest.java | 256 ++- .../differential/CursorCompactionGateTest.java | 296 ++++ .../differential/CursorPartialRangeGateTest.java | 161 ++ .../differential/CursorSupportMatrixTest.java | 160 +- .../differential/DifferentialCompactionTester.java | 149 +- .../DroppedColumnDifferentialCompactionTest.java | 214 ++- .../EdgeCaseDifferentialCompactionTest.java | 863 +++++++++- ...arFutureDeletionDifferentialCompactionTest.java | 152 ++ .../HarryDifferentialCompactionTest.java | 15 +- .../LargeCollectionDifferentialCompactionTest.java | 110 ++ ...MaterializedViewDifferentialCompactionTest.java | 193 ++- .../MultiOutputDifferentialCompactionTest.java | 23 +- .../PartialRangeDifferentialCompactionTest.java | 187 +++ .../PartialSetDifferentialCompactionTest.java | 39 +- ...logicalWideTableDifferentialCompactionTest.java | 289 ++++ .../PurgeBoundaryDifferentialCompactionTest.java | 73 +- .../RandomDifferentialCompactionTest.java | 120 +- ...mestampInversionDifferentialCompactionTest.java | 184 +++ .../CollectionSizeGuardrailCompactionTest.java | 162 ++ .../CursorClusteringLengthValidationTest.java | 82 + .../sstable/CursorColumnsSubsetEncodingTest.java | 29 +- .../sstable/CursorIndexWriterOffsetWidthTest.java | 21 +- .../SSTableCursorReaderCopyCellValueTest.java | 264 +++ .../SSTableCursorReaderCorruptCellCountTest.java | 192 +++ .../cassandra/io/util/DataOutputBufferTest.java | 99 ++ 67 files changed, 8712 insertions(+), 2082 deletions(-) diff --cc CHANGES.txt index 33165033a6,77c18ca0ca..f9a4b2f709 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -6.0-alpha3 +7.0 + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or end (CASSANDRA-21068) + * Support pluggable default role initialization (CASSANDRA-21546) + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366) + * Don't increment client metrics on messaging service connection unpause (CASSANDRA-21491) + * Add nodetool getreplicas (CASSANDRA-17665) + * Implementation of CEP-49: Hardware-accelerated compression (CASSANDRA-20975) + * 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: + * Support multi-cell columns in cursor compaction (CASSANDRA-21463) * Optimize authorization logic for BatchStatement and TransactionStatement when a single table is updated (CASSANDRA-21606) * Upgrade lz4-java to 1.11.2 (CASSANDRA-21564) * Encode the CQL as raw bytes to avoid utf string serialization length limitation (CASSANDRA-21599) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
