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 acb5337e92c3032297c7fb9cfa7af4ef578c7c27
Merge: 2f1c785910 596daeb7f0
Author: Benjamin Lerer <b.le...@gmail.com>
AuthorDate: Fri May 6 18:15:43 2022 +0200
Merge branch cassandra-4.1 into trunk
src/java/org/apache/cassandra/db/Columns.java | 4 +-
.../db/partitions/AtomicBTreePartition.java | 14 +-
.../cassandra/db/partitions/PartitionUpdate.java | 6 +-
.../org/apache/cassandra/db/rows/BTreeRow.java | 2 +-
.../cassandra/db/rows/ComplexColumnData.java | 27 +-
src/java/org/apache/cassandra/db/rows/Row.java | 2 +-
.../org/apache/cassandra/utils/BulkIterator.java | 112 +
.../org/apache/cassandra/utils/btree/BTree.java | 3484 +++++++++++++++++---
.../apache/cassandra/utils/btree/BTreeRemoval.java | 12 +-
.../org/apache/cassandra/utils/btree/BTreeSet.java | 46 +-
.../apache/cassandra/utils/btree/NodeBuilder.java | 441 ---
.../apache/cassandra/utils/btree/TreeBuilder.java | 121 -
.../cassandra/utils/btree/UpdateFunction.java | 32 +-
.../utils/caching/TinyThreadLocalPool.java | 85 +
.../org/apache/cassandra/utils/LongBTreeTest.java | 587 ++--
.../test/microbench/btree/BTreeBench.java | 89 +
.../test/microbench/btree/BTreeBuildBench.java | 127 +
.../test/microbench/btree/BTreeTransformBench.java | 194 ++
.../test/microbench/btree/BTreeUpdateBench.java | 324 ++
.../test/microbench/btree/IntVisitor.java | 85 +
.../test/microbench/btree/Megamorphism.java | 169 +
.../cassandra/utils/btree/BTreeRemovalTest.java | 17 +-
.../utils/btree/BTreeSearchIteratorTest.java | 6 +-
.../apache/cassandra/utils/btree/BTreeTest.java | 238 +-
24 files changed, 4764 insertions(+), 1460 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
