Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bdd9e3b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdd9e3b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bdd9e3b1 Branch: refs/heads/trunk Commit: bdd9e3b16b6c4843dcd322ef7fd098f443f9386b Parents: 9e1437c f27ab29 Author: T Jake Luciani <[email protected]> Authored: Thu Mar 10 10:25:36 2016 -0500 Committer: T Jake Luciani <[email protected]> Committed: Thu Mar 10 10:25:36 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + tools/cqlstress-example.yaml | 13 + tools/stress/README.txt | 5 + .../org/apache/cassandra/stress/Operation.java | 91 +------ .../apache/cassandra/stress/StressAction.java | 38 ++- .../apache/cassandra/stress/StressMetrics.java | 2 +- .../apache/cassandra/stress/StressProfile.java | 62 ++++- .../org/apache/cassandra/stress/StressYaml.java | 8 + .../apache/cassandra/stress/WorkManager.java | 2 +- .../stress/generate/TokenRangeIterator.java | 70 +++++ .../operations/OpDistributionFactory.java | 2 +- .../stress/operations/PartitionOperation.java | 130 +++++++++ .../SampledOpDistributionFactory.java | 16 +- .../predefined/PredefinedOperation.java | 3 +- .../operations/userdefined/SchemaStatement.java | 3 +- .../operations/userdefined/TokenRangeQuery.java | 270 +++++++++++++++++++ .../userdefined/ValidatingSchemaQuery.java | 3 +- .../cassandra/stress/settings/CliOption.java | 3 +- .../settings/SettingsCommandPreDefined.java | 2 +- .../SettingsCommandPreDefinedMixed.java | 2 +- .../stress/settings/SettingsCommandUser.java | 14 +- .../stress/settings/SettingsTokenRange.java | 77 ++++++ .../stress/settings/StressSettings.java | 8 +- 23 files changed, 701 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdd9e3b1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 56711b2,68f5714..92e89c8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,6 +1,12 @@@ +3.6 + * Resolve some eclipse-warnings (CASSANDRA-11086) + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) + + 3.5 Merged from 3.0: + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) * Remove recursive call from CompositesSearcher (CASSANDRA-11304) * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
