IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-12-28 01:31:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

syntax updates for named scenario parameter overrides

Browse Source
This commit is contained in:
Jonathan Shook 2020-03-24 18:05:58 -05:00
parent c3058bcb9c
commit 278ebbd8ae
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class NBCLIScenarioParser {
public final static String SILENT_LOCKED = "==";
public final static String VERBOSE_LOCKED = "===";
public final static String UNLOCKED = "=";
private final static Logger logger = LoggerFactory.getLogger(NBCLIScenarioParser.class);
public static boolean isFoundWorkload(String word) {
@ -50,7 +55,7 @@ public class NBCLIScenarioParser {
// This will hold the command to be prepended to the main arglist
LinkedList<String> buildCmdBuffer = new LinkedList<>();
Pattern cmdpattern = Pattern.compile("(?<name>\\w+)((?<oper>==|:=|=:|=)(?<val>.+))?");
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<>();
@ -104,10 +109,10 @@ public class NBCLIScenarioParser {
return "=".equals(operator);
}
public boolean isFinalVerbose() {
return "==".equals(operator);
return "===".equals(operator);
}
public boolean isFinalSilent() {
return ":=".equals(operator) || "=:".equals(operator);
return "==".equals(operator);
}
public CmdArg override(String value) {
if (isReassignable()) {

6
engine-cli/src/test/resources/activities/scenario-test.yaml
View File

@ -1,9 +1,9 @@
# nb -v run type=cql yaml=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)"
- 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: