IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-12-24 16:00:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

scenarioName instead of name for clarity

Browse Source
This commit is contained in:
Jonathan Shook 2020-08-06 09:51:22 -05:00
parent b0d587814b
commit 94159a21ff
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
View File

@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
@ -301,7 +300,7 @@ public class NBCLI {
executor.execute(scenario, sl);
while (true) {
Optional<ScenarioResult> pendingResult = executor.getPendingResult(scenario.getName());
Optional<ScenarioResult> pendingResult = executor.getPendingResult(scenario.getScenarioName());
if (pendingResult.isEmpty()) {
LockSupport.parkNanos(100000000L);
} else {

16
engine-core/src/main/java/io/nosqlbench/engine/core/script/Scenario.java
View File

@ -53,7 +53,7 @@ public class Scenario implements Callable<ScenarioResult> {
private String progressInterval = "console:1m";
private boolean wantsGraaljsCompatMode;
private ScenarioContext scriptEnv;
private String name;
private String scenarioName;
private ScenarioLogger scenarioLogger;
private ScriptParams scenarioScriptParams;
private Engine engine = Engine.Graalvm;
@ -73,7 +73,7 @@ public class Scenario implements Callable<ScenarioResult> {
}
public Scenario(String name, Engine engine) {
this.name = name;
this.scenarioName = name;
this.engine = engine;
}
@ -194,7 +194,7 @@ public class Scenario implements Callable<ScenarioResult> {
public void run() {
init();
logger.debug("Running control script for " + getName() + ".");
logger.debug("Running control script for " + getScenarioName() + ".");
for (String script : scripts) {
try {
Object result = null;
@ -241,16 +241,16 @@ public class Scenario implements Callable<ScenarioResult> {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Scenario scenario = (Scenario) o;
return getName() != null ? getName().equals(scenario.getName()) : scenario.getName() == null;
return getScenarioName() != null ? getScenarioName().equals(scenario.getScenarioName()) : scenario.getScenarioName() == null;
}
@Override
public int hashCode() {
return getName() != null ? getName().hashCode() : 0;
return getScenarioName() != null ? getScenarioName().hashCode() : 0;
}
public String getName() {
return name;
public String getScenarioName() {
return scenarioName;
}
public ScenarioController getScenarioController() {
@ -266,7 +266,7 @@ public class Scenario implements Callable<ScenarioResult> {
}
public String toString() {
return "name:'" + this.getName() + "'";
return "name:'" + this.getScenarioName() + "'";
}
public void setScenarioLogger(ScenarioLogger scenarioLogger) {