This is an automated email from the ASF dual-hosted git repository.

rustyrazorblade pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 80dc41bae5 Merge branch 'cassandra-6.0' into trunk
     add 38a7a78300 Support multi-cell columns in cursor compaction
     new 6ae5ef8b90 Merge branch 'cassandra-6.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:
 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 +
 ...ench.java => CompactionComplexColumnBench.java} |   59 +-
 .../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 +-
 ...ogicalWideTableDifferentialCompactionTest.java} |   32 +-
 ...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, 8616 insertions(+), 2111 deletions(-)
 copy 
test/microbench/org/apache/cassandra/test/microbench/sstable/{CompactionLargeCellBench.java
 => CompactionComplexColumnBench.java} (52%)
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/CursorCellPathOrderingTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/CursorRangeTombstonePairingTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/CursorSegmentBoundsTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/CursorTerminalStateComparatorTest.java
 copy 
test/unit/org/apache/cassandra/{tools/nodetool/SetDefaultKeyspaceRFTest.java => 
db/compaction/differential/BtiPathologicalWideTableDifferentialCompactionTest.java}
 (56%)
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/CollectionElementMergeDifferentialCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/ComplexColumnCursorReadTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/CursorCompactionGateTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/CursorPartialRangeGateTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/FarFutureDeletionDifferentialCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/LargeCollectionDifferentialCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/PartialRangeDifferentialCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/PathologicalWideTableDifferentialCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/compaction/differential/TimestampInversionDifferentialCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/db/guardrails/CollectionSizeGuardrailCompactionTest.java
 create mode 100644 
test/unit/org/apache/cassandra/io/sstable/CursorClusteringLengthValidationTest.java
 create mode 100644 
test/unit/org/apache/cassandra/io/sstable/SSTableCursorReaderCopyCellValueTest.java
 create mode 100644 
test/unit/org/apache/cassandra/io/sstable/SSTableCursorReaderCorruptCellCountTest.java
 create mode 100644 
test/unit/org/apache/cassandra/io/util/DataOutputBufferTest.java


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to