IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-01-11 00:12:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Jonathan Shook 2023-09-29 18:56:15 -05:00
parent 3681bb3a88
commit 02f69d0038
2 changed files with 1 additions and 12 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/NBCLIOptions.java
View File

@ -126,8 +126,6 @@ public class NBCLIOptions {
private static final String LOG_LEVEL_OVERRIDE = "--log-level-override";
private static final String ENABLE_CHART = "--enable-chart";
private static final String GRAALJS_ENGINE = "--graaljs";
private static final String DEFAULT_CONSOLE_PATTERN = "TERSE";
private static final String DEFAULT_LOGFILE_PATTERN = "VERBOSE";
private final static String ENABLE_DEDICATED_VERIFICATION_LOGGER = "--enable-dedicated-verification-logging";
@ -174,7 +172,6 @@ public class NBCLIOptions {
private String wantsToCopyWorkload;
private boolean wantsWorkloadsList;
private final List<String> wantsToIncludePaths = new ArrayList<>();
private Engine engine = Engine.Graalvm;
private int hdr_digits = 3;
private boolean showStackTraces;
private boolean compileScript;
@ -523,10 +520,6 @@ public class NBCLIOptions {
final String word = arglist.peekFirst();
switch (word) {
case NBCLIOptions.GRAALJS_ENGINE:
this.engine = Engine.Graalvm;
arglist.removeFirst();
break;
case NBCLIOptions.COMPILE_SCRIPT:
arglist.removeFirst();
this.compileScript = true;
@ -685,10 +678,6 @@ public class NBCLIOptions {
return levels;
}
public Engine getScriptingEngine() {
return this.engine;
}
public List<LoggerConfigData> getHistoLoggerConfigs() {
final List<LoggerConfigData> configs =
this.histoLoggerConfigs.stream().map(LoggerConfigData::new).collect(Collectors.toList());

2
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
View File

@ -290,7 +290,7 @@ public class Scenario extends NBBaseComponent implements Callable<ExecutionMetri
for (final String script : this.scripts)
try {
Object result = null;
if ((scriptEngine instanceof Compilable compilableEngine) && this.wantsCompiledScript) {
if ((scriptEngine instanceof Compilable compilableEngine)) {
this.logger.debug("Using direct script compilation");
final CompiledScript compiled = compilableEngine.compile(script);
this.logger.debug("-> invoking main scenario script (compiled)");