From eec381e0d658cc467b75d1abc0d8a89de9826e04 Mon Sep 17 00:00:00 2001
From: Benedict Elliott Smith <benedict@apache.org>
Date: Sun, 7 Sep 2014 21:32:55 +0700
Subject: [PATCH] fixup

---
 .../apache/cassandra/stress/StressAction.java |  2 +-
 .../SampledOpDistributionFactory.java         | 19 ++++++++++---------
 .../stress/settings/SettingsCommand.java      |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index 01370d487a..f697dd965e 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -198,7 +198,7 @@ public class StressAction implements Runnable
         if (durationUnits != null)
         {
             Uninterruptibles.sleepUninterruptibly(duration, durationUnits);
-            workQueue.stop();
+            workManager.stop();
         }
         else if (opCount <= 0)
         {
diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
index efc90bc744..9e1a5e8e41 100644
--- a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
+++ b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java
@@ -24,6 +24,7 @@ package org.apache.cassandra.stress.operations;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.math3.distribution.EnumeratedDistribution;
 import org.apache.commons.math3.util.Pair;
@@ -36,9 +37,9 @@ import org.apache.cassandra.stress.util.Timer;
 public abstract class SampledOpDistributionFactory<T> implements OpDistributionFactory
 {
 
-    final List<Pair<T, Double>> ratios;
+    final Map<T, Double> ratios;
     final DistributionFactory clustering;
-    protected SampledOpDistributionFactory(List<Pair<T, Double>> ratios, DistributionFactory clustering)
+    protected SampledOpDistributionFactory(Map<T, Double> ratios, DistributionFactory clustering)
     {
         this.ratios = ratios;
         this.clustering = clustering;
@@ -51,34 +52,34 @@ public abstract class SampledOpDistributionFactory<T> implements OpDistributionF
     {
         PartitionGenerator generator = newGenerator();
         List<Pair<Operation, Double>> operations = new ArrayList<>();
-        for (Pair<T, Double> ratio : ratios)
-            operations.add(new Pair<>(get(timer, generator, ratio.getFirst()), ratio.getSecond()));
+        for (Map.Entry<T, Double> ratio : ratios.entrySet())
+            operations.add(new Pair<>(get(timer, generator, ratio.getKey()), ratio.getValue()));
         return new SampledOpDistribution(new EnumeratedDistribution<>(operations), clustering.get());
     }
 
     public String desc()
     {
         List<T> keys = new ArrayList<>();
-        for (Pair<T, Double> p : ratios)
-            keys.add(p.getFirst());
+        for (Map.Entry<T, Double> ratio : ratios.entrySet())
+            keys.add(ratio.getKey());
         return keys.toString();
     }
 
     public Iterable<OpDistributionFactory> each()
     {
         List<OpDistributionFactory> out = new ArrayList<>();
-        for (final Pair<T, Double> ratio : ratios)
+        for (final Map.Entry<T, Double> ratio : ratios.entrySet())
         {
             out.add(new OpDistributionFactory()
             {
                 public OpDistribution get(Timer timer)
                 {
-                    return new FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, newGenerator(), ratio.getFirst()));
+                    return new FixedOpDistribution(SampledOpDistributionFactory.this.get(timer, newGenerator(), ratio.getKey()));
                 }
 
                 public String desc()
                 {
-                    return ratio.getFirst().toString();
+                    return ratio.getKey().toString();
                 }
 
                 public Iterable<OpDistributionFactory> each()
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
index 72df6de514..a1c89e1422 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommand.java
@@ -127,7 +127,7 @@ public abstract class SettingsCommand implements Serializable
         @Override
         public List<? extends Option> options()
         {
-            return Arrays.asList(duration, retries, ignoreErrors, consistencyLevel, atOnce);
+            return Arrays.asList(duration, noWarmup, consistencyLevel);
         }
     }