You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2014/12/12 15:10:26 UTC
[5/5] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36280a07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36280a07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36280a07
Branch: refs/heads/trunk
Commit: 36280a078366b890d9bbc3ab71617acd4690dd79
Parents: add839d 6c579a0
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Fri Dec 12 14:10:04 2014 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Fri Dec 12 14:10:04 2014 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/stress/Operation.java | 86 ++-
.../apache/cassandra/stress/StressAction.java | 96 +---
.../apache/cassandra/stress/StressMetrics.java | 1 -
.../apache/cassandra/stress/StressProfile.java | 65 +--
.../apache/cassandra/stress/StressServer.java | 3 +-
.../cassandra/stress/generate/Partition.java | 554 -------------------
.../stress/generate/PartitionGenerator.java | 39 +-
.../apache/cassandra/stress/generate/Seed.java | 52 +-
.../cassandra/stress/generate/SeedManager.java | 66 ++-
.../cassandra/stress/generate/values/Bytes.java | 7 +-
.../stress/generate/values/GeneratorConfig.java | 9 +-
.../stress/generate/values/Strings.java | 2 -
.../stress/generate/values/TimeUUIDs.java | 4 +-
.../stress/operations/FixedOpDistribution.java | 7 -
.../stress/operations/OpDistribution.java | 1 -
.../operations/SampledOpDistribution.java | 9 -
.../operations/predefined/CqlCounterAdder.java | 5 +-
.../operations/predefined/CqlCounterGetter.java | 5 +-
.../operations/predefined/CqlInserter.java | 6 +-
.../operations/predefined/CqlOperation.java | 32 +-
.../stress/operations/predefined/CqlReader.java | 7 +-
.../predefined/PredefinedOperation.java | 40 +-
.../predefined/ThriftCounterAdder.java | 9 +-
.../predefined/ThriftCounterGetter.java | 5 +-
.../operations/predefined/ThriftInserter.java | 11 +-
.../operations/predefined/ThriftReader.java | 7 +-
.../operations/userdefined/SchemaInsert.java | 52 +-
.../operations/userdefined/SchemaQuery.java | 55 +-
.../operations/userdefined/SchemaStatement.java | 16 +-
.../cassandra/stress/settings/Command.java | 5 +-
.../stress/settings/OptionAnyProbabilities.java | 8 +-
.../stress/settings/OptionDistribution.java | 4 +-
.../settings/OptionEnumProbabilities.java | 2 +-
.../cassandra/stress/settings/OptionMulti.java | 7 +-
.../settings/OptionRatioDistribution.java | 15 +-
.../stress/settings/SettingsColumn.java | 12 +-
.../stress/settings/SettingsCommand.java | 1 -
.../settings/SettingsCommandPreDefined.java | 7 +-
.../SettingsCommandPreDefinedMixed.java | 6 +-
.../stress/settings/SettingsCommandUser.java | 14 +-
.../stress/settings/SettingsErrors.java | 3 -
.../cassandra/stress/settings/SettingsNode.java | 7 +-
.../stress/settings/SettingsSchema.java | 1 -
.../stress/settings/StressSettings.java | 3 -
.../cassandra/stress/util/DynamicList.java | 15 +-
.../cassandra/stress/util/JavaDriverClient.java | 4 +-
.../stress/util/SmartThriftClient.java | 3 +-
.../org/apache/cassandra/stress/util/Timer.java | 1 -
.../apache/cassandra/stress/util/Timing.java | 1 -
.../cassandra/stress/util/TimingInterval.java | 1 -
51 files changed, 323 insertions(+), 1049 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ed31d5b,25140a8..05cb08d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,5 +1,46 @@@
+3.0
+ * 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 (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 clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063, 7813)
+ * 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)
+
+
2.1.3
+ * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
* Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
* Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383)
* Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
index 5cd50de,d1cc0d4..7ab8837
--- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
@@@ -28,10 -28,9 +28,9 @@@ import java.util.concurrent.Callable
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ThreadFactory;
+import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.commons.lang3.time.DurationFormatUtils;
-
import org.apache.cassandra.concurrent.NamedThreadFactory;
- import org.apache.cassandra.stress.settings.SettingsLog;
import org.apache.cassandra.stress.settings.StressSettings;
import org.apache.cassandra.stress.util.JmxCollector;
import org.apache.cassandra.stress.util.Timing;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterAdder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterGetter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlInserter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/operations/predefined/PredefinedOperation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36280a07/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
----------------------------------------------------------------------