IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

multiple named scenarios in a row

Browse Source
This commit is contained in:
Jonathan Shook 2020-03-24 18:58:20 -05:00
parent 58cb56f0bb
commit ccb02e6e45
2 changed files with 60 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarioParser.java
View File

@ -27,69 +27,79 @@ public class NBCLIScenarioParser {
} }
public static void parseScenarioCommand(LinkedList<String> arglist) { public static void parseScenarioCommand(LinkedList<String> arglist) {
String workloadName = arglist.removeFirst(); String workloadName = arglist.removeFirst();
Optional<Path> workloadPathSearch = NosqlBenchFiles.findOptionalPath(workloadName, "yaml", "activities"); Optional<Path> workloadPathSearch = NosqlBenchFiles.findOptionalPath(workloadName, "yaml", "activities");
Path workloadPath = workloadPathSearch.orElseThrow(); Path workloadPath = workloadPathSearch.orElseThrow();
String scenarioName = (arglist.size()>0 && !arglist.peekFirst().contains("=")) ? arglist.removeFirst() : "default"; List<String> scenarioNames = new ArrayList<>();
while (arglist.size() > 0 && !arglist.peekFirst().contains("=") && !NBCLIOptions.RESERVED_WORDS.contains(arglist.peekFirst())) {
scenarioNames.add(arglist.removeFirst());
}
if (scenarioNames.size() == 0) {
scenarioNames.add("default");
}
// Load in user's CLI options // Load in user's CLI options
LinkedHashMap<String,String> userCli = new LinkedHashMap<>(); LinkedHashMap<String, String> userCli = new LinkedHashMap<>();
while (arglist.size()>0 && arglist.peekFirst().contains("=")) { while (arglist.size() > 0 && arglist.peekFirst().contains("=")) {
String[] arg = arglist.removeFirst().split("="); String[] arg = arglist.removeFirst().split("=");
arg[0] = Synonyms.canonicalize(arg[0], logger); arg[0] = Synonyms.canonicalize(arg[0], logger);
if (userCli.containsKey(arg[0])) { if (userCli.containsKey(arg[0])) {
throw new BasicError("duplicate occurence of option on command line: " + arg[0]); throw new BasicError("duplicate occurence of option on command line: " + arg[0]);
} }
userCli.put(arg[0],arg[1]); userCli.put(arg[0], arg[1]);
}
// Load in named scenario
StmtsDocList stmts = StatementsLoader.load(logger, workloadPath.toString());
Scenarios scenarios = stmts.getDocScenarios();
List<String> cmds = scenarios.getNamedScenario(scenarioName);
if (cmds==null) {
throw new BasicError("Unable to find named scenario '" + scenarioName + "' in workload '" + workloadName
+", but you can pick from " + String.join(",",scenarios.getScenarioNames()));
} }
// This will hold the command to be prepended to the main arglist // This will hold the command to be prepended to the main arglist
LinkedList<String> buildCmdBuffer = new LinkedList<>(); LinkedList<String> buildCmdBuffer = new LinkedList<>();
Pattern cmdpattern = Pattern.compile("(?<name>\\w+)((?<oper>=+)(?<val>.+))?"); for (String scenarioName : scenarioNames) {
for (String cmd : cmds) { // each command line of the named scenario
LinkedHashMap<String,String> usersCopy = new LinkedHashMap<>(userCli);
LinkedHashMap<String,CmdArg> cmdline = new LinkedHashMap<>();
String[] cmdparts = cmd.split(" "); // Load in named scenario
for (String cmdpart : cmdparts) { StmtsDocList stmts = StatementsLoader.load(logger, workloadPath.toString());
Matcher matcher = cmdpattern.matcher(cmdpart); Scenarios scenarios = stmts.getDocScenarios();
if (!matcher.matches()) { List<String> cmds = scenarios.getNamedScenario(scenarioName);
throw new BasicError("Unable to recognize scenario cmd spec in '" + cmdpart + "'"); if (cmds == null) {
throw new BasicError("Unable to find named scenario '" + scenarioName + "' in workload '" + workloadName
+ ", but you can pick from " + String.join(",", scenarios.getScenarioNames()));
}
Pattern cmdpattern = Pattern.compile("(?<name>\\w+)((?<oper>=+)(?<val>.+))?");
for (String cmd : cmds) { // each command line of the named scenario
LinkedHashMap<String, String> usersCopy = new LinkedHashMap<>(userCli);
LinkedHashMap<String, CmdArg> cmdline = new LinkedHashMap<>();
String[] cmdparts = cmd.split(" ");
for (String cmdpart : cmdparts) {
Matcher matcher = cmdpattern.matcher(cmdpart);
if (!matcher.matches()) {
throw new BasicError("Unable to recognize scenario cmd spec in '" + cmdpart + "'");
}
String name = Synonyms.canonicalize(matcher.group("name"), logger);
String oper = matcher.group("oper");
String val = matcher.group("val");
cmdline.put(name, new CmdArg(name, oper, val));
} }
String name = Synonyms.canonicalize(matcher.group("name"),logger);
String oper = matcher.group("oper");
String val = matcher.group("val");
cmdline.put(name,new CmdArg(name,oper,val));
}
LinkedHashMap<String,String> builtcmd = new LinkedHashMap<>(); LinkedHashMap<String, String> builtcmd = new LinkedHashMap<>();
for (CmdArg cmdarg : cmdline.values()) { for (CmdArg cmdarg : cmdline.values()) {
if (usersCopy.containsKey(cmdarg.getName())) { if (usersCopy.containsKey(cmdarg.getName())) {
cmdarg = cmdarg.override(usersCopy.remove(cmdarg.getName())); cmdarg = cmdarg.override(usersCopy.remove(cmdarg.getName()));
}
builtcmd.put(cmdarg.getName(), cmdarg.toString());
} }
builtcmd.put(cmdarg.getName(),cmdarg.toString()); usersCopy.forEach((k, v) -> builtcmd.put(k, k + "=" + v));
} if (!builtcmd.containsKey("workload")) {
usersCopy.forEach((k,v)-> builtcmd.put(k,k+"="+v)); builtcmd.put("workload", "workload=" + workloadPath.toString());
if (!builtcmd.containsKey("workload")) { }
builtcmd.put("workload", "workload="+workloadPath.toString());
logger.debug("Named scenario built command: " + String.join(" ", builtcmd.values()));
buildCmdBuffer.addAll(builtcmd.values());
} }
logger.debug("Named scenario built command: " + String.join(" ",builtcmd.values()));
buildCmdBuffer.addAll(builtcmd.values());
} }
buildCmdBuffer.descendingIterator().forEachRemaining(arglist::addFirst); buildCmdBuffer.descendingIterator().forEachRemaining(arglist::addFirst);
} }
@ -109,12 +119,15 @@ public class NBCLIScenarioParser {
public boolean isReassignable() { public boolean isReassignable() {
return "=".equals(operator); return "=".equals(operator);
} }
public boolean isFinalVerbose() { public boolean isFinalVerbose() {
return "===".equals(operator); return "===".equals(operator);
} }
public boolean isFinalSilent() { public boolean isFinalSilent() {
return "==".equals(operator); return "==".equals(operator);
} }
public CmdArg override(String value) { public CmdArg override(String value) {
if (isReassignable()) { if (isReassignable()) {
return new CmdArg(this.name, this.operator, value); return new CmdArg(this.name, this.operator, value);
@ -129,7 +142,7 @@ public class NBCLIScenarioParser {
@Override @Override
public String toString() { public String toString() {
return name + (operator!=null ? "=" : "") + (value!=null ? value : ""); return name + (operator != null ? "=" : "") + (value != null ? value : "");
} }
public String getName() { public String getName() {

7
engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
View File

@ -62,4 +62,11 @@ public class NBCLIScenarioParserTest {
public void testThatMissingScenarioNameThrowsError() { public void testThatMissingScenarioNameThrowsError() {
NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "missing-scenario"}); NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "missing-scenario"});
} }
@Test
public void testThatMultipleScenariosConcatenate() {
NBCLIOptions opts = new NBCLIOptions(new String[]{ "scenario-test", "default", "default"});
List<NBCLIOptions.Cmd> cmds = opts.getCommands();
assertThat(cmds.size()).isEqualTo(6);
}
} }