This is an automated email from the ASF dual-hosted git repository. blerer pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 2f1c785910 Merge branch 'cassandra-4.1' into trunk add 596daeb7f0 Optimise BTree build, update and transform operations new acb5337e92 Merge branch cassandra-4.1 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: 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 ++-- .../BTreeBench.java} | 75 +- .../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, 4706 insertions(+), 1504 deletions(-) create mode 100644 src/java/org/apache/cassandra/utils/BulkIterator.java delete mode 100644 src/java/org/apache/cassandra/utils/btree/NodeBuilder.java delete mode 100644 src/java/org/apache/cassandra/utils/btree/TreeBuilder.java create mode 100644 src/java/org/apache/cassandra/utils/caching/TinyThreadLocalPool.java copy test/microbench/org/apache/cassandra/test/microbench/{BTreeBuildBench.java => btree/BTreeBench.java} (54%) create mode 100644 test/microbench/org/apache/cassandra/test/microbench/btree/BTreeBuildBench.java create mode 100644 test/microbench/org/apache/cassandra/test/microbench/btree/BTreeTransformBench.java create mode 100644 test/microbench/org/apache/cassandra/test/microbench/btree/BTreeUpdateBench.java create mode 100644 test/microbench/org/apache/cassandra/test/microbench/btree/IntVisitor.java create mode 100644 test/microbench/org/apache/cassandra/test/microbench/btree/Megamorphism.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org