WIP

2025-02-25 18:55:28 -06:00 · 2020-03-16 19:33:15 -04:00
parent 550a942712
commit e24af60c88
14 changed files with 197 additions and 136 deletions
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/EBCLIOptions.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/EBCLIOptions.java
@@ -1,6 +1,9 @@
 package io.nosqlbench.engine.cli;

 import ch.qos.logback.classic.Level;
+import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
+import io.nosqlbench.engine.api.activityconfig.yaml.Scenarios;
+import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
 import io.nosqlbench.engine.api.metrics.IndicatorMode;
 import io.nosqlbench.engine.api.util.NosqlBenchFiles;
 import io.nosqlbench.engine.api.util.Unit;
@@ -314,24 +317,43 @@ public class EBCLIOptions {
                        Cmd script = parseScriptCmd(arglist);
                        cmdList.add(script);
                    } else {
-                        Optional<Path> path = NosqlBenchFiles.findOptionalPath(word, "yaml", "activities");
+                        Optional<Path> path = NosqlBenchFiles.findOptionalPath(word, "yaml", "activities", "activities/baselines");
                        if(path.isPresent()){
                            arglist.removeFirst();
-                            arglist.addFirst("yaml="+path.toString());
-                            Cmd script = parseWorkloladYamlCmd(arglist);
-                            cmdList.add(script);
+                            String scenarioFilter = null;
+                            if (arglist.size() > 0 && arglist.peekFirst().contains("=")){
+                                scenarioFilter = arglist.peekFirst();
+                                arglist.removeFirst();
+                            };
+                            arglist.addFirst("yaml="+path.get().toString());
+                            parseWorkloadYamlCmds(path.get().toString(), arglist, scenarioFilter);
                        }
                        else {
                            throw new InvalidParameterException("unrecognized option:" + word);
                        }
                    }
+                    break;
            }
        }
    }

