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

naming updates for clarity

Browse Source
This commit is contained in:
Jonathan Shook 2021-06-24 11:18:47 -05:00
parent fb587ce426
commit d0371ecc16
4 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
driver-jms/src/main/java/io/nosqlbench/driver/jms/ReadyJmsOp.java
View File

@ -1,30 +1,17 @@
package io.nosqlbench.driver.jms; package io.nosqlbench.driver.jms;
import io.nosqlbench.driver.jms.ops.JmsMsgSendMapper;
import io.nosqlbench.driver.jms.ops.JmsOp; import io.nosqlbench.driver.jms.ops.JmsOp;
import io.nosqlbench.driver.jms.util.JmsHeader;
import io.nosqlbench.driver.jms.util.JmsHeaderLongFunc;
import io.nosqlbench.driver.jms.util.JmsUtil; import io.nosqlbench.driver.jms.util.JmsUtil;
import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityimpl.OpDispenser;
import io.nosqlbench.engine.api.templating.CommandTemplate; import io.nosqlbench.engine.api.templating.CommandTemplate;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSRuntimeException;
import javax.jms.Message;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.function.LongFunction; import java.util.function.LongFunction;
import java.util.stream.Collectors;
abstract public class ReadyJmsOp implements OpDispenser<JmsOp> { abstract public class ReadyJmsOp implements OpDispenser<JmsOp> {
protected final OpTemplate opTpl; protected final OpTemplate optpl;
protected final CommandTemplate cmdTpl; protected final CommandTemplate cmdTpl;
protected final JmsActivity jmsActivity; protected final JmsActivity jmsActivity;
@ -35,8 +22,8 @@ abstract public class ReadyJmsOp implements OpDispenser<JmsOp> {
protected final LongFunction<JmsOp> opFunc; protected final LongFunction<JmsOp> opFunc;
public ReadyJmsOp(OpTemplate opTemplate, JmsActivity jmsActivity) { public ReadyJmsOp(OpTemplate opTemplate, JmsActivity jmsActivity) {
this.opTpl = opTemplate; this.optpl = opTemplate;
this.cmdTpl = new CommandTemplate(opTpl); this.cmdTpl = new CommandTemplate(optpl);
this.jmsActivity = jmsActivity; this.jmsActivity = jmsActivity;
if (!cmdTpl.containsKey("optype") || !cmdTpl.isStatic("optype")) { if (!cmdTpl.containsKey("optype") || !cmdTpl.isStatic("optype")) {

6
driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java
View File

@ -30,11 +30,11 @@ public class ReadyPulsarOp implements OpDispenser<PulsarOp> {
// TODO: Add docs for the command template with respect to the OpTemplate // TODO: Add docs for the command template with respect to the OpTemplate
public ReadyPulsarOp(OpTemplate opTemplate, PulsarSpaceCache pcache, PulsarActivity pulsarActivity) { public ReadyPulsarOp(OpTemplate optpl, PulsarSpaceCache pcache, PulsarActivity pulsarActivity) {
// TODO: Consider parsing map structures into equivalent binding representation // TODO: Consider parsing map structures into equivalent binding representation
this.pulsarActivity = pulsarActivity; this.pulsarActivity = pulsarActivity;
this.opTpl = opTemplate; this.opTpl = optpl;
this.cmdTpl = new CommandTemplate(opTemplate); this.cmdTpl = new CommandTemplate(optpl);
if (cmdTpl.isDynamic("op_scope")) { if (cmdTpl.isDynamic("op_scope")) {
throw new RuntimeException("op_scope must be static"); throw new RuntimeException("op_scope must be static");

6
driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverActivity.java
View File

@ -186,9 +186,9 @@ public class WebDriverActivity extends SimpleActivity {
throw new BasicError("There were no active statements with tag filter '" + tagfilter + "'"); throw new BasicError("There were no active statements with tag filter '" + tagfilter + "'");
} }
for (OpTemplate optemplate : stmts) { for (OpTemplate optpl : stmts) {
long ratio = optemplate.getParamOrDefault("ratio", 1); long ratio = optpl.getParamOrDefault("ratio", 1);
CommandTemplate cmd = new CommandTemplate(optemplate); CommandTemplate cmd = new CommandTemplate(optpl);
planner.addOp(cmd, ratio); planner.addOp(cmd, ratio);
} }
return planner.resolve(); return planner.resolve();

4
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/DiagRunnableOpMapper.java
View File

@ -8,8 +8,8 @@ import java.util.function.Function;
public class DiagRunnableOpMapper implements Function<OpTemplate, OpDispenser<Runnable>> { public class DiagRunnableOpMapper implements Function<OpTemplate, OpDispenser<Runnable>> {
@Override @Override
public OpDispenser<Runnable> apply(OpTemplate opTemplate) { public OpDispenser<Runnable> apply(OpTemplate optpl) {
CommandTemplate commandTemplate = new CommandTemplate(opTemplate); CommandTemplate commandTemplate = new CommandTemplate(optpl);
return new DiagRunnableOpDispenser(commandTemplate); return new DiagRunnableOpDispenser(commandTemplate);
} }