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

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

commit b29ad8823a20d910a0b9b984b06421f390cc0a17
Merge: ab0a9b5f5c 50e7a3f5df
Author: Benjamin Lerer <b.le...@gmail.com>
AuthorDate: Thu Jul 7 14:11:03 2022 +0200

    Merge branch cassandra-4.1 into trunk

 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 ++-
 .../org/apache/cassandra/utils/memory/Cloner.java  |  54 ++
 .../cassandra/utils/memory/ContextAllocator.java   |  59 --
 .../cassandra/utils/memory/EnsureOnHeap.java       |   8 +-
 .../cassandra/utils/memory/HeapAllocator.java      |  41 --
 .../apache/cassandra/utils/memory/HeapCloner.java  |  37 ++
 .../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, 1904 insertions(+), 889 deletions(-)

diff --cc src/java/org/apache/cassandra/dht/LocalPartitioner.java
index df976701aa,09cd2b7d4a..127c5b7ded
--- a/src/java/org/apache/cassandra/dht/LocalPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/LocalPartitioner.java
@@@ -26,12 -26,9 +26,12 @@@ import java.util.Random
  import org.apache.cassandra.db.DecoratedKey;
  import org.apache.cassandra.db.CachedHashDecoratedKey;
  import org.apache.cassandra.db.marshal.AbstractType;
 +import org.apache.cassandra.db.marshal.ByteBufferAccessor;
  import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.apache.cassandra.utils.bytecomparable.ByteComparable;
 +import org.apache.cassandra.utils.bytecomparable.ByteSource;
  import org.apache.cassandra.utils.ObjectSizes;
- import org.apache.cassandra.utils.memory.HeapAllocator;
+ import org.apache.cassandra.utils.memory.HeapCloner;
  
  public class LocalPartitioner implements IPartitioner
  {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to