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

fully generify OpSequence

Browse Source
This commit is contained in:
Jonathan Shook 2021-07-06 11:11:36 -05:00
parent 68c0ba277b
commit ed91ec7d41
18 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
View File

@ -100,7 +100,7 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser
int tries = 0;
try (Timer.Context bindTime = bindTimer.time()) {
readyCQLStatement = sequencer.get(cycleValue);
readyCQLStatement = sequencer.apply(cycleValue);
readyCQLStatement.onStart();
statement = readyCQLStatement.bind(cycleValue);

2
driver-cql-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
View File

@ -95,7 +95,7 @@ public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
// bind timer covers all statement selection and binding, skipping, transforming logic
try (Timer.Context bindTime = bindTimer.time()) {
cqlop.readyCQLStatement = sequencer.get(cycle);
cqlop.readyCQLStatement = sequencer.apply(cycle);
cqlop.statement = cqlop.readyCQLStatement.bind(cycle);
// If a filter is defined, skip and count any statements that do not match it

2
driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java
View File

@ -99,7 +99,7 @@ public class CqlAction implements SyncAction, MultiPhaseAction, ActivityDefObser
int tries = 0;
try (Timer.Context bindTime = bindTimer.time()) {
readyCQLStatement = sequencer.get(cycleValue);
readyCQLStatement = sequencer.apply(cycleValue);
readyCQLStatement.onStart();
statement = readyCQLStatement.bind(cycleValue);

2
driver-cqld3-shaded/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java
View File

@ -95,7 +95,7 @@ public class CqlAsyncAction extends BaseAsyncAction<CqlOpData, CqlActivity> {
// bind timer covers all statement selection and binding, skipping, transforming logic
try (Timer.Context bindTime = bindTimer.time()) {
cqlop.readyCQLStatement = sequencer.get(cycle);
cqlop.readyCQLStatement = sequencer.apply(cycle);
cqlop.statement = cqlop.readyCQLStatement.bind(cycle);
// If a filter is defined, skip and count any statements that do not match it

2
driver-cqld4/src/main/java/io/nosqlbench/driver/cqld4/Cqld4Action.java
View File

@ -43,7 +43,7 @@ public class Cqld4Action implements SyncAction, ActivityDefObserver {
Cqld4Op cql4op;
try (Timer.Context ctx = bindTimer.time()) {
OpDispenser<Cqld4Op> opDispenser = activity.getSequence().get(cycle);
OpDispenser<Cqld4Op> opDispenser = activity.getSequence().apply(cycle);
cql4op = opDispenser.apply(cycle);
}

2
driver-dsegraph-shaded/src/main/java/com/datastax/ebdrivers/dsegraph/GraphAction.java
View File

@ -52,7 +52,7 @@ public class GraphAction implements SyncAction, ActivityDefObserver {
try (Timer.Context bindTime = activity.bindTimer.time()) {
BindableGraphStatement bindableGraphStatement = opSequencer.get(cycle);
BindableGraphStatement bindableGraphStatement = opSequencer.apply(cycle);
simpleGraphStatement = bindableGraphStatement.bind(cycle);
if (showstmts) {

2
driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java
View File

@ -62,7 +62,7 @@ public class HttpAction implements SyncAction {
// operation for execution, including data generation as well as
// op construction
try (Timer.Context bindTime = httpActivity.bindTimer.time()) {
LongFunction<HttpOp> readyOp = sequencer.get(cycle);
LongFunction<HttpOp> readyOp = sequencer.apply(cycle);
httpOp = readyOp.apply(cycle);
} catch (Exception e) {
if (httpActivity.isDiagnosticMode()) {

2
driver-http/src/main/java/io/nosqlbench/activitytype/http/async/HttpAsyncAction.java
View File

@ -46,7 +46,7 @@ public class HttpAsyncAction extends BaseAsyncAction<HttpAsyncOp, HttpActivity>
@Override
public LongFunction<HttpAsyncOp> getOpInitFunction() {
return l -> {
LongFunction<HttpOp> readyHttpOp = sequencer.get(l);
LongFunction<HttpOp> readyHttpOp = sequencer.apply(l);
return new HttpAsyncOp(this,readyHttpOp,l,client);
};
}

2
driver-jms/src/main/java/io/nosqlbench/driver/jms/JmsAction.java
View File

@ -36,7 +36,7 @@ public class JmsAction implements SyncAction {
JmsOp jmsOp;
try (Timer.Context ctx = activity.getBindTimer().time()) {
LongFunction<JmsOp> readyJmsOp = activity.getSequencer().get(cycle);
LongFunction<JmsOp> readyJmsOp = activity.getSequencer().apply(cycle);
jmsOp = readyJmsOp.apply(cycle);
} catch (Exception bindException) {
// if diagnostic mode ...

2
driver-jmx/src/main/java/io/nosqlbench/driver/jmx/JMXAction.java
View File

@ -32,7 +32,7 @@ public class JMXAction implements SyncAction {
@Override
public int runCycle(long cycle) {
LongFunction<JmxOp> readyJmxOp = sequencer.get(cycle);
LongFunction<JmxOp> readyJmxOp = sequencer.apply(cycle);
JmxOp jmxOp = readyJmxOp.apply(cycle);
jmxOp.execute();
return 0;

2
driver-kafka/src/main/java/com/datastax/ebdrivers/kafkaproducer/KafkaAction.java
View File

@ -27,7 +27,7 @@ public class KafkaAction implements SyncAction {
@Override
public int runCycle(long cycle) {
sequencer.get(cycle).write(cycle);
sequencer.apply(cycle).write(cycle);
return 1;
}

2
driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoAction.java
View File

@ -34,7 +34,7 @@ public class MongoAction implements SyncAction {
ReadyMongoStatement rms;
Bson queryBson;
try (Timer.Context bindTime = activity.bindTimer.time()) {
rms = sequencer.get(cycle);
rms = sequencer.apply(cycle);
queryBson = rms.bind(cycle);
// Maybe show the query in log/console - only for diagnostic use

2
driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarAction.java
View File

@ -37,7 +37,7 @@ public class PulsarAction implements SyncAction {
PulsarOp pulsarOp;
try (Timer.Context ctx = activity.getBindTimer().time()) {
LongFunction<PulsarOp> readyPulsarOp = activity.getSequencer().get(cycle);
LongFunction<PulsarOp> readyPulsarOp = activity.getSequencer().apply(cycle);
pulsarOp = readyPulsarOp.apply(cycle);
} catch (Exception bindException) {
// if diagnostic mode ...

2
driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java
View File

@ -32,7 +32,7 @@ public class AsyncStdoutAction extends BaseAsyncAction<StdoutOpContext, StdoutAc
StdoutOpContext opc = new StdoutOpContext();
try (Timer.Context bindTime = activity.bindTimer.time()) {
opc.stringBindings = sequencer.get(cycle);
opc.stringBindings = sequencer.apply(cycle);
opc.statement = opc.stringBindings.bind(cycle);
if (activity.getShowstmts()) {
logger.info("STMT(cycle=" + cycle + "):\n" + opc.statement);

8
driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java
View File

@ -19,10 +19,10 @@ package io.nosqlbench.activitytype.stdout;
import com.codahale.metrics.Timer;
import io.nosqlbench.engine.api.activityapi.core.SyncAction;
import io.nosqlbench.engine.api.activityapi.planning.OpSource;
import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
import io.nosqlbench.virtdata.core.templates.StringBindings;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@SuppressWarnings("Duplicates")
public class StdoutAction implements SyncAction {
@ -32,7 +32,7 @@ public class StdoutAction implements SyncAction {
private final StdoutActivity activity;
private final int maxTries = 10;
private boolean showstmts;
private OpSource<StringBindings> opsource;
private OpSequence<StringBindings> opsource;
public StdoutAction(int slot, StdoutActivity activity) {
this.slot = slot;
@ -49,7 +49,7 @@ public class StdoutAction implements SyncAction {
StringBindings stringBindings;
String statement = null;
try (Timer.Context bindTime = activity.bindTimer.time()) {
stringBindings = opsource.get(cycle);
stringBindings = opsource.apply(cycle);
statement = stringBindings.bind(cycle);
showstmts = activity.getShowstmts();
if (showstmts) {

2
driver-web/src/main/java/io/nosqlbench/driver/webdriver/WebDriverAction.java
View File

@ -45,7 +45,7 @@ public class WebDriverAction implements SyncAction, ActivityDefObserver {
@Override
public int runCycle(long cycle) {
CommandTemplate commandTemplate = activity.getOpSequence().get(cycle);
CommandTemplate commandTemplate = activity.getOpSequence().apply(cycle);
try {
WebDriverVerbs.execute(cycle, commandTemplate, context, dryrun);
return 0;

6
engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
View File

@ -19,6 +19,7 @@ package io.nosqlbench.engine.api.activityapi.planning;
import java.util.List;
import java.util.function.Function;
import java.util.function.LongFunction;
/**
* An OpSequence provides fast access to a set of operations in a specific
@ -26,10 +27,10 @@ import java.util.function.Function;
*
* @param <T> The type of element which is to be sequenced
*/
public interface OpSequence<T> extends OpSource<T> {
public interface OpSequence<T> extends LongFunction<T> {
/**
* Get the list of individual operations which could be returned by {@link #get(long)}.
* Get the list of individual operations which could be returned by {@link #apply(long)}.
* @return A {@link List} of T
*/
List<T> getOps();
@ -47,4 +48,5 @@ public interface OpSequence<T> extends OpSource<T> {
* @return A new OpSequence of type U
*/
<U> OpSequence<U> transform(Function<T, U> func);
}

2
engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/planning/Sequence.java
View File

@ -17,7 +17,7 @@ public class Sequence<T> implements OpSequence<T> {
}
@Override
public T get(long selector) {
public T apply(long selector) {
int index = (int) (selector % seq.length);
index = seq[index];
return elems.get(index);