cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [21/23] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Mon, 07 Jul 2014 17:34:44 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35b88c56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35b88c56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35b88c56

Branch: refs/heads/trunk
Commit: 35b88c560f8a294a4502f83901647d34f6532863
Parents: 4e53152 7536429
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Mon Jul 7 18:25:27 2014 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Mon Jul 7 18:25:27 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/thrift/ThriftConversion.java      |  19 +
 .../org/apache/cassandra/utils/UUIDGen.java     |   8 +
 tools/bin/cassandra-stress                      |   2 +-
 tools/cqlstress-counter-example.yaml            |  85 +++
 tools/cqlstress-example.yaml                    |  99 +++
 tools/cqlstress-insanity-example.yaml           | 102 +++
 .../org/apache/cassandra/stress/Operation.java  | 218 +-----
 .../apache/cassandra/stress/StressAction.java   | 262 +++----
 .../apache/cassandra/stress/StressMetrics.java  |  17 +-
 .../apache/cassandra/stress/StressProfile.java  | 504 +++++++++++++
 .../org/apache/cassandra/stress/StressYaml.java |  38 +
 .../cassandra/stress/generate/Distribution.java |  57 ++
 .../generate/DistributionBoundApache.java       |  84 +++
 .../stress/generate/DistributionFactory.java    |  31 +
 .../stress/generate/DistributionFixed.java      |  54 ++
 .../stress/generate/DistributionInverted.java   |  37 +
 .../generate/DistributionOffsetApache.java      |  80 +++
 .../cassandra/stress/generate/Partition.java    | 343 +++++++++
 .../stress/generate/PartitionGenerator.java     |  80 +++
 .../stress/generate/RatioDistribution.java      |  25 +
 .../generate/RatioDistributionFactory.java      |  31 +
 .../apache/cassandra/stress/generate/Row.java   |  22 +
 .../stress/generate/SeedGenerator.java          |   8 +
 .../stress/generate/SeedRandomGenerator.java    |  33 +
 .../stress/generate/SeedSeriesGenerator.java    |  21 +
 .../stress/generate/values/Booleans.java        |  37 +
 .../cassandra/stress/generate/values/Bytes.java |  54 ++
 .../cassandra/stress/generate/values/Dates.java |  46 ++
 .../stress/generate/values/Doubles.java         |  37 +
 .../stress/generate/values/Floats.java          |  37 +
 .../stress/generate/values/Generator.java       |  50 ++
 .../stress/generate/values/GeneratorConfig.java |  68 ++
 .../stress/generate/values/HexBytes.java        |  56 ++
 .../stress/generate/values/HexStrings.java      |  55 ++
 .../cassandra/stress/generate/values/Inets.java |  57 ++
 .../stress/generate/values/Integers.java        |  38 +
 .../cassandra/stress/generate/values/Lists.java |  55 ++
 .../cassandra/stress/generate/values/Longs.java |  37 +
 .../cassandra/stress/generate/values/Sets.java  |  54 ++
 .../stress/generate/values/Strings.java         |  49 ++
 .../stress/generate/values/TimeUUIDs.java       |  51 ++
 .../cassandra/stress/generate/values/UUIDs.java |  39 +
 .../cassandra/stress/generatedata/DataGen.java  |  39 -
 .../stress/generatedata/DataGenBytesRandom.java |  45 --
 .../stress/generatedata/DataGenFactory.java     |  30 -
 .../stress/generatedata/DataGenHex.java         |  60 --
 .../DataGenHexFromDistribution.java             |  66 --
 .../generatedata/DataGenHexFromOpIndex.java     |  48 --
 .../generatedata/DataGenStringDictionary.java   | 107 ---
 .../generatedata/DataGenStringRepeats.java      |  90 ---
 .../stress/generatedata/Distribution.java       |  40 --
 .../generatedata/DistributionBoundApache.java   |  63 --
 .../generatedata/DistributionFactory.java       |  31 -
 .../stress/generatedata/DistributionFixed.java  |  46 --
 .../generatedata/DistributionOffsetApache.java  |  61 --
 .../generatedata/DistributionSeqBatch.java      |  68 --
 .../cassandra/stress/generatedata/KeyGen.java   |  54 --
 .../cassandra/stress/generatedata/RowGen.java   |  53 --
 .../generatedata/RowGenDistributedSize.java     | 116 ---
 .../stress/operations/CqlCounterAdder.java      |  77 --
 .../stress/operations/CqlCounterGetter.java     |  69 --
 .../operations/CqlIndexedRangeSlicer.java       | 118 ---
 .../stress/operations/CqlInserter.java          |  88 ---
 .../stress/operations/CqlMultiGetter.java       |  42 --
 .../stress/operations/CqlOperation.java         | 698 ------------------
 .../stress/operations/CqlRangeSlicer.java       |  59 --
 .../cassandra/stress/operations/CqlReader.java  |  91 ---
 .../stress/operations/FixedOpDistribution.java  |  25 +
 .../stress/operations/OpDistribution.java       |  11 +
 .../operations/OpDistributionFactory.java       |  12 +
 .../operations/SampledOpDistribution.java       |  41 ++
 .../SampledOpDistributionFactory.java           |  72 ++
 .../stress/operations/ThriftCounterAdder.java   |  95 ---
 .../stress/operations/ThriftCounterGetter.java  |  68 --
 .../operations/ThriftIndexedRangeSlicer.java    | 114 ---
 .../stress/operations/ThriftInserter.java       | 117 ---
 .../stress/operations/ThriftMultiGetter.java    |  80 ---
 .../stress/operations/ThriftRangeSlicer.java    |  85 ---
 .../stress/operations/ThriftReader.java         |  94 ---
 .../operations/predefined/CqlCounterAdder.java  |  84 +++
 .../operations/predefined/CqlCounterGetter.java |  74 ++
 .../operations/predefined/CqlInserter.java      |  79 ++
 .../operations/predefined/CqlOperation.java     | 714 +++++++++++++++++++
 .../stress/operations/predefined/CqlReader.java |  87 +++
 .../predefined/PredefinedOperation.java         | 248 +++++++
 .../predefined/ThriftCounterAdder.java          |  86 +++
 .../predefined/ThriftCounterGetter.java         |  66 ++
 .../operations/predefined/ThriftInserter.java   |  96 +++
 .../operations/predefined/ThriftReader.java     |  79 ++
 .../operations/userdefined/SchemaInsert.java    | 144 ++++
 .../operations/userdefined/SchemaQuery.java     |  86 +++
 .../operations/userdefined/SchemaStatement.java | 164 +++++
 .../cassandra/stress/settings/Command.java      |  24 +-
 .../stress/settings/CommandCategory.java        |   4 +-
 .../stress/settings/OptionAnyProbabilities.java |  78 ++
 .../stress/settings/OptionDataGen.java          | 203 ------
 .../stress/settings/OptionDistribution.java     |  75 +-
 .../settings/OptionEnumProbabilities.java       |  62 ++
 .../cassandra/stress/settings/OptionMulti.java  |   3 +-
 .../settings/OptionRatioDistribution.java       | 166 +++++
 .../cassandra/stress/settings/OptionSimple.java |   5 +-
 .../stress/settings/SettingsColumn.java         |  50 +-
 .../stress/settings/SettingsCommand.java        |  58 +-
 .../stress/settings/SettingsCommandMixed.java   | 207 ------
 .../settings/SettingsCommandPreDefined.java     | 145 ++++
 .../SettingsCommandPreDefinedMixed.java         | 151 ++++
 .../stress/settings/SettingsCommandUser.java    | 135 ++++
 .../cassandra/stress/settings/SettingsKey.java  |  27 +-
 .../cassandra/stress/settings/SettingsMisc.java |   2 +-
 .../cassandra/stress/settings/SettingsMode.java |   6 +-
 .../stress/settings/SettingsSchema.java         |  77 +-
 .../stress/settings/SettingsTransport.java      |   2 +-
 .../stress/settings/StressSettings.java         |  36 +-
 .../stress/settings/ValidationType.java         |   8 +
 .../cassandra/stress/util/JavaDriverClient.java |  19 +-
 .../stress/util/SmartThriftClient.java          |   4 +-
 .../org/apache/cassandra/stress/util/Timer.java |  17 +-
 .../cassandra/stress/util/TimingInterval.java   |  26 +-
 119 files changed, 5861 insertions(+), 3890 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/35b88c56/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 682f599,ff2f586..a0983af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +2.1.1
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 +
  2.1.0-rc3
+  * Introduce CQL support for stress tool (CASSANDRA-6146)
   * Fix ClassCastException processing expired messages (CASSANDRA-7496)
   * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
   * Remove left-over populate_io_cache_on_flush and replicate_on_write


Mime
View raw message