This is an automated email from the ASF dual-hosted git repository. blerer pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
from a250126f0f Remove commons-lang dependency during build runtime add c378874a9f Utilise BTree improvements to reduce garbage and improve throughput add 50e7a3f5df Merge branch cassandra-4.0 into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../apache/cassandra/cql3/ColumnIdentifier.java | 6 +- .../apache/cassandra/db/ArrayClusteringBound.java | 7 +- .../apache/cassandra/db/BufferClusteringBound.java | 6 +- .../cassandra/db/BufferClusteringBoundary.java | 6 +- src/java/org/apache/cassandra/db/Clustering.java | 6 +- .../org/apache/cassandra/db/ClusteringBound.java | 4 +- .../cassandra/db/ClusteringBoundOrBoundary.java | 6 +- src/java/org/apache/cassandra/db/Columns.java | 127 +++-- src/java/org/apache/cassandra/db/DeletionInfo.java | 5 +- .../org/apache/cassandra/db/EmptyIterators.java | 2 +- .../apache/cassandra/db/MutableDeletionInfo.java | 7 +- .../apache/cassandra/db/RangeTombstoneList.java | 12 +- .../cassandra/db/RegularAndStaticColumns.java | 18 +- .../apache/cassandra/db/compaction/Scrubber.java | 32 +- .../db/filter/ClusteringIndexNamesFilter.java | 13 +- .../db/memtable/ShardedSkipListMemtable.java | 6 +- .../cassandra/db/memtable/SkipListMemtable.java | 9 +- .../db/partitions/AbstractBTreePartition.java | 52 +- .../db/partitions/AtomicBTreePartition.java | 101 ++-- .../cassandra/db/partitions/FilteredPartition.java | 2 +- .../cassandra/db/partitions/PartitionUpdate.java | 29 +- .../org/apache/cassandra/db/rows/AbstractCell.java | 8 +- .../org/apache/cassandra/db/rows/ArrayCell.java | 7 +- .../org/apache/cassandra/db/rows/BTreeRow.java | 107 +++- .../org/apache/cassandra/db/rows/BufferCell.java | 10 + src/java/org/apache/cassandra/db/rows/Cell.java | 11 +- .../org/apache/cassandra/db/rows/CellPath.java | 12 +- src/java/org/apache/cassandra/db/rows/Cells.java | 112 ---- .../org/apache/cassandra/db/rows/ColumnData.java | 172 ++++++ .../cassandra/db/rows/ComplexColumnData.java | 42 +- .../db/rows/RangeTombstoneBoundMarker.java | 7 +- .../db/rows/RangeTombstoneBoundaryMarker.java | 9 +- .../cassandra/db/rows/RangeTombstoneMarker.java | 4 +- src/java/org/apache/cassandra/db/rows/Row.java | 24 +- src/java/org/apache/cassandra/db/rows/Rows.java | 120 +--- .../db/rows/WrappingUnfilteredRowIterator.java | 2 +- .../org/apache/cassandra/db/view/TableViews.java | 24 +- .../org/apache/cassandra/dht/LocalPartitioner.java | 4 +- .../index/internal/CassandraIndexSearcher.java | 6 +- .../org/apache/cassandra/io/sstable/SSTable.java | 4 +- .../org/apache/cassandra/utils/btree/BTree.java | 85 +-- .../cassandra/utils/btree/UpdateFunction.java | 23 +- ...bstractAllocator.java => ByteBufferCloner.java} | 84 ++- .../utils/memory/{SlabPool.java => Cloner.java} | 43 +- .../cassandra/utils/memory/ContextAllocator.java | 59 -- .../cassandra/utils/memory/EnsureOnHeap.java | 8 +- .../cassandra/utils/memory/HeapAllocator.java | 41 -- .../memory/{NativePool.java => HeapCloner.java} | 22 +- .../apache/cassandra/utils/memory/HeapPool.java | 19 +- .../cassandra/utils/memory/MemtableAllocator.java | 7 +- .../utils/memory/MemtableBufferAllocator.java | 23 +- .../cassandra/utils/memory/NativeAllocator.java | 31 +- .../cassandra/utils/memory/SlabAllocator.java | 4 +- .../org/apache/cassandra/utils/LongBTreeTest.java | 8 +- .../btree/AtomicBTreePartitionUpdateBench.java | 615 +++++++++++++++++++++ .../test/microbench/btree/Megamorphism.java | 14 +- .../cql3/validation/operations/DeleteTest.java | 1 + test/unit/org/apache/cassandra/db/CellTest.java | 46 +- .../org/apache/cassandra/db/NativeCellTest.java | 12 +- .../org/apache/cassandra/db/rows/RowBuilder.java | 91 --- .../apache/cassandra/db/rows/RowsMergingTest.java | 286 ++++++++++ .../org/apache/cassandra/db/rows/RowsTest.java | 90 +-- .../apache/cassandra/utils/btree/BTreeTest.java | 13 +- 64 files changed, 1857 insertions(+), 910 deletions(-) rename src/java/org/apache/cassandra/utils/memory/{AbstractAllocator.java => ByteBufferCloner.java} (50%) copy src/java/org/apache/cassandra/utils/memory/{SlabPool.java => Cloner.java} (54%) delete mode 100644 src/java/org/apache/cassandra/utils/memory/ContextAllocator.java delete mode 100644 src/java/org/apache/cassandra/utils/memory/HeapAllocator.java copy src/java/org/apache/cassandra/utils/memory/{NativePool.java => HeapCloner.java} (70%) create mode 100644 test/microbench/org/apache/cassandra/test/microbench/btree/AtomicBTreePartitionUpdateBench.java delete mode 100644 test/unit/org/apache/cassandra/db/rows/RowBuilder.java create mode 100644 test/unit/org/apache/cassandra/db/rows/RowsMergingTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org