From 73b2dcc165155fd90ecc978c7281276e536d317d Mon Sep 17 00:00:00 2001
From: Benedict Elliott Smith <benedict@apache.org>
Date: Thu, 11 Sep 2014 12:35:29 +0700
Subject: [PATCH] cassandra-stress: ninja fix profile param for user command to
 required, and print required fields first

---
 .../stress/settings/GroupedOptions.java          | 16 ++++++++++++++++
 .../cassandra/stress/settings/OptionSimple.java  |  5 +++++
 .../settings/SettingsCommandPreDefined.java      |  6 ++----
 .../settings/SettingsCommandPreDefinedMixed.java |  7 ++-----
 .../stress/settings/SettingsCommandUser.java     |  7 +++++--
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/GroupedOptions.java b/tools/stress/src/org/apache/cassandra/stress/settings/GroupedOptions.java
index d0e63b0159..8bbba151be 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/GroupedOptions.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/GroupedOptions.java
@@ -26,6 +26,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.ImmutableList;
+
 public abstract class GroupedOptions
 {
 
@@ -112,6 +114,20 @@ public abstract class GroupedOptions
         }
     }
 
+    public static List<? extends Option> merge(List<? extends Option> ... optionss)
+    {
+        ImmutableList.Builder<Option> builder = ImmutableList.builder();
+        for (List<? extends Option> options : optionss)
+            for (Option option : options)
+                if (option instanceof OptionSimple && ((OptionSimple) option).isRequired())
+                    builder.add(option);
+        for (List<? extends Option> options : optionss)
+            for (Option option : options)
+                if (!(option instanceof OptionSimple && ((OptionSimple) option).isRequired()))
+                    builder.add(option);
+        return builder.build();
+    }
+
     public static String formatLong(String longDisplay, String description)
     {
         return String.format("%-40s %s", longDisplay, description);
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionSimple.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionSimple.java
index 71c1ffe1aa..ba26c2ab98 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionSimple.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionSimple.java
@@ -88,6 +88,11 @@ class OptionSimple extends Option implements Serializable
         return value != null;
     }
 
+    public boolean isRequired()
+    {
+        return required;
+    }
+
     public boolean present()
     {
         return value != null || defaultValue != null;
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefined.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefined.java
index ab60dd12e3..8583e90de0 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefined.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefined.java
@@ -22,6 +22,7 @@ package org.apache.cassandra.stress.settings;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -103,10 +104,7 @@ public class SettingsCommandPreDefined extends SettingsCommand
         @Override
         public List<? extends Option> options()
         {
-            final List<Option> options = new ArrayList<>();
-            options.addAll(parent.options());
-            options.add(add);
-            return options;
+            return merge(parent.options(), Arrays.asList(add, keysize));
         }
 
     }
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
index dc45b89625..6beb55f521 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
@@ -22,6 +22,7 @@ package org.apache.cassandra.stress.settings;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -108,11 +109,7 @@ public class SettingsCommandPreDefinedMixed extends SettingsCommandPreDefined
         @Override
         public List<? extends Option> options()
         {
-            final List<Option> options = new ArrayList<>();
-            options.add(clustering);
-            options.add(probabilities);
-            options.addAll(super.options());
-            return options;
+            return merge(Arrays.asList(clustering, probabilities), super.options());
         }
 
     }
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 2e30d62491..a6dad3536b 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
@@ -23,6 +23,9 @@ package org.apache.cassandra.stress.settings;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -88,13 +91,13 @@ public class SettingsCommandUser extends SettingsCommand
             this.parent = parent;
         }
         final OptionDistribution clustering = new OptionDistribution("clustering=", "gaussian(1..10)", "Distribution clustering runs of operations of the same kind");
-        final OptionSimple profile = new OptionSimple("profile=", ".*", null, "Specify the path to a yaml cql3 profile", false);
+        final OptionSimple profile = new OptionSimple("profile=", ".*", null, "Specify the path to a yaml cql3 profile", true);
         final OptionAnyProbabilities ops = new OptionAnyProbabilities("ops", "Specify the ratios for inserts/queries to perform; e.g. ops(insert=2,<query1>=1) will perform 2 inserts for each query1");
 
         @Override
         public List<? extends Option> options()
         {
-            return ImmutableList.<Option>builder().add(ops, clustering, profile).addAll(parent.options()).build();
+            return merge(Arrays.asList(ops, profile, clustering), parent.options());
         }
     }