Merge branch 'cassandra-2.1' into trunk

EugenCepoi · Dec 22, 2014 · 977cbdd · 977cbdd
2 parents bf599fb + 29ff2d2
commit 977cbdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -42,6 +42,7 @@
 
 
 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)

diff --git 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 SettingsCommandUser(Options options)
             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);

diff --git 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 static SettingsPopulation get(Map<String, String[]> clArgs, SettingsComma
         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)
             {