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

clarify parameter names

Browse Source
This commit is contained in:
Jonathan Shook
2024-01-18 00:23:09 -06:00
parent add366a73b
commit 76ab3672ac
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,9 +39,9 @@ public class NBJavaCommandLoader {
} }
} }
public static NBInvokableCommand init(String cmdSelector, NBComponent parent, String cmdAlias, String ctxName) { public static NBInvokableCommand init(String cmdSelector, NBComponent parent, String stepName, String ctxName) {
NBCommandInfo cmdInfo = getSelector(cmdSelector).getOne(); NBCommandInfo cmdInfo = getSelector(cmdSelector).getOne();
NBInvokableCommand command = cmdInfo.create(parent, cmdAlias, ctxName); NBInvokableCommand command = cmdInfo.create(parent, cmdSelector, ctxName);
return command; return command;
} }

4
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java
View File

@@ -34,7 +34,7 @@ import java.util.Optional;
@Service(value = NBInvokableResolver.class, selector = "autojs") @Service(value = NBInvokableResolver.class, selector = "autojs")
public class NBAutoScriptResolver implements NBInvokableResolver { public class NBAutoScriptResolver implements NBInvokableResolver {
@Override @Override
public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName) { public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String stepname) {
Optional<Content<?>> scriptfile = NBIO.local() Optional<Content<?>> scriptfile = NBIO.local()
.searchPrefixes("scripts/auto") .searchPrefixes("scripts/auto")
@@ -47,7 +47,7 @@ public class NBAutoScriptResolver implements NBInvokableResolver {
Map<String, CmdArg> newArgs = new LinkedHashMap<>(cmd.getArgs()); Map<String, CmdArg> newArgs = new LinkedHashMap<>(cmd.getArgs());
newArgs.put("path",new CmdArg(new CmdParam("name",s->s,false),"=",pathOf.toString())); newArgs.put("path",new CmdArg(new CmdParam("name",s->s,false),"=",pathOf.toString()));
Cmd reformattedCmd = new Cmd("script", newArgs); Cmd reformattedCmd = new Cmd("script", newArgs);
return new NBScriptedCommand(parent, phaseName, cmd.getTargetContext()).add(reformattedCmd); return new NBScriptedCommand(parent, stepname, cmd.getTargetContext()).add(reformattedCmd);
} else { } else {
return null; return null;
} }

4
engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java
View File

@@ -25,10 +25,10 @@ import io.nosqlbench.nb.annotations.Service;
@Service(value = NBInvokableResolver.class, selector = "js") @Service(value = NBInvokableResolver.class, selector = "js")
public class NBScriptCommandResolver implements NBInvokableResolver { public class NBScriptCommandResolver implements NBInvokableResolver {
@Override @Override
public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String phaseName) { public NBInvokableCommand resolve(Cmd cmd, NBBufferedContainer parent, String stepname) {
return switch (cmd.getCmdType()) { return switch (cmd.getCmdType()) {
case fragment, script-> case fragment, script->
new NBScriptedCommand(parent, phaseName, cmd.getTargetContext()).add(cmd); new NBScriptedCommand(parent, stepname, cmd.getTargetContext()).add(cmd);
// case fragment -> // case fragment ->
// new NBScriptedCommand(parent, phaseName, cmd.getTargetContext()).addScriptText(cmd.getArgValue("fragment")); // new NBScriptedCommand(parent, phaseName, cmd.getTargetContext()).addScriptText(cmd.getArgValue("fragment"));
// case script -> // case script ->