Merge branch 'cassandra-2.1' into trunk
Conflicts:
tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0586f69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0586f69
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0586f69
Branch: refs/heads/trunk
Commit: a0586f69291af79079db0f5cc495806a28fca7a6
Parents: bf9c503 6bbfb55
Author: Benedict Elliott Smith <bened...@apache.org>
Authored: Tue Mar 10 14:26:30 2015 +0000
Committer: Benedict Elliott Smith <bened...@apache.org>
Committed: Tue Mar 10 14:26:30 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/stress/Operation.java | 2 +-
.../apache/cassandra/stress/StressAction.java | 46 +++++----
.../apache/cassandra/stress/StressMetrics.java | 83 ++++++++++-----
.../apache/cassandra/stress/StressProfile.java | 15 ++-
.../stress/operations/FixedOpDistribution.java | 10 ++
.../stress/operations/OpDistribution.java | 2 +
.../operations/OpDistributionFactory.java | 6 +-
.../operations/SampledOpDistribution.java | 17 ++++
.../SampledOpDistributionFactory.java | 10 +-
.../cassandra/stress/settings/Command.java | 27 +++--
.../cassandra/stress/settings/Option.java | 1 +
.../stress/settings/OptionAnyProbabilities.java | 5 +
.../stress/settings/OptionDistribution.java | 17 ++--
.../cassandra/stress/settings/OptionMulti.java | 15 ++-
.../settings/OptionRatioDistribution.java | 5 +
.../stress/settings/SettingsCommand.java | 48 ++++++---
.../settings/SettingsCommandPreDefined.java | 12 ++-
.../stress/settings/SettingsCommandUser.java | 5 +
.../org/apache/cassandra/stress/util/Timer.java | 10 +-
.../apache/cassandra/stress/util/Timing.java | 75 +++++++++-----
.../cassandra/stress/util/TimingInterval.java | 102 +++++++++++++------
22 files changed, 354 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0586f69/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a6adfe0,af5206b..b2b33b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,68 -1,5 +1,69 @@@
+3.0
+ * Avoid memory allocation when searching index summary (CASSANDRA-8793)
+ * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
+ * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
+ * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
+ * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849,
8761)
+ * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
+ * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
+ * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
+ * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
+ * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
+ * Support direct buffer decompression for reads (CASSANDRA-8464)
+ * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
+ * Group sstables for anticompaction correctly (CASSANDRA-8578)
+ * Add ReadFailureException to native protocol, respond
+ immediately when replicas encounter errors while handling
+ a read request (CASSANDRA-7886)
+ * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
+ * Allow mixing token and partition key restrictions (CASSANDRA-7016)
+ * Support index key/value entries on map collections (CASSANDRA-8473)
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order and ignore duplicate values in partition key IN
restrictions (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
+ APIs (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any partition key column (CASSANDRA-7855)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781,
7929,
+ 7924, 7812, 8063, 7813, 7708)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * Improve concurrency of repair (CASSANDRA-6455, 8208)
+ * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
+ * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
+
2.1.4
+ * cassandra-stress reports per-operation statistics, plus misc
(CASSANDRA-8769)
* Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
* Use long for key count in cfstats (CASSANDRA-8913)
* Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0586f69/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index 12bdc3e,46ca488..a640058
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@@ -28,13 -29,11 +29,10 @@@ import java.util.concurrent.Callable
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadFactory;
+ import org.apache.cassandra.stress.util.*;
import org.apache.commons.lang3.time.DurationFormatUtils;
-
import org.apache.cassandra.concurrent.NamedThreadFactory;
import org.apache.cassandra.stress.settings.StressSettings;
- import org.apache.cassandra.stress.util.JmxCollector;
- import org.apache.cassandra.stress.util.Timing;
- import org.apache.cassandra.stress.util.TimingInterval;
- import org.apache.cassandra.stress.util.Uncertainty;
public class StressMetrics
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0586f69/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0586f69/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0586f69/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java
----------------------------------------------------------------------
