fixed canonicalization bug

improved output for --list-workloads and --list-scenarios

driver-web/src/main/java/io/nosqlbench/driver/webdriver/CommandTemplate.java

@@ -9,6 +9,7 @@ import io.nosqlbench.virtdata.core.templates.StringBindings;
 import io.nosqlbench.virtdata.core.templates.StringBindingsTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.nodes.ScalarNode;
 
 import java.security.InvalidParameterException;
 import java.util.LinkedHashMap;
@@ -25,10 +26,10 @@ public class CommandTemplate {
     private final String name;
     private LinkedHashMap<String, StringBindings> cmdspec = new LinkedHashMap<>();
 
-    public CommandTemplate(StmtDef stmt) {
+    public CommandTemplate(StmtDef stmt, boolean canonicalize) {
         this.name = stmt.getName();
         String prefixed = "command=" + stmt.getStmt();
-        Map<String,String> cmdMap = ParamsParser.parse(prefixed);
+        Map<String,String> cmdMap = ParamsParser.parse(prefixed, canonicalize);
         Map<String, String> paramsMap = stmt.getParams();
         paramsMap.forEach((k,v) -> {
             if (cmdMap.containsKey(k)) {
@@ -46,9 +47,9 @@ public class CommandTemplate {
 
     }
 
-    public CommandTemplate(String command, Map<String,String> bindings, String name) {
+    public CommandTemplate(String command, Map<String,String> bindings, String name, boolean canonicalize) {
         this.name = name;
-        Map<String, String> cmdMap = ParamsParser.parse(command);
+        Map<String, String> cmdMap = ParamsParser.parse(command, canonicalize);
         cmdMap.forEach((param,value) -> {
             ParsedTemplate paramTemplate = new ParsedTemplate(command,bindings);
             BindingsTemplate paramBindings = new BindingsTemplate(paramTemplate.getBindPoints());

driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java

@@ -14,6 +14,7 @@ import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import io.nosqlbench.engine.api.activityimpl.ActivityDef;
 import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
 import io.nosqlbench.engine.api.templating.StrInterpolator;
+import io.nosqlbench.engine.api.util.Synonyms;
 import io.nosqlbench.nb.api.content.NBIO;
 import io.nosqlbench.nb.api.errors.BasicError;
 import joptsimple.internal.Strings;
@@ -62,7 +63,7 @@ public class WebDriverActivity extends SimpleActivity {
     private OpSequence<CommandTemplate> initOpSequence() {
         OpSequence<CommandTemplate> sequence;
 
-        String yaml_loc = getParams().getOptionalString("yaml").orElse(null);
+        String yaml_loc = getParams().getOptionalString("yaml","workload").orElse(null);
         String side_loc = getParams().getOptionalString("side").orElse(null);
 
         if (yaml_loc == null && side_loc == null) {
@@ -161,7 +162,7 @@ public class WebDriverActivity extends SimpleActivity {
             .orElse(SequencerType.bucket);
         SequencePlanner<CommandTemplate> planner = new SequencePlanner<>(sequencerType);
         commands.forEach((name,cmd) -> {
-            CommandTemplate commandTemplate = new CommandTemplate(cmd, Map.of(), name);
+            CommandTemplate commandTemplate = new CommandTemplate(cmd, Map.of(), name, false);
             planner.addOp(commandTemplate,(c) -> 1L);
         });
         OpSequence<CommandTemplate> sequence = planner.resolve();
@@ -188,7 +189,7 @@ public class WebDriverActivity extends SimpleActivity {
 
         for (StmtDef optemplate : stmts) {
             long ratio = Long.parseLong(optemplate.getParams().getOrDefault("ratio", "1"));
-            CommandTemplate cmd = new CommandTemplate(optemplate);
+            CommandTemplate cmd = new CommandTemplate(optemplate, false);
             planner.addOp(cmd, ratio);
         }
         return planner.resolve();

driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/SetWindowSize.java

@@ -3,17 +3,17 @@ package io.nosqlbench.driver.webdriver.verbs;
 import io.nosqlbench.driver.webdriver.WebContext;
 import org.openqa.selenium.Dimension;
 
-public class WindowSetSize implements WebDriverVerb {
+public class SetWindowSize implements WebDriverVerb {
     private final int width;
     private final int height;
 
-    public WindowSetSize(int width, int height) {
+    public SetWindowSize(int width, int height) {
         this.width = width;
         this.height = height;
     }
 
-    public WindowSetSize(String windowSize) {
+    public SetWindowSize(String size) {
-        String[] xes = windowSize.split("x");
+        String[] xes = size.split("x");
         this.width = Integer.parseInt(xes[0]);
         this.height = Integer.parseInt(xes[1]);
     }

driver-web/src/main/java/io/nosqlbench/driver/webdriver/verbs/WebDriverVerbs.java

@@ -20,7 +20,8 @@ public class WebDriverVerbs {
         open(Open.class, (m) -> new Open(m.get("url"),m.get("target"))),
         get(Get.class, (m) -> new Get(m.get("target"))),
         mouseOver(MouseOver.class, (m) -> new MouseOver(Bys.get(m.get("target")))),
-        mouseOut(MouseOut.class,(m) -> new MouseOut())
+        mouseOut(MouseOut.class,(m) -> new MouseOut()),
+        setWindowSize(SetWindowSize.class,(m) -> new SetWindowSize(m.get("target"))),
 
 //        find_element(FindElement.class, (m) -> new FindElement(m.get("by"))),
 //        find_elements(FindElements.class, (m) -> new FindElements(m.get("by"))),

engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/ParameterMap.java

@@ -253,7 +253,7 @@ public class ParameterMap extends ConcurrentHashMap<String,Object> implements Bi
         if (encodedParams == null) {
             throw new RuntimeException("Must provide a non-null String to parse parameters.");
         }
-        Map<String, String> parsedMap = ParamsParser.parse(encodedParams);
+        Map<String, String> parsedMap = ParamsParser.parse(encodedParams,true);
         return new ParameterMap(parsedMap);
     }
 
@@ -346,4 +346,4 @@ public class ParameterMap extends ConcurrentHashMap<String,Object> implements Bi
         }
     }
 
-}
+}

engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParser.java

@@ -17,8 +17,12 @@
 
 package io.nosqlbench.engine.api.activityimpl.motor;
 
-import java.util.LinkedHashMap;
+import io.nosqlbench.engine.api.activityimpl.ParameterMap;
-import java.util.Map;
+import io.nosqlbench.engine.api.util.Synonyms;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
 
 
 /**
@@ -71,8 +75,10 @@ import java.util.Map;
  *
  */
 public class ParamsParser {
+    private final static Logger logger = LoggerFactory.getLogger(ParamsParser.class);
 
-    public static Map<String, String> parse(String input) {
+
+    public static Map<String, String> parse(String input, boolean canonicalize) {
 
         ParseState s = ParseState.expectingName;
 
@@ -131,7 +137,6 @@ public class ParamsParser {
                     break;
                 case expectingVal:
                     if (c == ' ') {
-
                     } else if (c == '\\') {
                         isEscaped = true;
                     } else if (c == '\'') {
@@ -215,6 +220,16 @@ public class ParamsParser {
             throw new RuntimeException("Unable to parse input:" + input);
         }
 
+        if (canonicalize) {
+            List<String> keys= new ArrayList<>(parms.keySet());
+            for (String key : keys) {
+                String properkey= Synonyms.canonicalize(key,logger);
+                if (!key.equals(properkey)) {
+                    parms.put(properkey,parms.get(key));
+                    parms.remove(key);
+                }
+            }
+        }
         return parms;
     }
 

engine-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java

@@ -28,7 +28,7 @@ public class ParamsParserTest {
     @Test
     public void testSimpleParams() {
         Map<String, String> p;
-        p = ParamsParser.parse("a=1;");
+        p = ParamsParser.parse("a=1;",true);
         assertThat(p).hasSize(1);
         assertThat(p).containsKey("a");
         assertThat(p.get("a")).isEqualTo("1");
@@ -37,7 +37,7 @@ public class ParamsParserTest {
     @Test
     public void testNullValueParam() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b=;");
+        p = ParamsParser.parse("a=1;b=;",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isNull();
@@ -46,7 +46,7 @@ public class ParamsParserTest {
     @Test
     public void testSingleQuote() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b='fourfive';");
+        p = ParamsParser.parse("a=1;b='fourfive';",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("fourfive");
@@ -55,7 +55,7 @@ public class ParamsParserTest {
     @Test
     public void testSingleQuotedEscape() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b='fo\\'urfive';");
+        p = ParamsParser.parse("a=1;b='fo\\'urfive';",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("fo'urfive");
@@ -65,7 +65,7 @@ public class ParamsParserTest {
     @Test
     public void testDoubleQuote() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b=\"six\";");
+        p = ParamsParser.parse("a=1;b=\"six\";",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("six");
@@ -74,7 +74,7 @@ public class ParamsParserTest {
     @Test
     public void testDoubleQuotedEscape() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b=\"si\\'x\";");
+        p = ParamsParser.parse("a=1;b=\"si\\'x\";",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("si'x");
@@ -83,7 +83,7 @@ public class ParamsParserTest {
     @Test
     public void testSQuotesInDQuotes() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b=\"si'x\";");
+        p = ParamsParser.parse("a=1;b=\"si'x\";",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("si'x");
@@ -92,7 +92,7 @@ public class ParamsParserTest {
     @Test
     public void testDQuotesInSquotes() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1;b='Sev\"en';");
+        p = ParamsParser.parse("a=1;b='Sev\"en';",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("Sev\"en");
@@ -101,7 +101,7 @@ public class ParamsParserTest {
     @Test
     public void testSpaces() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1; b=2;");
+        p = ParamsParser.parse("a=1; b=2;",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("a");
         assertThat(p.get("a")).isEqualTo("1");
@@ -112,7 +112,7 @@ public class ParamsParserTest {
     @Test
     public void testMissingSemi() {
         Map<String,String> p;
-        p = ParamsParser.parse("a=1; b=2");
+        p = ParamsParser.parse("a=1; b=2",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("b");
         assertThat(p.get("b")).isEqualTo("2");
@@ -120,7 +120,7 @@ public class ParamsParserTest {
 
     @Test
     public void testSpaceDelimiter() {
-        Map<String, String> p = ParamsParser.parse("a=1 b=2");
+        Map<String, String> p = ParamsParser.parse("a=1 b=2",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("a");
         assertThat(p).containsKey("b");
@@ -131,7 +131,7 @@ public class ParamsParserTest {
 
     @Test
     public void testSpaceDelimiterGappedFirst() {
-        Map<String, String> p = ParamsParser.parse("a=1 2 3 b=2");
+        Map<String, String> p = ParamsParser.parse("a=1 2 3 b=2",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("a");
         assertThat(p).containsKey("b");
@@ -142,7 +142,7 @@ public class ParamsParserTest {
 
     @Test
     public void testSpaceDelimiterGappedLast() {
-        Map<String, String> p = ParamsParser.parse("a=1 b=2 3 4");
+        Map<String, String> p = ParamsParser.parse("a=1 b=2 3 4",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("a");
         assertThat(p).containsKey("b");
@@ -153,7 +153,7 @@ public class ParamsParserTest {
 
     @Test(expected = RuntimeException.class)
     public void testValidNameException() {
-        Map<String, String> p = ParamsParser.parse("a=1\\\\;'\";b=2 3 4");
+        Map<String, String> p = ParamsParser.parse("a=1\\\\;'\";b=2 3 4",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("a");
         assertThat(p).containsKey("b");
@@ -163,7 +163,7 @@ public class ParamsParserTest {
 
     @Test
     public void testSkippingLiteralLeadingSpaces() {
-        Map<String, String> p = ParamsParser.parse("a= fiver b=\\ sixer");
+        Map<String, String> p = ParamsParser.parse("a= fiver b=\\ sixer",true);
         assertThat(p).hasSize(2);
         assertThat(p).containsKey("a");
         assertThat(p).containsKey("b");

engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java

@@ -307,22 +307,22 @@ public class NBCLI {
                         System.out.println("        " + templateEntry.getKey() + " = " + templateEntry.getValue());
                     }
                 }
-                System.out.println();
+                System.out.println("\n");
-                System.out.println(
-                    "# To see examples to learn from, use\n" +
-                        "# --list-workloads --include examples"
-                );
-                System.out.println(
-                    "# To see included scenarios, use\n" +
-                        "# --list-scenarios shows details."
-                );
-                System.out.println(
-                    "# To copy an example to your local directory, use\n" +
-                        " --copy <path>"
-                );
             }
 
         }
+
+        if (!includeScenarios) {
+            System.out.println("\n# To see scenarios scenarios, use --list-scenarios");
+        }
+
+        System.out.println(
+            "\n" +
+                "# To include examples, add --include=examples\n" +
+                "# To copy any of these to your local directory, use\n" +
+                "# --include=examples --copy=examplename\n"
+        );
+
     }
 
     private String loadHelpFile(String filename) {

nb/pom.xml

@@ -21,6 +21,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>driver-web</artifactId>
+            <version>3.12.86-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-cli</artifactId>