Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: CHANGES.txt build.xml debian/changelog tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77d0c175 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d0c175 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d0c175 Branch: refs/heads/trunk Commit: 77d0c175743c8c063282ba54d4dccd8a1676ebcb Parents: 9aff086 0580fb2 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Sun Sep 7 21:23:52 2014 +0700 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Sun Sep 7 21:23:52 2014 +0700 ---------------------------------------------------------------------- CHANGES.txt | 3 + NEWS.txt | 13 +- debian/changelog | 12 + tools/cqlstress-counter-example.yaml | 20 +- tools/cqlstress-example.yaml | 25 +- tools/cqlstress-insanity-example.yaml | 20 +- .../org/apache/cassandra/stress/Operation.java | 9 +- .../apache/cassandra/stress/StressAction.java | 169 +++------- .../apache/cassandra/stress/StressMetrics.java | 26 +- .../apache/cassandra/stress/StressProfile.java | 75 ++++- .../org/apache/cassandra/stress/StressYaml.java | 12 +- .../stress/generate/DistributionInverted.java | 7 + .../stress/generate/DistributionQuantized.java | 90 +++++ .../cassandra/stress/generate/FasterRandom.java | 116 +++++++ .../cassandra/stress/generate/Partition.java | 327 +++++++++++++++---- .../stress/generate/PartitionGenerator.java | 28 +- .../stress/generate/RatioDistribution.java | 5 + .../apache/cassandra/stress/generate/Seed.java | 67 ++++ .../stress/generate/SeedGenerator.java | 29 -- .../cassandra/stress/generate/SeedManager.java | 249 ++++++++++++++ .../stress/generate/SeedRandomGenerator.java | 54 --- .../stress/generate/SeedSeriesGenerator.java | 42 --- .../stress/generate/values/Booleans.java | 2 +- .../cassandra/stress/generate/values/Bytes.java | 9 +- .../cassandra/stress/generate/values/Dates.java | 3 +- .../stress/generate/values/Doubles.java | 2 +- .../stress/generate/values/Floats.java | 2 +- .../stress/generate/values/Generator.java | 4 +- .../stress/generate/values/HexBytes.java | 2 +- .../stress/generate/values/HexStrings.java | 4 +- .../cassandra/stress/generate/values/Inets.java | 2 +- .../stress/generate/values/Integers.java | 2 +- .../cassandra/stress/generate/values/Lists.java | 2 +- .../cassandra/stress/generate/values/Longs.java | 2 +- .../cassandra/stress/generate/values/Sets.java | 2 +- .../stress/generate/values/Strings.java | 12 +- .../stress/generate/values/TimeUUIDs.java | 2 +- .../cassandra/stress/generate/values/UUIDs.java | 2 +- .../operations/predefined/CqlCounterAdder.java | 5 + .../operations/predefined/CqlInserter.java | 5 + .../predefined/PredefinedOperation.java | 2 +- .../predefined/ThriftCounterAdder.java | 5 + .../operations/predefined/ThriftInserter.java | 5 + .../operations/userdefined/SchemaInsert.java | 80 +++-- .../operations/userdefined/SchemaQuery.java | 87 ++++- .../operations/userdefined/SchemaStatement.java | 53 +-- .../cassandra/stress/settings/CliOption.java | 3 +- .../stress/settings/OptionDistribution.java | 72 +++- .../settings/OptionRatioDistribution.java | 40 ++- .../stress/settings/SettingsCommand.java | 14 +- .../settings/SettingsCommandPreDefined.java | 13 +- .../SettingsCommandPreDefinedMixed.java | 10 +- .../stress/settings/SettingsCommandUser.java | 22 +- .../stress/settings/SettingsErrors.java | 92 ++++++ .../stress/settings/SettingsInsert.java | 103 ++++++ .../cassandra/stress/settings/SettingsKey.java | 153 --------- .../stress/settings/SettingsPopulation.java | 176 ++++++++++ .../stress/settings/SettingsSchema.java | 17 +- .../stress/settings/StressSettings.java | 23 +- .../cassandra/stress/util/DynamicList.java | 259 +++++++++++++++ .../org/apache/cassandra/stress/util/Timer.java | 7 +- .../apache/cassandra/stress/util/Timing.java | 13 +- .../cassandra/stress/util/TimingInterval.java | 6 +- 63 files changed, 1981 insertions(+), 736 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d0c175/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d0c175/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d0c175/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java index 08d538e,88c6e1e..d0e32b2 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java @@@ -24,8 -24,12 +24,11 @@@ package org.apache.cassandra.stress.set import java.io.File; import java.util.ArrayList; import java.util.List; - -import org.apache.commons.math3.util.Pair; +import java.util.Map; + import com.google.common.collect.ImmutableList; + + import com.datastax.driver.core.BatchStatement; import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.StressProfile; import org.apache.cassandra.stress.generate.DistributionFactory;