You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jz...@apache.org on 2018/06/08 19:08:27 UTC
[1/3] cassandra git commit: Remove BTree.Builder Recycler to reduce
memory usage
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 b1748198e -> ed5f8347e
refs/heads/trunk 800f0b394 -> 958e13d16
Remove BTree.Builder Recycler to reduce memory usage
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13929
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed5f8347
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed5f8347
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed5f8347
Branch: refs/heads/cassandra-3.11
Commit: ed5f8347ef0c7175cd96e59bc8bfaf3ed1f4697a
Parents: b174819
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Mon Jan 29 18:17:56 2018 -0800
Committer: Jay Zhuang <ja...@yahoo.com>
Committed: Fri Jun 8 10:40:06 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +-
.../columniterator/SSTableReversedIterator.java | 2 +-
.../org/apache/cassandra/db/rows/BTreeRow.java | 2 +-
.../cassandra/db/rows/ComplexColumnData.java | 5 +-
.../org/apache/cassandra/utils/btree/BTree.java | 69 +++++---------
.../test/microbench/BTreeBuildBench.java | 96 ++++++++++++++++++++
.../org/apache/cassandra/utils/BTreeTest.java | 33 ++++++-
8 files changed, 161 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e77d2e..7f4b655 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.3
+ * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
* Reduce nodetool GC thread count (CASSANDRA-14475)
* Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
* Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4edfbb1..54c5372 100644
--- a/build.xml
+++ b/build.xml
@@ -422,8 +422,8 @@
<dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.13"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.13"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.21"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.21"/>
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index cf8798d..6a0b7be 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@ -426,7 +426,7 @@ public class SSTableReversedIterator extends AbstractSSTableIterator
public void reset()
{
built = null;
- rowBuilder = BTree.builder(metadata.comparator);
+ rowBuilder.reuse();
deletionBuilder = MutableDeletionInfo.builder(partitionLevelDeletion, metadata().comparator, false);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 15ac30a..c70e0e2 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -738,7 +738,7 @@ public class BTreeRow extends AbstractRow
this.clustering = null;
this.primaryKeyLivenessInfo = LivenessInfo.EMPTY;
this.deletion = Deletion.LIVE;
- this.cells_ = null;
+ this.cells_.reuse();
this.hasComplex = false;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
index 380af7a..1395782 100644
--- a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
+++ b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
@@ -242,7 +242,10 @@ public class ComplexColumnData extends ColumnData implements Iterable<Cell>
{
this.column = column;
this.complexDeletion = DeletionTime.LIVE; // default if writeComplexDeletion is not called
- this.builder = BTree.builder(column.cellComparator());
+ if (builder == null)
+ builder = BTree.builder(column.cellComparator());
+ else
+ builder.reuse(column.cellComparator());
}
public void addComplexDeletion(DeletionTime complexDeletion)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/utils/btree/BTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/btree/BTree.java b/src/java/org/apache/cassandra/utils/btree/BTree.java
index a4519b9..a6c9826 100644
--- a/src/java/org/apache/cassandra/utils/btree/BTree.java
+++ b/src/java/org/apache/cassandra/utils/btree/BTree.java
@@ -21,12 +21,12 @@ package org.apache.cassandra.utils.btree;
import java.util.*;
import java.util.function.Consumer;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import com.google.common.collect.Ordering;
-import io.netty.util.Recycler;
import org.apache.cassandra.utils.ObjectSizes;
import static com.google.common.collect.Iterables.concat;
@@ -769,25 +769,14 @@ public class BTree
return 1 + lookupSizeMap(root, childIndex - 1);
}
- final static Recycler<Builder> builderRecycler = new Recycler<Builder>()
- {
- protected Builder newObject(Handle handle)
- {
- return new Builder(handle);
- }
- };
-
public static <V> Builder<V> builder(Comparator<? super V> comparator)
{
- Builder<V> builder = builderRecycler.get();
- builder.reuse(comparator);
-
- return builder;
+ return new Builder<>(comparator);
}
public static <V> Builder<V> builder(Comparator<? super V> comparator, int initialCapacity)
{
- return builder(comparator);
+ return new Builder<>(comparator, initialCapacity);
}
public static class Builder<V>
@@ -816,12 +805,23 @@ public class BTree
boolean detected = true; // true if we have managed to cheaply ensure sorted (+ filtered, if resolver == null) as we have added
boolean auto = true; // false if the user has promised to enforce the sort order and resolve any duplicates
QuickResolver<V> quickResolver;
- final Recycler.Handle recycleHandle;
+ protected Builder(Comparator<? super V> comparator)
+ {
+ this(comparator, 16);
+ }
+
+ protected Builder(Comparator<? super V> comparator, int initialCapacity)
+ {
+ if (initialCapacity == 0)
+ initialCapacity = 16;
+ this.comparator = comparator;
+ this.values = new Object[initialCapacity];
+ }
- private Builder(Recycler.Handle handle)
+ @VisibleForTesting
+ public Builder()
{
- this.recycleHandle = handle;
this.values = new Object[16];
}
@@ -833,7 +833,6 @@ public class BTree
this.detected = builder.detected;
this.auto = builder.auto;
this.quickResolver = builder.quickResolver;
- this.recycleHandle = null;
}
/**
@@ -851,30 +850,17 @@ public class BTree
return this;
}
- public void recycle()
+ public void reuse()
{
- if (recycleHandle != null)
- {
- this.cleanup();
- builderRecycler.recycle(this, recycleHandle);
- }
+ reuse(comparator);
}
- /**
- * Cleans up the Builder instance before recycling it.
- */
- private void cleanup()
+ public void reuse(Comparator<? super V> comparator)
{
- quickResolver = null;
+ this.comparator = comparator;
Arrays.fill(values, null);
count = 0;
detected = true;
- auto = true;
- }
-
- private void reuse(Comparator<? super V> comparator)
- {
- this.comparator = comparator;
}
public Builder<V> auto(boolean auto)
@@ -1101,16 +1087,9 @@ public class BTree
public Object[] build()
{
- try
- {
- if (auto)
- autoEnforce();
- return BTree.build(Arrays.asList(values).subList(0, count), UpdateFunction.noOp());
- }
- finally
- {
- this.recycle();
- }
+ if (auto)
+ autoEnforce();
+ return BTree.build(Arrays.asList(values).subList(0, count), UpdateFunction.noOp());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java
----------------------------------------------------------------------
diff --git a/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java b/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java
new file mode 100644
index 0000000..0d89ebb
--- /dev/null
+++ b/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.test.microbench;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.cassandra.utils.btree.BTree;
+import org.apache.cassandra.utils.btree.UpdateFunction;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 8, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 2)
+@Threads(4)
+@State(Scope.Benchmark)
+public class BTreeBuildBench
+{
+ private List<Integer> data;
+
+ @Param({"1", "2", "5", "10", "20", "40", "100", "1000", "10000", "100000"})
+ int dataSize;
+
+ private static final Comparator<Integer> CMP = new Comparator<Integer>()
+ {
+ public int compare(Integer o1, Integer o2)
+ {
+ return Integer.compare(o1, o2);
+ }
+ };
+
+ @Setup(Level.Trial)
+ public void setup()
+ {
+ data = new ArrayList<>(dataSize);
+ for (int i = 0 ; i < dataSize; i++)
+ data.add(i);
+ }
+
+ private int buildTree(List<Integer> data)
+ {
+ Object[] btree = BTree.build(data, UpdateFunction.noOp());
+ // access the btree to avoid java optimized out this code
+ return BTree.size(btree);
+ }
+
+ private int treeBuilderAddAll(List<Integer> data)
+ {
+ BTree.Builder<Integer> builder = BTree.builder(Comparator.naturalOrder());
+ Object[] btree = builder.addAll(data).build();
+ return BTree.size(btree);
+ }
+
+ @Benchmark
+ public int treeBuilderRecycleAdd()
+ {
+ BTree.Builder<Integer> builder = BTree.builder(Comparator.naturalOrder());
+ builder.auto(false);
+ for (Integer v : data)
+ builder.add(v);
+ Object[] btree = builder.build();
+ return BTree.size(btree);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/test/unit/org/apache/cassandra/utils/BTreeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/BTreeTest.java b/test/unit/org/apache/cassandra/utils/BTreeTest.java
index ec4cdb8..9a59e3a 100644
--- a/test/unit/org/apache/cassandra/utils/BTreeTest.java
+++ b/test/unit/org/apache/cassandra/utils/BTreeTest.java
@@ -261,6 +261,32 @@ public class BTreeTest
}
}
+ @Test
+ public void testBuilderReuse()
+ {
+ List<Integer> sorted = seq(20);
+ BTree.Builder<Integer> builder = BTree.builder(Comparator.naturalOrder());
+ builder.auto(false);
+ for (int i : sorted)
+ builder.add(i);
+ checkResult(20, builder.build());
+
+ builder.reuse();
+ assertTrue(builder.build() == BTree.empty());
+ for (int i = 0; i < 12; i++)
+ builder.add(sorted.get(i));
+ checkResult(12, builder.build());
+
+ builder.auto(true);
+ builder.reuse(Comparator.reverseOrder());
+ for (int i = 0; i < 12; i++)
+ builder.add(sorted.get(i));
+ checkResult(12, builder.build(), BTree.Dir.DESC);
+
+ builder.reuse();
+ assertTrue(builder.build() == BTree.empty());
+ }
+
private static class Accumulator extends Number implements Comparable<Accumulator>
{
final int base;
@@ -385,7 +411,12 @@ public class BTreeTest
private static void checkResult(int count, Object[] btree)
{
- Iterator<Integer> iter = BTree.slice(btree, CMP, BTree.Dir.ASC);
+ checkResult(count, btree, BTree.Dir.ASC);
+ }
+
+ private static void checkResult(int count, Object[] btree, BTree.Dir dir)
+ {
+ Iterator<Integer> iter = BTree.slice(btree, CMP, dir);
int i = 0;
while (iter.hasNext())
assertEquals(iter.next(), ints[i++]);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jz...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/958e13d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/958e13d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/958e13d1
Branch: refs/heads/trunk
Commit: 958e13d1667391c69ec82f54da7d371e6eba29d6
Parents: 800f0b3 ed5f834
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Fri Jun 8 10:47:14 2018 -0700
Committer: Jay Zhuang <ja...@yahoo.com>
Committed: Fri Jun 8 10:48:15 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +-
.../columniterator/SSTableReversedIterator.java | 2 +-
.../org/apache/cassandra/db/rows/BTreeRow.java | 2 +-
.../cassandra/db/rows/ComplexColumnData.java | 5 +-
.../org/apache/cassandra/utils/btree/BTree.java | 69 +++++---------
.../test/microbench/BTreeBuildBench.java | 96 ++++++++++++++++++++
.../org/apache/cassandra/utils/BTreeTest.java | 33 ++++++-
8 files changed, 161 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9857704,7f4b655..27c9561
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,253 -1,5 +1,254 @@@
+4.0
+ * Add option to sanity check tombstones on reads/compactions (CASSANDRA-14467)
+ * Add a virtual table to expose all running sstable tasks (CASSANDRA-14457)
+ * Let nodetool import take a list of directories (CASSANDRA-14442)
+ * Avoid unneeded memory allocations / cpu for disabled log levels (CASSANDRA-14488)
+ * Implement virtual keyspace interface (CASSANDRA-7622)
+ * nodetool import cleanup and improvements (CASSANDRA-14417)
+ * Bump jackson version to >= 2.9.5 (CASSANDRA-14427)
+ * Allow nodetool toppartitions without specifying table (CASSANDRA-14360)
+ * Audit logging for database activity (CASSANDRA-12151)
+ * Clean up build artifacts in docs container (CASSANDRA-14432)
+ * Minor network authz improvements (Cassandra-14413)
+ * Automatic sstable upgrades (CASSANDRA-14197)
+ * Replace deprecated junit.framework.Assert usages with org.junit.Assert (CASSANDRA-14431)
+ * Cassandra-stress throws NPE if insert section isn't specified in user profile (CASSSANDRA-14426)
+ * List clients by protocol versions `nodetool clientstats --by-protocol` (CASSANDRA-14335)
+ * Improve LatencyMetrics performance by reducing write path processing (CASSANDRA-14281)
+ * Add network authz (CASSANDRA-13985)
+ * Use the correct IP/Port for Streaming when localAddress is left unbound (CASSANDRA-14389)
+ * nodetool listsnapshots is missing local system keyspace snapshots (CASSANDRA-14381)
+ * Remove StreamCoordinator.streamExecutor thread pool (CASSANDRA-14402)
+ * Rename nodetool --with-port to --print-port to disambiguate from --port (CASSANDRA-14392)
+ * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398)
+ * Add ability to load new SSTables from a separate directory (CASSANDRA-6719)
+ * Eliminate background repair and probablistic read_repair_chance table options
+ (CASSANDRA-13910)
+ * Bind to correct local address in 4.0 streaming (CASSANDRA-14362)
+ * Use standard Amazon naming for datacenter and rack in Ec2Snitch (CASSANDRA-7839)
+ * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
+ * Abstract write path for pluggable storage (CASSANDRA-14118)
+ * nodetool describecluster should be more informative (CASSANDRA-13853)
+ * Compaction performance improvements (CASSANDRA-14261)
+ * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
+ * Add options to nodetool tablestats to sort and limit output (CASSANDRA-13889)
+ * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
+ * Add support for hybrid MIN(), MAX() speculative retry policies
+ (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
+ * Fix some regressions caused by 14058 (CASSANDRA-14353)
+ * Abstract repair for pluggable storage (CASSANDRA-14116)
+ * Add meaningful toString() impls (CASSANDRA-13653)
+ * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
+ * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
+ * Add coordinator write metric per CF (CASSANDRA-14232)
+ * Correct and clarify SSLFactory.getSslContext method and call sites (CASSANDRA-14314)
+ * Handle static and partition deletion properly on ThrottledUnfilteredIterator (CASSANDRA-14315)
+ * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
+ * Add ability to specify driver name and version (CASSANDRA-14275)
+ * Abstract streaming for pluggable storage (CASSANDRA-14115)
+ * Forced incremental repairs should promote sstables if they can (CASSANDRA-14294)
+ * Use Murmur3 for validation compactions (CASSANDRA-14002)
+ * Comma at the end of the seed list is interpretated as localhost (CASSANDRA-14285)
+ * Refactor read executor and response resolver, abstract read repair (CASSANDRA-14058)
+ * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
+ * Add a few options to nodetool verify (CASSANDRA-14201)
+ * CVE-2017-5929 Security vulnerability and redefine default log rotation policy (CASSANDRA-14183)
+ * Use JVM default SSL validation algorithm instead of custom default (CASSANDRA-13259)
+ * Better document in code InetAddressAndPort usage post 7544, incorporate port into UUIDGen node (CASSANDRA-14226)
+ * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132)
+ * Make it possible to change neverPurgeTombstones during runtime (CASSANDRA-14214)
+ * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174)
+ * Add nodetool clientlist (CASSANDRA-13665)
+ * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211)
+ * Non-disruptive seed node list reload (CASSANDRA-14190)
+ * Nodetool tablehistograms to print statics for all the tables (CASSANDRA-14185)
+ * Migrate dtests to use pytest and python3 (CASSANDRA-14134)
+ * Allow storage port to be configurable per node (CASSANDRA-7544)
+ * Make sub-range selection for non-frozen collections return null instead of empty (CASSANDRA-14182)
+ * BloomFilter serialization format should not change byte ordering (CASSANDRA-9067)
+ * Remove unused on-heap BloomFilter implementation (CASSANDRA-14152)
+ * Delete temp test files on exit (CASSANDRA-14153)
+ * Make PartitionUpdate and Mutation immutable (CASSANDRA-13867)
+ * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066)
+ * Fix cassandra-stress startup failure (CASSANDRA-14106)
+ * Remove initialDirectories from CFS (CASSANDRA-13928)
+ * Fix trivial log format error (CASSANDRA-14015)
+ * Allow sstabledump to do a json object per partition (CASSANDRA-13848)
+ * Add option to optimise merkle tree comparison across replicas (CASSANDRA-3200)
+ * Remove unused and deprecated methods from AbstractCompactionStrategy (CASSANDRA-14081)
+ * Fix Distribution.average in cassandra-stress (CASSANDRA-14090)
+ * Support a means of logging all queries as they were invoked (CASSANDRA-13983)
+ * Presize collections (CASSANDRA-13760)
+ * Add GroupCommitLogService (CASSANDRA-13530)
+ * Parallelize initial materialized view build (CASSANDRA-12245)
+ * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt (CASSANDRA-13965)
+ * Make LWTs send resultset metadata on every request (CASSANDRA-13992)
+ * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild (CASSANDRA-13963)
+ * Introduce leaf-only iterator (CASSANDRA-9988)
+ * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997)
+ * Allow only one concurrent call to StatusLogger (CASSANDRA-12182)
+ * Refactoring to specialised functional interfaces (CASSANDRA-13982)
+ * Speculative retry should allow more friendly params (CASSANDRA-13876)
+ * Throw exception if we send/receive repair messages to incompatible nodes (CASSANDRA-13944)
+ * Replace usages of MessageDigest with Guava's Hasher (CASSANDRA-13291)
+ * Add nodetool cmd to print hinted handoff window (CASSANDRA-13728)
+ * Fix some alerts raised by static analysis (CASSANDRA-13799)
+ * Checksum sstable metadata (CASSANDRA-13321, CASSANDRA-13593)
+ * Add result set metadata to prepared statement MD5 hash calculation (CASSANDRA-10786)
+ * Refactor GcCompactionTest to avoid boxing (CASSANDRA-13941)
+ * Expose recent histograms in JmxHistograms (CASSANDRA-13642)
+ * Fix buffer length comparison when decompressing in netty-based streaming (CASSANDRA-13899)
+ * Properly close StreamCompressionInputStream to release any ByteBuf (CASSANDRA-13906)
+ * Add SERIAL and LOCAL_SERIAL support for cassandra-stress (CASSANDRA-13925)
+ * LCS needlessly checks for L0 STCS candidates multiple times (CASSANDRA-12961)
+ * Correctly close netty channels when a stream session ends (CASSANDRA-13905)
+ * Update lz4 to 1.4.0 (CASSANDRA-13741)
+ * Optimize Paxos prepare and propose stage for local requests (CASSANDRA-13862)
+ * Throttle base partitions during MV repair streaming to prevent OOM (CASSANDRA-13299)
+ * Use compaction threshold for STCS in L0 (CASSANDRA-13861)
+ * Fix problem with min_compress_ratio: 1 and disallow ratio < 1 (CASSANDRA-13703)
+ * Add extra information to SASI timeout exception (CASSANDRA-13677)
+ * Add incremental repair support for --hosts, --force, and subrange repair (CASSANDRA-13818)
+ * Rework CompactionStrategyManager.getScanners synchronization (CASSANDRA-13786)
+ * Add additional unit tests for batch behavior, TTLs, Timestamps (CASSANDRA-13846)
+ * Add keyspace and table name in schema validation exception (CASSANDRA-13845)
+ * Emit metrics whenever we hit tombstone failures and warn thresholds (CASSANDRA-13771)
+ * Make netty EventLoopGroups daemon threads (CASSANDRA-13837)
+ * Race condition when closing stream sessions (CASSANDRA-13852)
+ * NettyFactoryTest is failing in trunk on macOS (CASSANDRA-13831)
+ * Allow changing log levels via nodetool for related classes (CASSANDRA-12696)
+ * Add stress profile yaml with LWT (CASSANDRA-7960)
+ * Reduce memory copies and object creations when acting on ByteBufs (CASSANDRA-13789)
+ * Simplify mx4j configuration (Cassandra-13578)
+ * Fix trigger example on 4.0 (CASSANDRA-13796)
+ * Force minumum timeout value (CASSANDRA-9375)
+ * Use netty for streaming (CASSANDRA-12229)
+ * Use netty for internode messaging (CASSANDRA-8457)
+ * Add bytes repaired/unrepaired to nodetool tablestats (CASSANDRA-13774)
+ * Don't delete incremental repair sessions if they still have sstables (CASSANDRA-13758)
+ * Fix pending repair manager index out of bounds check (CASSANDRA-13769)
+ * Don't use RangeFetchMapCalculator when RF=1 (CASSANDRA-13576)
+ * Don't optimise trivial ranges in RangeFetchMapCalculator (CASSANDRA-13664)
+ * Use an ExecutorService for repair commands instead of new Thread(..).start() (CASSANDRA-13594)
+ * Fix race / ref leak in anticompaction (CASSANDRA-13688)
+ * Expose tasks queue length via JMX (CASSANDRA-12758)
+ * Fix race / ref leak in PendingRepairManager (CASSANDRA-13751)
+ * Enable ppc64le runtime as unsupported architecture (CASSANDRA-13615)
+ * Improve sstablemetadata output (CASSANDRA-11483)
+ * Support for migrating legacy users to roles has been dropped (CASSANDRA-13371)
+ * Introduce error metrics for repair (CASSANDRA-13387)
+ * Refactoring to primitive functional interfaces in AuthCache (CASSANDRA-13732)
+ * Update metrics to 3.1.5 (CASSANDRA-13648)
+ * batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699)
+ * Avoid always rebuilding secondary indexes at startup (CASSANDRA-13725)
+ * Upgrade JMH from 1.13 to 1.19 (CASSANDRA-13727)
+ * Upgrade SLF4J from 1.7.7 to 1.7.25 (CASSANDRA-12996)
+ * Default for start_native_transport now true if not set in config (CASSANDRA-13656)
+ * Don't add localhost to the graph when calculating where to stream from (CASSANDRA-13583)
+ * Make CDC availability more deterministic via hard-linking (CASSANDRA-12148)
+ * Allow skipping equality-restricted clustering columns in ORDER BY clause (CASSANDRA-10271)
+ * Use common nowInSec for validation compactions (CASSANDRA-13671)
+ * Improve handling of IR prepare failures (CASSANDRA-13672)
+ * Send IR coordinator messages synchronously (CASSANDRA-13673)
+ * Flush system.repair table before IR finalize promise (CASSANDRA-13660)
+ * Fix column filter creation for wildcard queries (CASSANDRA-13650)
+ * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool setbatchlogreplaythrottle' (CASSANDRA-13614)
+ * fix race condition in PendingRepairManager (CASSANDRA-13659)
+ * Allow noop incremental repair state transitions (CASSANDRA-13658)
+ * Run repair with down replicas (CASSANDRA-10446)
+ * Added started & completed repair metrics (CASSANDRA-13598)
+ * Added started & completed repair metrics (CASSANDRA-13598)
+ * Improve secondary index (re)build failure and concurrency handling (CASSANDRA-10130)
+ * Improve calculation of available disk space for compaction (CASSANDRA-13068)
+ * Change the accessibility of RowCacheSerializer for third party row cache plugins (CASSANDRA-13579)
+ * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570)
+ * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585)
+ * Fix Randomness of stress values (CASSANDRA-12744)
+ * Allow selecting Map values and Set elements (CASSANDRA-7396)
+ * Fast and garbage-free Streaming Histogram (CASSANDRA-13444)
+ * Update repairTime for keyspaces on completion (CASSANDRA-13539)
+ * Add configurable upper bound for validation executor threads (CASSANDRA-13521)
+ * Bring back maxHintTTL propery (CASSANDRA-12982)
+ * Add testing guidelines (CASSANDRA-13497)
+ * Add more repair metrics (CASSANDRA-13531)
+ * RangeStreamer should be smarter when picking endpoints for streaming (CASSANDRA-4650)
+ * Avoid rewrapping an exception thrown for cache load functions (CASSANDRA-13367)
+ * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
+ * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
+ * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262)
+ * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421)
+ * Improve incremental repair logging (CASSANDRA-13468)
+ * Start compaction when incremental repair finishes (CASSANDRA-13454)
+ * Add repair streaming preview (CASSANDRA-13257)
+ * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
+ * Change protocol to allow sending key space independent of query string (CASSANDRA-10145)
+ * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661)
+ * Take number of files in L0 in account when estimating remaining compaction tasks (CASSANDRA-13354)
+ * Skip building views during base table streams on range movements (CASSANDRA-13065)
+ * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197)
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
+ * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
+ * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289)
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
+ * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
+ * Upgrade snappy-java to 1.1.2.6 (CASSANDRA-13336)
+ * Incremental repair not streaming correct sstables (CASSANDRA-13328)
+ * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
+ * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132)
+ * Remove config option index_interval (CASSANDRA-10671)
+ * Reduce lock contention for collection types and serializers (CASSANDRA-13271)
+ * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
+ * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292)
+ * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520)
+ * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226)
+ * Remove unused method (CASSANDRA-13227)
+ * Fix minor bugs related to #9143 (CASSANDRA-13217)
+ * Output warning if user increases RF (CASSANDRA-13079)
+ * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
+ * Add support for + and - operations on dates (CASSANDRA-11936)
+ * Fix consistency of incrementally repaired data (CASSANDRA-9143)
+ * Increase commitlog version (CASSANDRA-13161)
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Add histogram for delay to deliver hints (CASSANDRA-13234)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
+ * Trivial format error in StorageProxy (CASSANDRA-13551)
+ * Nodetool repair can hang forever if we lose the notification for the repair completing/failing (CASSANDRA-13480)
+ * Anticompaction can cause noisy log messages (CASSANDRA-13684)
+ * Switch to client init for sstabledump (CASSANDRA-13683)
+ * CQLSH: Don't pause when capturing data (CASSANDRA-13743)
+ * nodetool clearsnapshot requires --all to clear all snapshots (CASSANDRA-13391)
+ * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527)
+ * cqlshrc.sample uses incorrect option for time formatting (CASSANDRA-14243)
+
+
3.11.3
+ * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
* Reduce nodetool GC thread count (CASSANDRA-14475)
* Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
* Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 8bc5fc3,54c5372..c3710e6
--- a/build.xml
+++ b/build.xml
@@@ -420,10 -422,11 +420,10 @@@
<dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.19"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.19"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.21"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.21"/>
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
- <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.5" />
<dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.5" />
<dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/src/java/org/apache/cassandra/utils/btree/BTree.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/958e13d1/test/unit/org/apache/cassandra/utils/BTreeTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: Remove BTree.Builder Recycler to reduce
memory usage
Posted by jz...@apache.org.
Remove BTree.Builder Recycler to reduce memory usage
patch by Jay Zhuang; reviewed by jasobrown for CASSANDRA-13929
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed5f8347
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed5f8347
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed5f8347
Branch: refs/heads/trunk
Commit: ed5f8347ef0c7175cd96e59bc8bfaf3ed1f4697a
Parents: b174819
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Mon Jan 29 18:17:56 2018 -0800
Committer: Jay Zhuang <ja...@yahoo.com>
Committed: Fri Jun 8 10:40:06 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +-
.../columniterator/SSTableReversedIterator.java | 2 +-
.../org/apache/cassandra/db/rows/BTreeRow.java | 2 +-
.../cassandra/db/rows/ComplexColumnData.java | 5 +-
.../org/apache/cassandra/utils/btree/BTree.java | 69 +++++---------
.../test/microbench/BTreeBuildBench.java | 96 ++++++++++++++++++++
.../org/apache/cassandra/utils/BTreeTest.java | 33 ++++++-
8 files changed, 161 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e77d2e..7f4b655 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.3
+ * Remove BTree.Builder Recycler to reduce memory usage (CASSANDRA-13929)
* Reduce nodetool GC thread count (CASSANDRA-14475)
* Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
* Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4edfbb1..54c5372 100644
--- a/build.xml
+++ b/build.xml
@@ -422,8 +422,8 @@
<dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.13"/>
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.13"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.21"/>
+ <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.21"/>
<dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index cf8798d..6a0b7be 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@ -426,7 +426,7 @@ public class SSTableReversedIterator extends AbstractSSTableIterator
public void reset()
{
built = null;
- rowBuilder = BTree.builder(metadata.comparator);
+ rowBuilder.reuse();
deletionBuilder = MutableDeletionInfo.builder(partitionLevelDeletion, metadata().comparator, false);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 15ac30a..c70e0e2 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -738,7 +738,7 @@ public class BTreeRow extends AbstractRow
this.clustering = null;
this.primaryKeyLivenessInfo = LivenessInfo.EMPTY;
this.deletion = Deletion.LIVE;
- this.cells_ = null;
+ this.cells_.reuse();
this.hasComplex = false;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
index 380af7a..1395782 100644
--- a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
+++ b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
@@ -242,7 +242,10 @@ public class ComplexColumnData extends ColumnData implements Iterable<Cell>
{
this.column = column;
this.complexDeletion = DeletionTime.LIVE; // default if writeComplexDeletion is not called
- this.builder = BTree.builder(column.cellComparator());
+ if (builder == null)
+ builder = BTree.builder(column.cellComparator());
+ else
+ builder.reuse(column.cellComparator());
}
public void addComplexDeletion(DeletionTime complexDeletion)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/src/java/org/apache/cassandra/utils/btree/BTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/btree/BTree.java b/src/java/org/apache/cassandra/utils/btree/BTree.java
index a4519b9..a6c9826 100644
--- a/src/java/org/apache/cassandra/utils/btree/BTree.java
+++ b/src/java/org/apache/cassandra/utils/btree/BTree.java
@@ -21,12 +21,12 @@ package org.apache.cassandra.utils.btree;
import java.util.*;
import java.util.function.Consumer;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import com.google.common.collect.Ordering;
-import io.netty.util.Recycler;
import org.apache.cassandra.utils.ObjectSizes;
import static com.google.common.collect.Iterables.concat;
@@ -769,25 +769,14 @@ public class BTree
return 1 + lookupSizeMap(root, childIndex - 1);
}
- final static Recycler<Builder> builderRecycler = new Recycler<Builder>()
- {
- protected Builder newObject(Handle handle)
- {
- return new Builder(handle);
- }
- };
-
public static <V> Builder<V> builder(Comparator<? super V> comparator)
{
- Builder<V> builder = builderRecycler.get();
- builder.reuse(comparator);
-
- return builder;
+ return new Builder<>(comparator);
}
public static <V> Builder<V> builder(Comparator<? super V> comparator, int initialCapacity)
{
- return builder(comparator);
+ return new Builder<>(comparator, initialCapacity);
}
public static class Builder<V>
@@ -816,12 +805,23 @@ public class BTree
boolean detected = true; // true if we have managed to cheaply ensure sorted (+ filtered, if resolver == null) as we have added
boolean auto = true; // false if the user has promised to enforce the sort order and resolve any duplicates
QuickResolver<V> quickResolver;
- final Recycler.Handle recycleHandle;
+ protected Builder(Comparator<? super V> comparator)
+ {
+ this(comparator, 16);
+ }
+
+ protected Builder(Comparator<? super V> comparator, int initialCapacity)
+ {
+ if (initialCapacity == 0)
+ initialCapacity = 16;
+ this.comparator = comparator;
+ this.values = new Object[initialCapacity];
+ }
- private Builder(Recycler.Handle handle)
+ @VisibleForTesting
+ public Builder()
{
- this.recycleHandle = handle;
this.values = new Object[16];
}
@@ -833,7 +833,6 @@ public class BTree
this.detected = builder.detected;
this.auto = builder.auto;
this.quickResolver = builder.quickResolver;
- this.recycleHandle = null;
}
/**
@@ -851,30 +850,17 @@ public class BTree
return this;
}
- public void recycle()
+ public void reuse()
{
- if (recycleHandle != null)
- {
- this.cleanup();
- builderRecycler.recycle(this, recycleHandle);
- }
+ reuse(comparator);
}
- /**
- * Cleans up the Builder instance before recycling it.
- */
- private void cleanup()
+ public void reuse(Comparator<? super V> comparator)
{
- quickResolver = null;
+ this.comparator = comparator;
Arrays.fill(values, null);
count = 0;
detected = true;
- auto = true;
- }
-
- private void reuse(Comparator<? super V> comparator)
- {
- this.comparator = comparator;
}
public Builder<V> auto(boolean auto)
@@ -1101,16 +1087,9 @@ public class BTree
public Object[] build()
{
- try
- {
- if (auto)
- autoEnforce();
- return BTree.build(Arrays.asList(values).subList(0, count), UpdateFunction.noOp());
- }
- finally
- {
- this.recycle();
- }
+ if (auto)
+ autoEnforce();
+ return BTree.build(Arrays.asList(values).subList(0, count), UpdateFunction.noOp());
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java
----------------------------------------------------------------------
diff --git a/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java b/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java
new file mode 100644
index 0000000..0d89ebb
--- /dev/null
+++ b/test/microbench/org/apache/cassandra/test/microbench/BTreeBuildBench.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.test.microbench;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.cassandra.utils.btree.BTree;
+import org.apache.cassandra.utils.btree.UpdateFunction;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 8, time = 2, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 2)
+@Threads(4)
+@State(Scope.Benchmark)
+public class BTreeBuildBench
+{
+ private List<Integer> data;
+
+ @Param({"1", "2", "5", "10", "20", "40", "100", "1000", "10000", "100000"})
+ int dataSize;
+
+ private static final Comparator<Integer> CMP = new Comparator<Integer>()
+ {
+ public int compare(Integer o1, Integer o2)
+ {
+ return Integer.compare(o1, o2);
+ }
+ };
+
+ @Setup(Level.Trial)
+ public void setup()
+ {
+ data = new ArrayList<>(dataSize);
+ for (int i = 0 ; i < dataSize; i++)
+ data.add(i);
+ }
+
+ private int buildTree(List<Integer> data)
+ {
+ Object[] btree = BTree.build(data, UpdateFunction.noOp());
+ // access the btree to avoid java optimized out this code
+ return BTree.size(btree);
+ }
+
+ private int treeBuilderAddAll(List<Integer> data)
+ {
+ BTree.Builder<Integer> builder = BTree.builder(Comparator.naturalOrder());
+ Object[] btree = builder.addAll(data).build();
+ return BTree.size(btree);
+ }
+
+ @Benchmark
+ public int treeBuilderRecycleAdd()
+ {
+ BTree.Builder<Integer> builder = BTree.builder(Comparator.naturalOrder());
+ builder.auto(false);
+ for (Integer v : data)
+ builder.add(v);
+ Object[] btree = builder.build();
+ return BTree.size(btree);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed5f8347/test/unit/org/apache/cassandra/utils/BTreeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/BTreeTest.java b/test/unit/org/apache/cassandra/utils/BTreeTest.java
index ec4cdb8..9a59e3a 100644
--- a/test/unit/org/apache/cassandra/utils/BTreeTest.java
+++ b/test/unit/org/apache/cassandra/utils/BTreeTest.java
@@ -261,6 +261,32 @@ public class BTreeTest
}
}
+ @Test
+ public void testBuilderReuse()
+ {
+ List<Integer> sorted = seq(20);
+ BTree.Builder<Integer> builder = BTree.builder(Comparator.naturalOrder());
+ builder.auto(false);
+ for (int i : sorted)
+ builder.add(i);
+ checkResult(20, builder.build());
+
+ builder.reuse();
+ assertTrue(builder.build() == BTree.empty());
+ for (int i = 0; i < 12; i++)
+ builder.add(sorted.get(i));
+ checkResult(12, builder.build());
+
+ builder.auto(true);
+ builder.reuse(Comparator.reverseOrder());
+ for (int i = 0; i < 12; i++)
+ builder.add(sorted.get(i));
+ checkResult(12, builder.build(), BTree.Dir.DESC);
+
+ builder.reuse();
+ assertTrue(builder.build() == BTree.empty());
+ }
+
private static class Accumulator extends Number implements Comparable<Accumulator>
{
final int base;
@@ -385,7 +411,12 @@ public class BTreeTest
private static void checkResult(int count, Object[] btree)
{
- Iterator<Integer> iter = BTree.slice(btree, CMP, BTree.Dir.ASC);
+ checkResult(count, btree, BTree.Dir.ASC);
+ }
+
+ private static void checkResult(int count, Object[] btree, BTree.Dir dir)
+ {
+ Iterator<Integer> iter = BTree.slice(btree, CMP, dir);
int i = 0;
while (iter.hasNext())
assertEquals(iter.next(), ints[i++]);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org