You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/12/22 15:01:17 UTC
[1/2] cassandra git commit: Cassandra stress user defined writes
should populate sequentially
Repository: cassandra
Updated Branches:
refs/heads/trunk bf599fb5b -> 977cbddc4
Cassandra stress user defined writes should populate sequentially
Patch by tjake; reviewed by Benedict for CASSANDRA-8524
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29ff2d26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29ff2d26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29ff2d26
Branch: refs/heads/trunk
Commit: 29ff2d26f87f5977aa919d037ca3bbb67e40bdb0
Parents: 9775a9c
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Dec 22 08:59:12 2014 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Dec 22 08:59:12 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/settings/SettingsCommandUser.java | 5 +++++
.../apache/cassandra/stress/settings/SettingsPopulation.java | 5 +++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ff2d26/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f7b47e8..64bdb62 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.3
+ * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
* Fix regression in SSTableRewriter causing some rows to become unreadable
during compaction (CASSANDRA-8429)
* Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ff2d26/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
index 9841433..d5b221c 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
@@ -65,6 +65,11 @@ public class SettingsCommandUser extends SettingsCommand
throw new IllegalArgumentException("Must specify at least one command with a non-zero ratio");
}
+ public boolean hasInsertOnly()
+ {
+ return ratios.size() == 1 && ratios.containsKey("insert");
+ }
+
public OpDistributionFactory getFactory(final StressSettings settings)
{
final SeedManager seeds = new SeedManager(settings);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ff2d26/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
index da4c282..e57faea 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsPopulation.java
@@ -134,6 +134,11 @@ public class SettingsPopulation implements Serializable
String[] params = clArgs.remove("-pop");
if (params == null)
{
+ if (command instanceof SettingsCommandUser && ((SettingsCommandUser)command).hasInsertOnly())
+ {
+ return new SettingsPopulation(new SequentialOptions(defaultLimit));
+ }
+
// return defaults:
switch(command.type)
{
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@apache.org.
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/977cbddc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/977cbddc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/977cbddc
Branch: refs/heads/trunk
Commit: 977cbddc44da75a39813a84c582c7a9e08099d8c
Parents: bf599fb 29ff2d2
Author: T Jake Luciani <ja...@apache.org>
Authored: Mon Dec 22 09:01:01 2014 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Mon Dec 22 09:01:01 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/settings/SettingsCommandUser.java | 5 +++++
.../apache/cassandra/stress/settings/SettingsPopulation.java | 5 +++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/977cbddc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9e9a254,64bdb62..03d7e7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,5 +1,48 @@@
+3.0
+ * 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 (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
+ * Stress - user defined writes should populate sequentally (CASSANDRA-8524)
* Fix regression in SSTableRewriter causing some rows to become unreadable
during compaction (CASSANDRA-8429)
* Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510)