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

rename parameter to use driver over type

Browse Source
This commit is contained in:
Jonathan Shook
2020-03-24 19:12:06 -05:00
parent 256116a570
commit 3f750d4704
35 changed files with 110 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine-core/src/main/java/io/nosqlbench/engine/core/ScenarioController.java
View File

@@ -232,7 +232,7 @@ public class ScenarioController {
if (executor == null && createIfMissing) {
String activityTypeName = activityDef.getParams().getOptionalString("type").orElse(null);
String activityTypeName = activityDef.getParams().getOptionalString("driver","type").orElse(null);
List<String> knownTypes = ActivityType.FINDER.getAll().stream().map(ActivityType::getName).collect(Collectors.toList());
// Infer the type from either alias or yaml if possible (exactly one matches)
@@ -249,7 +249,7 @@ public class ScenarioController {
}
if (activityTypeName==null) {
String errmsg = "You must provide a driver=<activity type> parameter. Valid examples are:\n" +
String errmsg = "You must provide a driver=<driver> parameter. Valid examples are:\n" +
knownTypes.stream().map(t -> " driver="+t+"\n").collect(Collectors.joining());
throw new BasicError(errmsg);
}

6
engine-core/src/test/java/io/nosqlbench/core/ActivityExecutorTest.java
View File

@@ -41,7 +41,7 @@ public class ActivityExecutorTest {
@Test
public void testDelayedStartSanity() {
ActivityDef ad = ActivityDef.parseActivityDef("type=diag;alias=test;cycles=1000;initdelay=5000;");
ActivityDef ad = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;initdelay=5000;");
Optional<ActivityType> activityType = ActivityType.FINDER.get(ad.getActivityType());
Activity a = new DelayedInitActivity(ad);
InputDispenser idisp = new CoreInputDispenser(a);
@@ -64,7 +64,7 @@ public class ActivityExecutorTest {
@Test(enabled=true)
public void testNewActivityExecutor() {
ActivityDef ad = ActivityDef.parseActivityDef("type=diag;alias=test;cycles=1000;");
ActivityDef ad = ActivityDef.parseActivityDef("driver=diag;alias=test;cycles=1000;");
Optional<ActivityType> activityType = ActivityType.FINDER.get(ad.getActivityType());
Input longSupplier = new AtomicInput(ad);
MotorDispenser<?> cmf = getActivityMotorFactory(
@@ -144,4 +144,4 @@ public class ActivityExecutorTest {
logger.info("delayed for " + initdelay);
}
}
}
}