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

bug fix for named scenario parser and global options

Browse Source
This commit is contained in:
Jonathan Shook 2020-03-24 20:37:52 -05:00
parent 43b119c46f
commit 9359681eca
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,10 @@ public class NBCLIScenarioParser {
Path workloadPath = workloadPathSearch.orElseThrow();
List<String> scenarioNames = new ArrayList<>();
while (arglist.size() > 0 && !arglist.peekFirst().contains("=") && !NBCLIOptions.RESERVED_WORDS.contains(arglist.peekFirst())) {
while (arglist.size() > 0
&& !arglist.peekFirst().contains("=")
&& !arglist.peekFirst().startsWith("-")
&& !NBCLIOptions.RESERVED_WORDS.contains(arglist.peekFirst())) {
scenarioNames.add(arglist.removeFirst());
}
if (scenarioNames.size() == 0) {
@ -42,7 +45,9 @@ public class NBCLIScenarioParser {
// Load in user's CLI options
LinkedHashMap<String, String> userCli = new LinkedHashMap<>();
while (arglist.size() > 0 && arglist.peekFirst().contains("=")) {
while (arglist.size() > 0
&& arglist.peekFirst().contains("=")
&& !arglist.peekFirst().startsWith("-")) {
String[] arg = arglist.removeFirst().split("=");
arg[0] = Synonyms.canonicalize(arg[0], logger);
if (userCli.containsKey(arg[0])) {
@ -119,14 +124,13 @@ public class NBCLIScenarioParser {
public boolean isReassignable() {
return "=".equals(operator);
}
public boolean isFinalSilent() {
return "==".equals(operator);
}
public boolean isFinalVerbose() {
return "===".equals(operator);
}
public boolean isFinalSilent() {
return "==".equals(operator);
}
public CmdArg override(String value) {
if (isReassignable()) {