-    private Cmd parseWorkloladYamlCmd(LinkedList<String> arglist) {
+    private void parseWorkloadYamlCmds(String yamlPath, LinkedList<String> arglist, String scenarioFilter) {
+        StmtsDocList stmts = StatementsLoader.load(logger, yamlPath);

-        return null;
+        Scenarios scenarios = stmts.getDocScenarios();
+
+        String scenarioName = "default";
+        if (scenarioFilter != null){
+            scenarioName = scenarioFilter;
+        }
+
+        List<String> cmds = scenarios.getNamedScenario(scenarioName);
+
+        for (String cmd : cmds) {
+            // Is there a better way to do this than regex?
+            parse(cmd.split(" "));
+        }
+        arglist.removeFirst();
    }

    private Map<String, Level> parseLogLevelOverrides(String levelsSpec) {
@@ -564,100 +586,100 @@ public class EBCLIOptions {
        histoLoggerConfigs.add(String.format("%s:%s:%s",file,pattern,interval));
    }

-public static enum CmdType {
-    start,
-    start2,
-    run,
-    run2,
-    stop,
-    await,
-    script,
-    fragment,
-    waitmillis,
-}
-
-public static class Cmd {
-    private CmdType cmdType;
-    private String cmdSpec;
-    private Map<String, String> cmdArgs;
-
-    public Cmd(CmdType cmdType, String cmdSpec) {
-        this.cmdSpec = cmdSpec;
-        this.cmdType = cmdType;
+    public static enum CmdType {
+        start,
+        start2,
+        run,
+        run2,
+        stop,
+        await,
+        script,
+        fragment,
+        waitmillis,
    }

-    public Cmd(CmdType cmdType, String cmdSpec, Map<String, String> cmdArgs) {
-        this(cmdType, cmdSpec);
-        this.cmdArgs = cmdArgs;
-    }
+    public static class Cmd {
+        private CmdType cmdType;
+        private String cmdSpec;
+        private Map<String, String> cmdArgs;

-    public String getCmdSpec() {
-
-        if (cmdSpec.startsWith("'") && cmdSpec.endsWith("'")) {
-            return cmdSpec.substring(1,cmdSpec.length()-1);
+        public Cmd(CmdType cmdType, String cmdSpec) {
+            this.cmdSpec = cmdSpec;
+            this.cmdType = cmdType;
        }
-        if (cmdSpec.startsWith("\"") && cmdSpec.endsWith("\"")) {
-            return cmdSpec.substring(1,cmdSpec.length()-1);
+
+        public Cmd(CmdType cmdType, String cmdSpec, Map<String, String> cmdArgs) {
+            this(cmdType, cmdSpec);
+            this.cmdArgs = cmdArgs;
        }
-        return cmdSpec;
-    }

-    public CmdType getCmdType() {
-        return cmdType;
-    }
+        public String getCmdSpec() {

-    public void setCmdType(CmdType cmdType) {
-        this.cmdType = cmdType;
-    }
+            if (cmdSpec.startsWith("'") && cmdSpec.endsWith("'")) {
+                return cmdSpec.substring(1,cmdSpec.length()-1);
+            }
+            if (cmdSpec.startsWith("\"") && cmdSpec.endsWith("\"")) {
+                return cmdSpec.substring(1,cmdSpec.length()-1);
+            }
+            return cmdSpec;
+        }

-    public Map<String, String> getCmdArgs() {
-        return cmdArgs;
-    }
+        public CmdType getCmdType() {
+            return cmdType;
+        }

-    public String toString() {
-        return "type:" + cmdType + ";spec=" + cmdSpec
-                + ((cmdArgs != null) ? ";cmdArgs=" + cmdArgs.toString() : "");
-    }
-}
+        public void setCmdType(CmdType cmdType) {
+            this.cmdType = cmdType;
+        }

-public static class LoggerConfig {
-    public String file = "";
-    public String pattern = ".*";
-    public String interval = "30 seconds";
+        public Map<String, String> getCmdArgs() {
+            return cmdArgs;
+        }

-    public LoggerConfig(String histoLoggerSpec) {
-        String[] words = histoLoggerSpec.split(":");
-        switch (words.length) {
-            case 3:
-                interval = words[2].isEmpty() ? interval : words[2];
-            case 2:
-                pattern = words[1].isEmpty() ? pattern : words[1];
-            case 1:
-                file = words[0];
-                if (file.isEmpty()) {
-                    throw new RuntimeException("You must not specify an empty file here for logging data.");
-                }
-                break;
-            default:
-                throw new RuntimeException(
-                        LOG_HISTO +
-                                " options must be in either 'regex:filename:interval' or 'regex:filename' or 'filename' format"
-                );
+        public String toString() {
+            return "type:" + cmdType + ";spec=" + cmdSpec
+                    + ((cmdArgs != null) ? ";cmdArgs=" + cmdArgs.toString() : "");
        }
    }

-    public String getFilename() {
-        return file;
-    }
-}
+    public static class LoggerConfig {
+        public String file = "";
+        public String pattern = ".*";
+        public String interval = "30 seconds";

-private static class ProgressSpec {
-    public String intervalSpec;
-    public IndicatorMode indicatorMode;
-    public String toString() {
-        return indicatorMode.toString()+":" + intervalSpec;
+        public LoggerConfig(String histoLoggerSpec) {
+            String[] words = histoLoggerSpec.split(":");
+            switch (words.length) {
+                case 3:
+                    interval = words[2].isEmpty() ? interval : words[2];
+                case 2:
+                    pattern = words[1].isEmpty() ? pattern : words[1];
+                case 1:
+                    file = words[0];
+                    if (file.isEmpty()) {
+                        throw new RuntimeException("You must not specify an empty file here for logging data.");
+                    }
+                    break;
+                default:
+                    throw new RuntimeException(
+                            LOG_HISTO +
+                                    " options must be in either 'regex:filename:interval' or 'regex:filename' or 'filename' format"
+                    );
+            }
+        }
+
+        public String getFilename() {
+            return file;
+        }
+    }
+
+    private static class ProgressSpec {
+        public String intervalSpec;
+        public IndicatorMode indicatorMode;
+        public String toString() {
+            return indicatorMode.toString()+":" + intervalSpec;
+        }
    }
-}

    private ProgressSpec parseProgressSpec(String interval) {
        ProgressSpec progressSpec = new ProgressSpec();
--- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java
@@ -187,4 +187,16 @@ public class TestNBCLIOptions {

    }

+    @Test
+    public void cqlIotYamlScenario() {
+        EBCLIOptions opts = new EBCLIOptions(new String[]{ "scenario-test" });
+        List<EBCLIOptions.Cmd> cmds = opts.getCommands();
+    }
+
+    @Test
+    public void cqlIotYamlScenarioSchemaOnly() {
+        EBCLIOptions opts = new EBCLIOptions(new String[]{ "scenario-test", "stdout"});
+        List<EBCLIOptions.Cmd> cmds = opts.getCommands();
+    }
+
 }
--- a/engine-cli/src/test/resources/activities/scenario-test.yaml
+++ b/engine-cli/src/test/resources/activities/scenario-test.yaml
@@ -0,0 +1,26 @@
+# nb -v run type=cql yaml=baselines/cql-iot tags=phase:schema host=dsehost
+scenarios:
+  default:
+    - run type=stdout yaml=scenario-test tags=phase:schema
+    - run type=stdout yaml=scenario-test tags=phase:rampup cycles=TEMPLATE(cycles,10)
+    - run type=stdout yaml=scenario-test tags=phase:main cycles=TEMPLATE(cycles,10)
+  schema-only:
+    - run type=stdout yaml=scenario-test tags=phase:schema
+blocks:
+  - tags:
+      phase: schema
+    statements:
+      - create-keyspace: |
+          create keyspace if not exists puppies
+  - tags:
+      phase: rampup
+    statements:
+      - insert: |
+         insert into puppies (test) values (1) ;
+  - tags:
+      phase: main
+    statements:
+      - insert: |
+          insert into puppies (test) values (1) ;
+      - select: |
+          select * from puppies;