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

Merge branch 'master' of https://github.com/nosqlbench/nosqlbench

Browse Source
This commit is contained in:
Jonathan Shook
2020-03-16 21:46:10 -05:00
parent c57d3231ee 4f9a82b632
commit da9b7da295
22 changed files with 850 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,14 +39,12 @@ public class EBCLIScriptAssembly {
sb.append("\n");
}
break;
case start2:
case run2:
case start: // start activity
case run: // run activity
// Sanity check that this can parse before using it
activityDef = ActivityDef.parseActivityDef(cmdSpec);
sb.append("// from CLI as ").append(cmd).append("\n")
.append("scenario.").append(cmdType.toString().replace("2","")).append("(\"")
.append("scenario.").append(cmdType.toString()).append("(\"")
.append(cmdSpec)
.append("\");\n");
sb.append("// from CLI as ").append(cmd).append("\n");
@@ -54,13 +52,6 @@ public class EBCLIScriptAssembly {
if (!cmdSpec.endsWith("\n")) {
sb.append("\n");
}
if (!cmdType.toString().contains("2")) {
sb.append("// temporary work-around for issue until proper fix\n");
sb.append("for each (paramset in activities.keySet()) {\n");
sb.append(" paramset.noop='value';\n");
sb.append("}\n");
}
break;
case await: // await activity
sb.append("// from CLI as ").append(cmd).append("\n");

2
engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScriptAssemblyTest.java
View File

@@ -20,7 +20,7 @@ package io.nosqlbench.engine.cli;
import io.nosqlbench.engine.cli.EBCLIOptions;
import io.nosqlbench.engine.cli.EBCLIScriptAssembly;
import org.junit.Test;
import org.testng.annotations.Test;
import static org.assertj.core.api.Assertions.assertThat;