From 55f11d539535322889d8fabb5c276e926674b5ba Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 20 Nov 2024 16:06:17 -0600 Subject: [PATCH] alignment to previous changes --- .../io/nosqlbench/adapter/amqp/AmqpOpMapper.java | 6 ++---- .../amqp/dispensers/AmqpBaseOpDispenser.java | 3 +-- .../azureaisearch/AzureAISearchOpMapper.java | 5 +++-- .../AzureAISearchBaseOpDispenser.java | 10 +++------- .../opdispensers/CqlD4BatchStmtDispenser.java | 12 ++++-------- .../cqld4/opdispensers/Cqld4BaseOpDispenser.java | 4 +--- .../opdispensers/Cqld4CqlBaseOpDispenser.java | 2 +- .../opdispensers/Cqld4FluentGraphOpDispenser.java | 8 ++++---- .../opdispensers/Cqld4GremlinOpDispenser.java | 12 +++++------- .../opdispensers/Cqld4PreparedStmtDispenser.java | 9 +++++---- .../cqld4/opdispensers/Cqld4RawStmtDispenser.java | 6 +++--- .../opdispensers/Cqld4SimpleCqlStmtDispenser.java | 6 +++--- .../cqld4/opmappers/CqlD4BatchStmtMapper.java | 5 +++-- .../cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java | 4 ++-- .../cqld4/opmappers/CqlD4PreparedStmtMapper.java | 15 +++++++-------- .../cqld4/opmappers/CqlD4RainbowTableMapper.java | 7 ++----- .../cqld4/opmappers/CqlD4RawStmtMapper.java | 4 ++-- .../cqld4/opmappers/Cqld4BaseOpMapper.java | 5 ++--- .../cqld4/opmappers/Cqld4CoreOpMapper.java | 13 +++++++------ .../cqld4/opmappers/Cqld4CqlBaseOpMapper.java | 4 ++-- .../adapter/cqld4/opmappers/Cqld4CqlOpMapper.java | 11 ++++++----- .../cqld4/opmappers/Cqld4FluentGraphOpMapper.java | 3 ++- .../cqld4/opmappers/Cqld4GremlinOpMapper.java | 10 ++-------- .../adapter/dataapi/DataApiOpMapper.java | 4 ++-- .../DataApiCountDocumentsOpDispenser.java | 4 ++-- .../DataApiCreateCollectionOpDispenser.java | 4 ++-- ...taApiCreateCollectionWithClassOpDispenser.java | 4 ++-- .../DataApiCreateDatabaseOpDispenser.java | 4 ++-- .../DataApiCreateNamespaceOpDispenser.java | 4 ++-- .../opdispensers/DataApiDeleteAllOpDispenser.java | 4 ++-- .../DataApiDeleteManyOpDispenser.java | 4 ++-- .../opdispensers/DataApiDeleteOneOpDispenser.java | 4 ++-- .../DataApiDropCollectionOpDispenser.java | 4 ++-- .../DataApiDropDatabaseOpDispenser.java | 4 ++-- .../DataApiDropNamespaceOpDispenser.java | 4 ++-- .../DataApiEstimatedDocumentCountOpDispenser.java | 4 ++-- .../opdispensers/DataApiFindByIdOpDispenser.java | 4 ++-- .../DataApiFindDistinctOpDispenser.java | 4 ++-- .../DataApiFindOneAndDeleteOpDispenser.java | 4 ++-- .../DataApiFindOneAndReplaceOpDispenser.java | 4 ++-- .../DataApiFindOneAndUpdateOpDispenser.java | 4 ++-- .../opdispensers/DataApiFindOneOpDispenser.java | 4 ++-- .../opdispensers/DataApiFindOpDispenser.java | 4 ++-- .../DataApiFindVectorFilterOpDispenser.java | 4 ++-- .../DataApiFindVectorOpDispenser.java | 4 ++-- .../DataApiGetDatabaseInfoOpDispenser.java | 4 ++-- .../DataApiInsertManyOpDispenser.java | 4 ++-- .../opdispensers/DataApiInsertOneOpDispenser.java | 4 ++-- .../DataApiInsertOneVectorOpDispenser.java | 4 ++-- .../DataApiListCollectionNamesOpDispenser.java | 4 ++-- .../DataApiListCollectionsOpDispenser.java | 4 ++-- .../DataApiListDatabasesOpDispenser.java | 4 ++-- .../DataApiListNamespacesOpDispenser.java | 4 ++-- .../dataapi/opdispensers/DataApiOpDispenser.java | 2 +- .../DataApiReplaceOneOpDispenser.java | 4 ++-- .../DataApiUpdateManyOpDispenser.java | 4 ++-- .../opdispensers/DataApiUpdateOneOpDispenser.java | 4 ++-- .../nosqlbench/adapter/diag/DiagOpDispenser.java | 6 +++--- .../io/nosqlbench/adapter/diag/DiagOpMapper.java | 4 ++-- .../adapter/dynamodb/DynamoDBOpMapper.java | 5 ++--- .../opdispensers/DDBCreateTableOpDispenser.java | 2 +- .../opdispensers/DDBDeleteTableOpDispenser.java | 2 +- .../opdispensers/DDBGetItemOpDispenser.java | 8 ++++---- .../opdispensers/DDBPutItemOpDispenser.java | 8 ++++---- .../opdispensers/DDBQueryOpDispenser.java | 2 +- .../opdispensers/RawDynamoDBOpDispenser.java | 6 +++--- .../adapter/gcpspanner/GCPSpannerOpMapper.java | 6 +++--- .../opdispensers/GCPSpannerBaseOpDispenser.java | 3 +-- .../GCPSpannerCreateDatabaseDdlOpDispenser.java | 6 +++--- .../GCPSpannerDropDatabaseDdlOpDispenser.java | 6 +++--- .../GCPSpannerExecuteDmlOpDispenser.java | 6 +++--- .../opdispensers/GCPSpannerInsertOpDispenser.java | 14 +++++++------- .../GCPSpannerUpdateDatabaseDdlOpDispenser.java | 6 +++--- .../adapter/http/core/HttpOpDispenser.java | 6 +++--- .../adapter/http/core/HttpOpMapper.java | 5 ++--- .../nosqlbench/adapter/kafka/KafkaOpMapper.java | 7 +++---- .../kafka/dispensers/KafkaBaseOpDispenser.java | 2 +- .../adapter/mongodb/core/MongoOpMapper.java | 4 ++-- .../dispensers/MongoCommandOpDispenser.java | 2 +- .../dispensers/MongoDbUpdateOpDispenser.java | 9 +++------ .../nosqlbench/adapter/neo4j/Neo4JOpMapper.java | 6 ++---- .../neo4j/opdispensers/Neo4JBaseOpDispenser.java | 2 +- .../nosqlbench/adapter/pulsar/PulsarOpMapper.java | 7 ++----- .../pulsar/dispensers/PulsarBaseOpDispenser.java | 2 +- .../nosqlbench/adapter/qdrant/QdrantOpMapper.java | 8 ++++---- .../opdispensers/QdrantBaseOpDispenser.java | 9 +++------ .../io/nosqlbench/adapter/s4j/S4JOpMapper.java | 8 ++------ .../s4j/dispensers/S4JBaseOpDispenser.java | 3 +-- .../adapter/stdout/StdoutOpDispenser.java | 8 ++++---- .../nosqlbench/adapter/stdout/StdoutOpMapper.java | 6 ++---- .../adapter/tcpclient/TcpClientOpDispenser.java | 8 ++++---- .../adapter/tcpclient/TcpClientOpMapper.java | 5 ++--- .../adapter/tcpserver/TcpServerOpDispenser.java | 8 ++++---- .../adapter/tcpserver/TcpServerOpMapper.java | 5 ++--- 94 files changed, 232 insertions(+), 276 deletions(-) diff --git a/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java index 3efae3830..7c1fe2c41 100644 --- a/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java +++ b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java @@ -19,12 +19,10 @@ package io.nosqlbench.adapter.amqp; import io.nosqlbench.adapter.amqp.dispensers.AmqpMsgRecvOpDispenser; import io.nosqlbench.adapter.amqp.dispensers.AmqpMsgSendOpDispenser; import io.nosqlbench.adapter.amqp.ops.AmqpTimeTrackOp; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; import org.apache.logging.log4j.LogManager; @@ -45,7 +43,7 @@ public class AmqpOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { //public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { int spaceName = op.getStaticConfigOr("space", 0); diff --git a/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java index b8b237e51..6a910d5fd 100644 --- a/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java +++ b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java @@ -23,7 +23,6 @@ import io.nosqlbench.adapter.amqp.exception.AmqpAdapterUnexpectedException; import io.nosqlbench.adapter.amqp.ops.AmqpTimeTrackOp; import io.nosqlbench.adapter.amqp.util.AmqpAdapterMetrics; import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import org.apache.commons.lang3.math.NumberUtils; import org.apache.logging.log4j.LogManager; @@ -49,7 +48,7 @@ public abstract class AmqpBaseOpDispenser extends BaseOpDispenser, * Given an instance of a {@link ParsedOp} returns the appropriate * {@link AzureAISearchBaseOpDispenser} subclass. * + * @param adapterC * @param op * The {@link ParsedOp} to be evaluated * @param spaceInitF @@ -61,7 +62,7 @@ public class AzureAISearchOpMapper implements OpMapper, * the op type */ @Override - public OpDispenser> apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser> apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { TypeAndTarget typeAndTarget = op.getTypeAndTarget(AzureAISearchOpType.class, String.class, "type", "target"); diff --git a/nb-adapters/adapter-azure-aisearch/src/main/java/io/nosqlbench/adapter/azureaisearch/opsdispenser/AzureAISearchBaseOpDispenser.java b/nb-adapters/adapter-azure-aisearch/src/main/java/io/nosqlbench/adapter/azureaisearch/opsdispenser/AzureAISearchBaseOpDispenser.java index 74a892c6c..a665e5393 100644 --- a/nb-adapters/adapter-azure-aisearch/src/main/java/io/nosqlbench/adapter/azureaisearch/opsdispenser/AzureAISearchBaseOpDispenser.java +++ b/nb-adapters/adapter-azure-aisearch/src/main/java/io/nosqlbench/adapter/azureaisearch/opsdispenser/AzureAISearchBaseOpDispenser.java @@ -39,7 +39,7 @@ public abstract class AzureAISearchBaseOpDispenser @SuppressWarnings("rawtypes") protected AzureAISearchBaseOpDispenser(AzureAISearchDriverAdapter adapter, ParsedOp op, LongFunction targetF) { - super((DriverAdapter) adapter, op); + super((DriverAdapter) adapter, op, adapter.getSpaceFunc(op)); this.azureAISearchSpaceFunction = adapter.getSpaceFunc(op); this.clientFunction = (long l) -> { try { @@ -53,10 +53,6 @@ public abstract class AzureAISearchBaseOpDispenser this.opF = createOpFunc(paramF, this.clientFunction, op, targetF); } - protected AzureAISearchDriverAdapter getDriverAdapter() { - return (AzureAISearchDriverAdapter) adapter; - } - public abstract LongFunction getParamFunc(LongFunction clientF, ParsedOp op, LongFunction targetF); @@ -64,8 +60,8 @@ public abstract class AzureAISearchBaseOpDispenser LongFunction clientF, ParsedOp op, LongFunction targetF); @Override - public AzureAISearchBaseOp getOp(long value) { - return opF.apply(value); + public AzureAISearchBaseOp getOp(long cycle) { + return opF.apply(cycle); } } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java index d33a2fb38..5fc7822bc 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java @@ -16,17 +16,13 @@ package io.nosqlbench.adapter.cqld4.opdispensers; -import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.cql.*; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; -import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.optionhelpers.BatchTypeEnum; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlBatchStatement; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.BaseSpace; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import org.jetbrains.annotations.NotNull; @@ -50,7 +46,7 @@ public class CqlD4BatchStmtDispenser extends Cqld4CqlBaseOpDispenser> extends BaseOpDispenser implements CqlOpMetrics { @@ -57,7 +55,7 @@ public abstract class Cqld4BaseOpDispenser> extends Bas public Cqld4BaseOpDispenser(Cqld4DriverAdapter adapter, ParsedOp op) { - super((DriverAdapter) adapter, op); + super((DriverAdapter) adapter, op, adapter.getSpaceFunc(op)); this.sessionF = l -> adapter.getSpaceFunc(op).apply(l).getSession(); this.maxpages = op.getStaticConfigOr("maxpages", 1); this.isRetryReplace = op.getStaticConfigOr("retryreplace", false); diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4CqlBaseOpDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4CqlBaseOpDispenser.java index 8921cb38e..9de9b4884 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4CqlBaseOpDispenser.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4CqlBaseOpDispenser.java @@ -30,5 +30,5 @@ public abstract class Cqld4CqlBaseOpDispenser extends Cqld } @Override - public abstract T getOp(long value); + public abstract T getOp(long cycle); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java index c42e3124f..ff7409441 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java @@ -55,14 +55,14 @@ public class Cqld4FluentGraphOpDispenser extends Cqld4BaseOpDispenser allMap = virtdataBindings.getAllMap(value); + Map allMap = virtdataBindings.getAllMap(cycle); allMap.forEach((k,v) -> script.getBinding().setVariable(k,v)); GraphTraversal v = (GraphTraversal) script.run(); FluentGraphStatement fgs = new FluentGraphStatementBuilder(v).setGraphName(graphname).build(); - return new Cqld4FluentGraphOp(sessionF.apply(value),fgs); + return new Cqld4FluentGraphOp(sessionF.apply(cycle),fgs); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java index 315cc04a3..ee055b12c 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java @@ -22,10 +22,8 @@ import com.datastax.oss.driver.api.core.CqlSession; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.optypes.Cqld4BaseOp; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapter.cqld4.optypes.Cqld4ScriptGraphOp; import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import java.util.Optional; @@ -39,7 +37,7 @@ public class Cqld4GremlinOpDispenser extends BaseOpDispenser, Cql public Cqld4GremlinOpDispenser(Cqld4DriverAdapter adapter, LongFunction sessionFunc, LongFunction targetFunction, ParsedOp cmd) { - super(adapter,cmd); + super(adapter,cmd, adapter.getSpaceFunc(cmd)); this.sessionFunc = sessionFunc; this.diagFunc = cmd.getAsFunctionOr("diag", 0L); @@ -59,12 +57,12 @@ public class Cqld4GremlinOpDispenser extends BaseOpDispenser, Cql } @Override - public Cqld4ScriptGraphOp getOp(long value) { - ScriptGraphStatement stmt = stmtFunc.apply(value); - if (diagFunc.apply(value)>0L) { + public Cqld4ScriptGraphOp getOp(long cycle) { + ScriptGraphStatement stmt = stmtFunc.apply(cycle); + if (diagFunc.apply(cycle)>0L) { System.out.println("## GREMLIN DIAG: ScriptGraphStatement on graphname(" + stmt.getGraphName() + "):\n" + stmt.getScript()); } - return new Cqld4ScriptGraphOp(sessionFunc.apply(value), stmt); + return new Cqld4ScriptGraphOp(sessionFunc.apply(cycle), stmt); } } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java index c5f663aa8..ddea50898 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java @@ -24,9 +24,7 @@ import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.RSProcessors; import io.nosqlbench.adapter.cqld4.diagnostics.CQLD4PreparedStmtDiagnostics; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlPreparedStatement; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.nb.api.errors.OpConfigError; import io.nosqlbench.virtdata.core.templates.ParsedTemplateString; @@ -42,6 +40,7 @@ public class Cqld4PreparedStmtDispenser extends Cqld4BaseOpDispenser stmtFunc; private final ParsedTemplateString stmtTpl; private final LongFunction fieldsF; + private final LongFunction spaceInitF; private PreparedStatement preparedStmt; // This is a stable enum for the op template from the workload, bounded by cardinality of all op templates private int refkey; @@ -50,12 +49,14 @@ public class Cqld4PreparedStmtDispenser extends Cqld4BaseOpDispenser spaceInitF ) { super(adapter, op); this.processors = processors; this.stmtTpl = stmtTpl; this.fieldsF = getFieldsFunction(op); + this.spaceInitF = spaceInitF; stmtFunc = createStmtFunc(fieldsF, op); } @@ -76,7 +77,7 @@ public class Cqld4PreparedStmtDispenser extends Cqld4BaseOpDispenser (sessionF.apply(l)).prepare(preparedQueryString); LongFunction lookupSpaceF = - (long l) -> adapter.getSpaceFunc(op).apply(l); + (long l) -> spaceInitF.apply(l); int refKey = op.getRefKey(); LongFunction cachedStatementF = diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java index 57ffd363b..a71ee4905 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java @@ -47,10 +47,10 @@ public class Cqld4RawStmtDispenser extends Cqld4CqlBaseOpDispenser> extends Cq } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { ParsedOp subop = op.getAsSubOp("op_template", ParsedOp.SubOpNaming.ParentAndSubKey); int repeat = op.getStaticValue("repeat"); - OpDispenser od = new Cqld4CqlOpMapper(adapter).apply(op, spaceInitF); + OpDispenser od = new Cqld4CqlOpMapper(adapter).apply(adapterC, op, spaceInitF); return new CqlD4BatchStmtDispenser(adapter, op, repeat, subop, od); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java index c99e6d863..4b82953b6 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java @@ -19,10 +19,10 @@ package io.nosqlbench.adapter.cqld4.opmappers; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4SimpleCqlStmtDispenser; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleStatement; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import java.util.function.LongFunction; @@ -36,7 +36,7 @@ public class CqlD4CqlSimpleStmtMapper extends Cqld4CqlBaseOpMapper apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { return new Cqld4SimpleCqlStmtDispenser(adapter, targetFunction, op); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java index af23764a7..b09485fea 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java @@ -16,19 +16,14 @@ package io.nosqlbench.adapter.cqld4.opmappers; -import com.datastax.oss.driver.api.core.CqlSession; import io.nosqlbench.adapter.cqld4.*; import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4PreparedStmtDispenser; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4BaseOp; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlPreparedStatement; import io.nosqlbench.adapter.cqld4.processors.CqlFieldCaptureProcessor; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; -import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.params.ParamsParser; import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.virtdata.core.templates.ParsedTemplateString; @@ -49,7 +44,11 @@ public class CqlD4PreparedStmtMapper extends Cqld4CqlBaseOpMapper apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply( + NBComponent adapterC, + ParsedOp op, + LongFunction spaceInitF + ) { ParsedTemplateString stmtTpl = op.getAsTemplate(target.field).orElseThrow(() -> new BasicError( "No statement was found in the op template:" + op )); @@ -69,7 +68,7 @@ public class CqlD4PreparedStmtMapper extends Cqld4CqlBaseOpMapper extends Cql } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { return null; // return new CqlD4RainbowTableDispenser(adapter, sessionFunc,targetFunction, op); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java index 66aef98a5..fdba78fb7 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java @@ -19,10 +19,10 @@ package io.nosqlbench.adapter.cqld4.opmappers; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4RawStmtDispenser; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4BaseOp; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleStatement; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import java.util.function.LongFunction; @@ -35,7 +35,7 @@ public class CqlD4RawStmtMapper extends Cqld4CqlBaseOpMapper apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { return new Cqld4RawStmtDispenser(adapter, targetFunction,op); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4BaseOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4BaseOpMapper.java index 4236966f6..483f15f23 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4BaseOpMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4BaseOpMapper.java @@ -16,14 +16,13 @@ package io.nosqlbench.adapter.cqld4.opmappers; -import com.datastax.oss.driver.api.core.CqlSession; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.optypes.Cqld4BaseOp; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,5 +38,5 @@ public abstract class Cqld4BaseOpMapper> implements OpM } @Override - public abstract OpDispenser apply(ParsedOp op, LongFunction spaceInitF); + public abstract OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java index 3cd9d95e8..698898ef3 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java @@ -19,7 +19,7 @@ package io.nosqlbench.adapter.cqld4.opmappers; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.optypes.Cqld4BaseOp; -import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.templating.ParsedOp; @@ -43,6 +43,7 @@ public class Cqld4CoreOpMapper extends Cqld4BaseOpMapper> { * for it. Since the operations under the CQL driver 4.* do not follow a common type structure, we use the * base types in the NoSQLBench APIs and treat them somewhat more generically than with other drivers. * + * @param adapterC * @param op * The {@link ParsedOp} which is the parsed version of the user-provided op template. * This contains all the fields provided by the user, as well as explicit knowledge of @@ -51,17 +52,17 @@ public class Cqld4CoreOpMapper extends Cqld4BaseOpMapper> { */ @Override - public OpDispenser> apply(ParsedOp op, LongFunction spaceF) { + public OpDispenser> apply(NBComponent adapterC, ParsedOp op, LongFunction spaceF) { CqlD4OpType opType = CqlD4OpType.prepared; TypeAndTarget target = op.getTypeAndTarget(CqlD4OpType.class, String.class, "type", "stmt"); logger.info(() -> "Using " + target.enumId + " statement form for '" + op.getName() + "'"); return (OpDispenser>) switch (target.enumId) { - case raw, simple, prepared, batch -> new Cqld4CqlOpMapper(adapter).apply(op, spaceF); - case gremlin -> new Cqld4GremlinOpMapper(adapter, target.targetFunction).apply(op, spaceF); - case fluent -> new Cqld4FluentGraphOpMapper(adapter, target).apply(op, spaceF); + case raw, simple, prepared, batch -> new Cqld4CqlOpMapper(adapter).apply(adapterC, op, spaceF); + case gremlin -> new Cqld4GremlinOpMapper(adapter, target.targetFunction).apply(adapterC, op, spaceF); + case fluent -> new Cqld4FluentGraphOpMapper(adapter, target).apply(adapterC, op, spaceF); case rainbow -> - new CqlD4RainbowTableMapper(adapter, spaceF, target.targetFunction).apply(op, spaceF); + new CqlD4RainbowTableMapper(adapter, spaceF, target.targetFunction).apply(adapterC, op, spaceF); default -> throw new OpConfigError("Unsupported op type " + opType); // case sst -> new Cqld4SsTableMapper(adapter, sessionFunc, target.targetFunction).apply(op); }; diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlBaseOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlBaseOpMapper.java index 6e57780d6..eba4a9989 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlBaseOpMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlBaseOpMapper.java @@ -22,8 +22,8 @@ import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; -import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import java.util.function.LongFunction; @@ -34,6 +34,6 @@ public abstract class Cqld4CqlBaseOpMapper extends Cqld4Ba } @Override - public abstract OpDispenser apply(ParsedOp op, LongFunction spaceInitF); + public abstract OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF); } diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlOpMapper.java index b089af837..ae137b10f 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlOpMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CqlOpMapper.java @@ -23,6 +23,7 @@ import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleStatement; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.errors.OpConfigError; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -38,7 +39,7 @@ public class Cqld4CqlOpMapper extends Cqld4CqlBaseOpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { CqlD4OpType opType = CqlD4OpType.prepared; TypeAndTarget target = op.getTypeAndTarget(CqlD4OpType.class, String.class, "type", "stmt"); logger.info(() -> "Using " + target.enumId + " statement form for '" + op.getName() + "'"); @@ -46,13 +47,13 @@ public class Cqld4CqlOpMapper extends Cqld4CqlBaseOpMapper { return (OpDispenser) switch (target.enumId) { case raw -> { CqlD4RawStmtMapper cqlD4RawStmtMapper = new CqlD4RawStmtMapper(adapter, target.targetFunction); - OpDispenser apply = cqlD4RawStmtMapper.apply(op, spaceInitF); + OpDispenser apply = cqlD4RawStmtMapper.apply(adapterC, op, spaceInitF); yield apply; } - case simple -> new CqlD4CqlSimpleStmtMapper(adapter, target.targetFunction).apply(op, spaceInitF); - case prepared -> new CqlD4PreparedStmtMapper(adapter, target).apply(op, spaceInitF); + case simple -> new CqlD4CqlSimpleStmtMapper(adapter, target.targetFunction).apply(adapterC, op, spaceInitF); + case prepared -> new CqlD4PreparedStmtMapper(adapter, target).apply(adapterC, op, spaceInitF); - case batch -> new CqlD4BatchStmtMapper(adapter, target).apply(op, spaceInitF); + case batch -> new CqlD4BatchStmtMapper(adapter, target).apply(adapterC, op, spaceInitF); default -> throw new OpConfigError("Unsupported op type for CQL category of statement forms:" + target.enumId); }; diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java index 1273761db..26e793282 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java @@ -27,6 +27,7 @@ import io.nosqlbench.adapter.cqld4.optypes.Cqld4FluentGraphOp; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.errors.OpConfigError; import io.nosqlbench.virtdata.core.bindings.Bindings; import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; @@ -58,7 +59,7 @@ public class Cqld4FluentGraphOpMapper extends Cqld4BaseOpMapper apply(ParsedOp op, LongFunction cqld4SpaceLongFunction) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction cqld4SpaceLongFunction) { GraphTraversalSource g = DseGraph.g; ParsedTemplateString fluent = op.getAsTemplate(target.field).orElseThrow(); diff --git a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java index a56833a87..72eaba185 100644 --- a/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java +++ b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java @@ -16,17 +16,11 @@ package io.nosqlbench.adapter.cqld4.opmappers; -import com.datastax.oss.driver.api.core.CqlSession; import io.nosqlbench.adapter.cqld4.Cqld4DriverAdapter; -import io.nosqlbench.adapter.cqld4.Cqld4Space; import io.nosqlbench.adapter.cqld4.opdispensers.Cqld4GremlinOpDispenser; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapter.cqld4.optypes.Cqld4ScriptGraphOp; -import io.nosqlbench.adapters.api.activityimpl.OpDispenser; -import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import java.util.function.LongFunction; @@ -39,7 +33,7 @@ public class Cqld4GremlinOpMapper extends Cqld4Ba } @Override - public Cqld4GremlinOpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public Cqld4GremlinOpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { return new Cqld4GremlinOpDispenser( adapter, l -> adapter.getSpaceFunc(op).apply(l).getSession(), targetFunction, op); diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java index 045528714..8ef6dbd82 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/DataApiOpMapper.java @@ -21,9 +21,9 @@ import io.nosqlbench.adapter.dataapi.ops.DataApiBaseOp; import io.nosqlbench.adapter.dataapi.ops.DataApiOpType; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.function.LongFunction; @@ -38,7 +38,7 @@ public class DataApiOpMapper implements OpMapper { @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { //public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { TypeAndTarget typeAndTarget = op.getTypeAndTarget( DataApiOpType.class, diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCountDocumentsOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCountDocumentsOpDispenser.java index df688ed6d..47f3e6d46 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCountDocumentsOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCountDocumentsOpDispenser.java @@ -52,7 +52,7 @@ public class DataApiCountDocumentsOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionOpDispenser.java index 928648b60..1eb70cccf 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionOpDispenser.java @@ -51,8 +51,8 @@ public class DataApiCreateCollectionOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionWithClassOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionWithClassOpDispenser.java index bba1a59b2..d4e30d27a 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionWithClassOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateCollectionWithClassOpDispenser.java @@ -53,8 +53,8 @@ public class DataApiCreateCollectionWithClassOpDispenser extends DataApiOpDispen } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateDatabaseOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateDatabaseOpDispenser.java index 9198fe07a..757933712 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateDatabaseOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateDatabaseOpDispenser.java @@ -61,7 +61,7 @@ public class DataApiCreateDatabaseOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateNamespaceOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateNamespaceOpDispenser.java index c99e75ac9..d31e7e2be 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateNamespaceOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiCreateNamespaceOpDispenser.java @@ -43,7 +43,7 @@ public class DataApiCreateNamespaceOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteAllOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteAllOpDispenser.java index 10e6d8e2f..793edd374 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteAllOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteAllOpDispenser.java @@ -47,7 +47,7 @@ public class DataApiDeleteAllOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteManyOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteManyOpDispenser.java index 76b98d768..723ee4c50 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteManyOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteManyOpDispenser.java @@ -50,7 +50,7 @@ public class DataApiDeleteManyOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteOneOpDispenser.java index 581f3d2e4..68677a952 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDeleteOneOpDispenser.java @@ -73,7 +73,7 @@ public class DataApiDeleteOneOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropCollectionOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropCollectionOpDispenser.java index 39b8c4897..15caa8afc 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropCollectionOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropCollectionOpDispenser.java @@ -41,7 +41,7 @@ public class DataApiDropCollectionOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropDatabaseOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropDatabaseOpDispenser.java index e950b24b3..b9f4a00df 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropDatabaseOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropDatabaseOpDispenser.java @@ -43,7 +43,7 @@ public class DataApiDropDatabaseOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropNamespaceOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropNamespaceOpDispenser.java index cfa69bfbd..2504eb560 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropNamespaceOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiDropNamespaceOpDispenser.java @@ -44,7 +44,7 @@ public class DataApiDropNamespaceOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiEstimatedDocumentCountOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiEstimatedDocumentCountOpDispenser.java index 689f4834a..efe830b2c 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiEstimatedDocumentCountOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiEstimatedDocumentCountOpDispenser.java @@ -41,7 +41,7 @@ public class DataApiEstimatedDocumentCountOpDispenser extends DataApiOpDispenser } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindByIdOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindByIdOpDispenser.java index ebd945fbb..d4ad28f74 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindByIdOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindByIdOpDispenser.java @@ -56,7 +56,7 @@ public class DataApiFindByIdOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java index 1ef634117..97a17ab94 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindDistinctOpDispenser.java @@ -61,7 +61,7 @@ public class DataApiFindDistinctOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndDeleteOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndDeleteOpDispenser.java index 3935d53b2..69220147c 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndDeleteOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndDeleteOpDispenser.java @@ -68,7 +68,7 @@ public class DataApiFindOneAndDeleteOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndReplaceOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndReplaceOpDispenser.java index 5f861ef72..5e80f9578 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndReplaceOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndReplaceOpDispenser.java @@ -86,7 +86,7 @@ public class DataApiFindOneAndReplaceOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndUpdateOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndUpdateOpDispenser.java index 134c57744..1b8eb1d4c 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndUpdateOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneAndUpdateOpDispenser.java @@ -52,7 +52,7 @@ public class DataApiFindOneAndUpdateOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java index 2523b8966..ca34088e3 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOneOpDispenser.java @@ -70,7 +70,7 @@ public class DataApiFindOneOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java index 1f993b885..cd8ae9ec2 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindOpDispenser.java @@ -88,7 +88,7 @@ public class DataApiFindOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorFilterOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorFilterOpDispenser.java index a377061e1..559353bfb 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorFilterOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorFilterOpDispenser.java @@ -56,7 +56,7 @@ public class DataApiFindVectorFilterOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorOpDispenser.java index 2b9199be9..2531ecbda 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiFindVectorOpDispenser.java @@ -56,7 +56,7 @@ public class DataApiFindVectorOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiGetDatabaseInfoOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiGetDatabaseInfoOpDispenser.java index 546221dc3..cce8048a3 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiGetDatabaseInfoOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiGetDatabaseInfoOpDispenser.java @@ -44,7 +44,7 @@ public class DataApiGetDatabaseInfoOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertManyOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertManyOpDispenser.java index 55472c01b..a8090dd49 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertManyOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertManyOpDispenser.java @@ -75,7 +75,7 @@ public class DataApiInsertManyOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneOpDispenser.java index 7caad46a0..a5199f426 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneOpDispenser.java @@ -49,7 +49,7 @@ public class DataApiInsertOneOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneVectorOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneVectorOpDispenser.java index 521f30af8..c45a02338 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneVectorOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiInsertOneVectorOpDispenser.java @@ -52,7 +52,7 @@ public class DataApiInsertOneVectorOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionNamesOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionNamesOpDispenser.java index a795bb9a0..6636b0e71 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionNamesOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionNamesOpDispenser.java @@ -37,7 +37,7 @@ public class DataApiListCollectionNamesOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionsOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionsOpDispenser.java index 0226c1322..f03cb5f4b 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionsOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListCollectionsOpDispenser.java @@ -40,7 +40,7 @@ public class DataApiListCollectionsOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListDatabasesOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListDatabasesOpDispenser.java index b38286d41..43829ad98 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListDatabasesOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListDatabasesOpDispenser.java @@ -41,7 +41,7 @@ public class DataApiListDatabasesOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListNamespacesOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListNamespacesOpDispenser.java index 620e80230..13af13d08 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListNamespacesOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiListNamespacesOpDispenser.java @@ -42,7 +42,7 @@ public class DataApiListNamespacesOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiOpDispenser.java index 2a73a991a..15bebedec 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiOpDispenser.java @@ -32,7 +32,7 @@ public abstract class DataApiOpDispenser extends BaseOpDispenser adapter, ParsedOp op, LongFunction targetFunction) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); this.targetFunction = targetFunction; this.spaceFunction = adapter.getSpaceFunc(op); } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiReplaceOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiReplaceOneOpDispenser.java index f4106adf4..a16a20777 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiReplaceOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiReplaceOneOpDispenser.java @@ -68,7 +68,7 @@ public class DataApiReplaceOneOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java index 003052616..ae201dcbc 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateManyOpDispenser.java @@ -66,7 +66,7 @@ public class DataApiUpdateManyOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java index 9bab3043f..fbb49d31f 100644 --- a/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java +++ b/nb-adapters/adapter-dataapi/src/main/java/io/nosqlbench/adapter/dataapi/opdispensers/DataApiUpdateOneOpDispenser.java @@ -75,7 +75,7 @@ public class DataApiUpdateOneOpDispenser extends DataApiOpDispenser { } @Override - public DataApiBaseOp getOp(long value) { - return opFunction.apply(value); + public DataApiBaseOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java index 7719660d2..ecbf75884 100644 --- a/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java +++ b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java @@ -40,7 +40,7 @@ public class DiagOpDispenser extends BaseOpDispenser implement private OpFunc opFuncs; public DiagOpDispenser(DiagDriverAdapter adapter, LongFunction spaceF, ParsedOp op) { - super(adapter,op); + super(adapter,op, adapter.getSpaceFunc(op)); this.opFunc = resolveOpFunc(spaceF, op); } @@ -129,7 +129,7 @@ public class DiagOpDispenser extends BaseOpDispenser implement } @Override - public DiagOp getOp(long value) { - return opFunc.apply(value); + public DiagOp getOp(long cycle) { + return opFunc.apply(cycle); } } diff --git a/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java index eaae1da3c..1a5cc5599 100644 --- a/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java +++ b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java @@ -18,8 +18,8 @@ package io.nosqlbench.adapter.diag; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfigModel; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.nb.api.config.standard.NBReconfigurable; @@ -38,7 +38,7 @@ public class DiagOpMapper implements OpMapper, NBReconfigurabl } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { LongFunction spaceF = adapter.getSpaceFunc(op); DiagOpDispenser dispenser = new DiagOpDispenser(adapter,spaceF,op); dispensers.put(op.getName(),dispenser); diff --git a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java index 5680bdc94..e24066747 100644 --- a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java +++ b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java @@ -21,11 +21,10 @@ import io.nosqlbench.adapter.dynamodb.opdispensers.*; import io.nosqlbench.adapter.dynamodb.optypes.DynamoDBOp; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import java.util.function.LongFunction; @@ -41,7 +40,7 @@ public class DynamoDBOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { int space = op.getStaticConfigOr("space", 0); LongFunction spaceFunc = adapter.getSpaceFunc(op); DynamoDB ddb = spaceFunc.apply(space).getDynamoDB(); diff --git a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java index 2a19ef7b8..d381fd156 100644 --- a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java +++ b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java @@ -117,7 +117,7 @@ public class DDBCreateTableOpDispenser extends BaseOpDispenser billingModeFunc; public DDBCreateTableOpDispenser(DriverAdapter adapter, DynamoDB ddb, ParsedOp cmd, LongFunction targetFunc) { - super(adapter,cmd); + super(adapter,cmd, adapter.getSpaceFunc(cmd)); this.ddb = ddb; this.tableNameFunc = l -> targetFunc.apply(l).toString(); this.keySchemaFunc = resolveKeySchemaFunction(cmd); diff --git a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java index 14c22bfd7..f80949588 100644 --- a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java +++ b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java @@ -41,7 +41,7 @@ public class DDBDeleteTableOpDispenser extends BaseOpDispenser tableNameFunc; public DDBDeleteTableOpDispenser(DriverAdapter adapter, DynamoDB ddb, ParsedOp cmd, LongFunction targetFunc) { - super(adapter, cmd); + super(adapter, cmd, adapter.getSpaceFunc(cmd)); this.ddb = ddb; this.tableNameFunc = l -> targetFunc.apply(l).toString(); } diff --git a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java index 0eb36a4ae..75b3dad0e 100644 --- a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java +++ b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java @@ -37,7 +37,7 @@ public class DDBGetItemOpDispenser extends BaseOpDispenser getItemSpecFunc; public DDBGetItemOpDispenser(DriverAdapter adapter, DynamoDB ddb, ParsedOp cmd, LongFunction targetFunction) { - super(adapter,cmd); + super(adapter,cmd, adapter.getSpaceFunc(cmd)); this.ddb = ddb; this.targetTableFunction = l -> ddb.getTable(targetFunction.apply(l).toString()); this.getItemSpecFunc = resolveGetItemSpecFunction(cmd); @@ -83,9 +83,9 @@ public class DDBGetItemOpDispenser extends BaseOpDispenser itemfunc; public DDBPutItemOpDispenser(DriverAdapter adapter, DynamoDB ddb, ParsedOp cmd, LongFunction targetFunc) { - super(adapter, cmd); + super(adapter, cmd, adapter.getSpaceFunc(cmd)); this.ddb = ddb; this.tableNameFunc = l -> targetFunc.apply(l).toString(); if (cmd.isDefined("item")) { @@ -51,9 +51,9 @@ public class DDBPutItemOpDispenser extends BaseOpDispenser querySpecFunc; public DDBQueryOpDispenser(DriverAdapter adapter, DynamoDB ddb, ParsedOp cmd, LongFunction targetFunc) { - super(adapter,cmd); + super(adapter,cmd, adapter.getSpaceFunc(cmd)); this.ddb = ddb; LongFunction tableNameFunc = l -> targetFunc.apply(l).toString(); this.tableFunc = l -> ddb.getTable(tableNameFunc.apply(l)); diff --git a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java index 474a27f47..2b47b979f 100644 --- a/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java +++ b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java @@ -32,7 +32,7 @@ public class RawDynamoDBOpDispenser extends BaseOpDispenser, GCPSpannerSpace> { @@ -49,6 +48,7 @@ public class GCPSpannerOpMapper implements OpMapper, GCPSp * Given an instance of a {@link ParsedOp} returns the appropriate * {@link GCPSpannerBaseOpDispenser} subclass. * + * @param adapterC * @param op * The {@link ParsedOp} to be evaluated * @param spaceInitF @@ -56,7 +56,7 @@ public class GCPSpannerOpMapper implements OpMapper, GCPSp * the op type */ @Override - public OpDispenser> apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser> apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { TypeAndTarget typeAndTarget = op.getTypeAndTarget(GCPSpannerOpType.class, String.class, "type", "target"); logger.info(() -> "Using '" + typeAndTarget.enumId + "' op type for op template '" + op.getName() + "'"); diff --git a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerBaseOpDispenser.java b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerBaseOpDispenser.java index 593af56f9..58abfd3b0 100644 --- a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerBaseOpDispenser.java +++ b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerBaseOpDispenser.java @@ -21,7 +21,6 @@ import io.nosqlbench.adapter.gcpspanner.GCPSpannerDriverAdapter; import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser; import io.nosqlbench.adapter.gcpspanner.ops.GCPSpannerBaseOp; import io.nosqlbench.adapter.gcpspanner.GCPSpannerSpace; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import java.util.function.LongFunction; @@ -52,7 +51,7 @@ public abstract class GCPSpannerBaseOpDispenser targetFunction) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); this.targetFunction = targetFunction; this.spaceFunction = adapter.getSpaceFunc(op); } diff --git a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerCreateDatabaseDdlOpDispenser.java b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerCreateDatabaseDdlOpDispenser.java index a946c831c..3b49f1f6a 100644 --- a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerCreateDatabaseDdlOpDispenser.java +++ b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerCreateDatabaseDdlOpDispenser.java @@ -78,12 +78,12 @@ public class GCPSpannerCreateDatabaseDdlOpDispenser /** * Retrieves an operation instance based on the provided value. * - * @param value + * @param cycle * the long value used to generate the operation * @return a {@link GCPSpannerBaseOp} instance */ @Override - public GCPSpannerCreateDatabaseDdlOp getOp(long value) { - return opFunction.apply(value); + public GCPSpannerCreateDatabaseDdlOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerDropDatabaseDdlOpDispenser.java b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerDropDatabaseDdlOpDispenser.java index 6662fa48a..2c4fe05fa 100644 --- a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerDropDatabaseDdlOpDispenser.java +++ b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerDropDatabaseDdlOpDispenser.java @@ -83,11 +83,11 @@ public class GCPSpannerDropDatabaseDdlOpDispenser extends GCPSpannerBaseOpDispen /** * Retrieves an operation instance based on the provided value. * - * @param value the long value used to generate the operation + * @param cycle the long value used to generate the operation * @return a {@link GCPSpannerBaseOp} instance */ @Override - public GCPSpannerDropDatabaseDdlOp getOp(long value) { - return opFunction.apply(value); + public GCPSpannerDropDatabaseDdlOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerExecuteDmlOpDispenser.java b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerExecuteDmlOpDispenser.java index 56d3f3129..c8ee6c664 100644 --- a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerExecuteDmlOpDispenser.java +++ b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerExecuteDmlOpDispenser.java @@ -77,11 +77,11 @@ public class GCPSpannerExecuteDmlOpDispenser extends GCPSpannerBaseOpDispenser params = queryParamsFunction.apply(value); + public GCPSpannerInsertOp getOp(long cycle) { + Mutation.WriteBuilder builder = Mutation.newInsertBuilder(targetFunction.apply(cycle)); + Map params = queryParamsFunction.apply(cycle); for (Map.Entry entry : params.entrySet()) { builder.set(entry.getKey()).to(convertToValue(entry)); } return new GCPSpannerInsertOp( - spaceFunction.apply(value).getSpanner(), - value, + spaceFunction.apply(cycle).getSpanner(), + cycle, builder.build(), - spaceFunction.apply(value).getDbClient() + spaceFunction.apply(cycle).getDbClient() ); } diff --git a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerUpdateDatabaseDdlOpDispenser.java b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerUpdateDatabaseDdlOpDispenser.java index 1ad5fe045..6ff51a66a 100644 --- a/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerUpdateDatabaseDdlOpDispenser.java +++ b/nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/opdispensers/GCPSpannerUpdateDatabaseDdlOpDispenser.java @@ -66,11 +66,11 @@ public class GCPSpannerUpdateDatabaseDdlOpDispenser /** * Retrieves an operation instance based on the provided value. * - * @param value the long value used to generate the operation + * @param cycle the long value used to generate the operation * @return a GCPSpannerBaseOp instance */ @Override - public GCPSpannerUpdateDatabaseDdlOp getOp(long value) { - return opFunction.apply(value); + public GCPSpannerUpdateDatabaseDdlOp getOp(long cycle) { + return opFunction.apply(cycle); } } diff --git a/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java index d3f4559fc..f75202959 100644 --- a/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java +++ b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java @@ -37,7 +37,7 @@ public class HttpOpDispenser extends BaseOpDispenser { public HttpOpDispenser(DriverAdapter adapter, LongFunction ctxF, ParsedOp op) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); opFunc = getOpFunc(ctxF, op); } @@ -128,8 +128,8 @@ public class HttpOpDispenser extends BaseOpDispenser { } @Override - public HttpOp getOp(long value) { - HttpOp op = this.opFunc.apply(value); + public HttpOp getOp(long cycle) { + HttpOp op = this.opFunc.apply(cycle); return op; } diff --git a/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java index 45d34fdb6..5223338a1 100644 --- a/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java +++ b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java @@ -19,10 +19,9 @@ package io.nosqlbench.adapter.http.core; import io.nosqlbench.adapter.http.HttpDriverAdapter; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import java.util.function.LongFunction; @@ -38,7 +37,7 @@ public class HttpOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { LongFunction spaceNameF = op.getAsFunctionOr("space", "default"); return new HttpOpDispenser(adapter, spaceInitF, op); } diff --git a/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java index 77cabb25f..b20c5d03a 100644 --- a/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java +++ b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java @@ -19,8 +19,7 @@ package io.nosqlbench.adapter.kafka; import io.nosqlbench.adapter.kafka.dispensers.MessageConsumerOpDispenser; import io.nosqlbench.adapter.kafka.dispensers.MessageProducerOpDispenser; import io.nosqlbench.adapter.kafka.ops.KafkaOp; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; @@ -29,7 +28,7 @@ import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.function.IntFunction; + import java.util.function.LongFunction; public class KafkaOpMapper implements OpMapper { @@ -43,7 +42,7 @@ public class KafkaOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { KafkaSpace kafkaSpace = adapter.getSpaceFunc(op).apply(op.getStaticConfigOr("space",0)); /* diff --git a/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java index f40525c94..615ce9e54 100644 --- a/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java +++ b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java @@ -62,7 +62,7 @@ public abstract class KafkaBaseOpDispenser extends BaseOpDispenser topicNameStrFunc, final KafkaSpace kafkaSpace) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); parsedOp = op; this.kafkaSpace = kafkaSpace; diff --git a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java index c4a27e8f0..59d3e4335 100644 --- a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java +++ b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java @@ -18,7 +18,7 @@ package io.nosqlbench.adapter.mongodb.core; import io.nosqlbench.adapter.mongodb.dispensers.MongoCommandOpDispenser; import io.nosqlbench.adapter.mongodb.ops.MongoDirectCommandOp; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.nb.api.errors.BasicError; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; @@ -43,7 +43,7 @@ public class MongoOpMapper implements OpMapper< } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { LongFunction ctxNamer = op.getAsFunctionOr("space", "default"); diff --git a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java index db6431895..2559a81f6 100644 --- a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java +++ b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java @@ -35,7 +35,7 @@ public class MongoCommandOpDispenser extends BaseOpDispenser ctxFunc, ParsedOp op ) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); this.mongoOpF = createOpFunc(ctxFunc, op); } diff --git a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java index 0b7090d3b..43540d307 100644 --- a/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java +++ b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java @@ -20,14 +20,11 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; import io.nosqlbench.adapter.mongodb.core.MongoSpace; import io.nosqlbench.adapter.mongodb.core.MongodbDriverAdapter; -import io.nosqlbench.adapter.mongodb.ops.MongoDbUpdateOp; import io.nosqlbench.adapter.mongodb.ops.MongoDirectCommandOp; import io.nosqlbench.adapter.mongodb.ops.MongoOp; import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser; -import io.nosqlbench.adapters.api.activityimpl.uniform.flowtypes.CycleOp; import io.nosqlbench.adapters.api.templating.ParsedOp; import org.bson.BsonDocument; -import org.bson.conversions.Bson; import java.util.function.LongFunction; @@ -41,7 +38,7 @@ public class MongoDbUpdateOpDispenser extends BaseOpDispenser, MongoS private final LongFunction collectionF; public MongoDbUpdateOpDispenser(MongodbDriverAdapter adapter, ParsedOp pop, LongFunction collectionF) { - super(adapter, pop); + super(adapter, pop, adapter.getSpaceFunc(pop)); this.collectionF = collectionF; this.spaceF = adapter.getSpaceFunc(pop); this.opF = createOpF(pop); @@ -55,8 +52,8 @@ public class MongoDbUpdateOpDispenser extends BaseOpDispenser, MongoS } @Override - public MongoOp getOp(long value) { - MongoOp op = opF.apply(value); + public MongoOp getOp(long cycle) { + MongoOp op = opF.apply(cycle); return op; } diff --git a/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java index 4ae32b917..f7431011c 100644 --- a/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java +++ b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java @@ -21,12 +21,10 @@ import io.nosqlbench.adapter.neo4j.ops.Neo4JBaseOp; import io.nosqlbench.adapter.neo4j.types.Neo4JOpType; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; -import java.util.function.IntFunction; import java.util.function.LongFunction; @@ -38,7 +36,7 @@ public class Neo4JOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { TypeAndTarget typeAndTarget = op.getTypeAndTarget(Neo4JOpType.class, String.class); LongFunction spaceFunc = adapter.getSpaceFunc(op); return switch (typeAndTarget.enumId) { diff --git a/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java index 08d4be961..fdf7716c4 100644 --- a/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java +++ b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java @@ -42,7 +42,7 @@ public abstract class Neo4JBaseOpDispenser extends BaseOpDispenser asyncSessionFunc; public Neo4JBaseOpDispenser(Neo4JDriverAdapter adapter, ParsedOp op, LongFunction spaceFunc, String requiredTemplateKey) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); this.spaceFunc = spaceFunc; this.cypherFunc = op.getAsRequiredFunction(requiredTemplateKey); this.paramFunc = createParamFunc(op); diff --git a/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java index a389e78d3..20df9f8b7 100644 --- a/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java +++ b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java @@ -18,18 +18,15 @@ package io.nosqlbench.adapter.pulsar; import io.nosqlbench.adapter.pulsar.dispensers.*; import io.nosqlbench.adapter.pulsar.ops.PulsarOp; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.function.IntFunction; import java.util.function.LongFunction; public class PulsarOpMapper implements OpMapper { @@ -45,7 +42,7 @@ public class PulsarOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { int spaceName = op.getStaticConfigOr("space", 0); // PulsarSpace pulsarSpace = spaceCache.get(spaceName); PulsarSpace pulsarSpace = adapter.getSpaceFunc(op).apply(spaceName); diff --git a/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java index 9ac0739c0..b3ad0acb0 100644 --- a/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java +++ b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java @@ -68,7 +68,7 @@ public abstract class PulsarBaseOpDispenser extends BaseOpDispenser tgtNameFunc, final PulsarSpace pulsarSpace) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); parsedOp = op; this.tgtNameFunc = tgtNameFunc; diff --git a/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/QdrantOpMapper.java b/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/QdrantOpMapper.java index 696a1dc58..53fd517a0 100644 --- a/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/QdrantOpMapper.java +++ b/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/QdrantOpMapper.java @@ -21,13 +21,12 @@ import io.nosqlbench.adapter.qdrant.ops.QdrantBaseOp; import io.nosqlbench.adapter.qdrant.types.QdrantOpType; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; +import io.nosqlbench.nb.api.components.core.NBComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.function.IntFunction; import java.util.function.LongFunction; public class QdrantOpMapper implements OpMapper,QdrantSpace> { @@ -46,13 +45,14 @@ public class QdrantOpMapper implements OpMapper,QdrantSpace> { /** * Given an instance of a {@link ParsedOp} returns the appropriate {@link QdrantBaseOpDispenser} subclass * + * @param adapterC * @param op - * The {@link ParsedOp} to be evaluated + * The {@link ParsedOp} to be evaluated * @param spaceInitF * @return The correct {@link QdrantBaseOpDispenser} subclass based on the op type */ @Override - public OpDispenser> apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser> apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { TypeAndTarget typeAndTarget = op.getTypeAndTarget( QdrantOpType.class, String.class, diff --git a/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/opdispensers/QdrantBaseOpDispenser.java b/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/opdispensers/QdrantBaseOpDispenser.java index c7076f76f..a4fa501ad 100644 --- a/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/opdispensers/QdrantBaseOpDispenser.java +++ b/nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/opdispensers/QdrantBaseOpDispenser.java @@ -50,15 +50,12 @@ public abstract class QdrantBaseOpDispenser private final LongFunction paramF; protected QdrantBaseOpDispenser(QdrantDriverAdapter adapter, ParsedOp op, LongFunction targetF) { - super((DriverAdapter)adapter, op); + super((DriverAdapter)adapter, op, adapter.getSpaceFunc(op)); this.qdrantSpaceFunction = adapter.getSpaceFunc(op); this.clientFunction = (long l) -> this.qdrantSpaceFunction.apply(l).getClient(); this.paramF = getParamFunc(this.clientFunction,op,targetF); this.opF = createOpFunc(paramF, this.clientFunction, op, targetF); } - protected QdrantDriverAdapter getDriverAdapter() { - return (QdrantDriverAdapter) adapter; - } public abstract LongFunction getParamFunc( LongFunction clientF, @@ -74,8 +71,8 @@ public abstract class QdrantBaseOpDispenser ); @Override - public QdrantBaseOp getOp(long value) { - return opF.apply(value); + public QdrantBaseOp getOp(long cycle) { + return opF.apply(cycle); } /** diff --git a/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java index 88f6a8fc8..5a0d583a9 100644 --- a/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java +++ b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java @@ -19,18 +19,14 @@ package io.nosqlbench.adapter.s4j; import io.nosqlbench.adapter.s4j.dispensers.MessageConsumerOpDispenser; import io.nosqlbench.adapter.s4j.dispensers.MessageProducerOpDispenser; import io.nosqlbench.adapter.s4j.ops.S4JOp; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; -import io.nosqlbench.nb.api.config.standard.NBConfiguration; +import io.nosqlbench.nb.api.components.core.NBComponent; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.TypeAndTarget; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.function.IntFunction; import java.util.function.LongFunction; public class S4JOpMapper implements OpMapper { @@ -44,7 +40,7 @@ public class S4JOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { /* * If the user provides a body element, then they want to provide the JSON or diff --git a/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java index da64c8242..cdb5015a4 100644 --- a/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java +++ b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java @@ -22,7 +22,6 @@ import io.nosqlbench.adapter.s4j.S4JSpace; import io.nosqlbench.adapter.s4j.ops.S4JOp; import io.nosqlbench.adapter.s4j.util.*; import io.nosqlbench.adapters.api.activityimpl.BaseOpDispenser; -import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.adapters.api.templating.ParsedOp; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -63,7 +62,7 @@ public abstract class S4JBaseOpDispenser extends BaseOpDispenser destNameStrFunc) { - super(adapter, op); + super(adapter, op, adapter.getSpaceFunc(op)); this.parsedOp = op; diff --git a/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java index 66f77d8f0..e2081a0cf 100644 --- a/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java +++ b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java @@ -28,7 +28,7 @@ public class StdoutOpDispenser extends BaseOpDispenser { private final LongFunction outFunction; public StdoutOpDispenser(DriverAdapter adapter, ParsedOp cmd, LongFunction ctxfunc) { - super(adapter,cmd); + super(adapter,cmd, adapter.getSpaceFunc(cmd)); this.ctxfunc = ctxfunc; LongFunction objectFunction = cmd.getAsRequiredFunction("stmt", Object.class); LongFunction stringfunc = l -> objectFunction.apply(l).toString(); @@ -37,9 +37,9 @@ public class StdoutOpDispenser extends BaseOpDispenser { } @Override - public StdoutOp getOp(long value) { - StdoutSpace ctx = ctxfunc.apply(value); - String output = outFunction.apply(value); + public StdoutOp getOp(long cycle) { + StdoutSpace ctx = ctxfunc.apply(cycle); + String output = outFunction.apply(cycle); return new StdoutOp(ctx,output); } } diff --git a/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java index a41218555..4946d3bdc 100644 --- a/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java +++ b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java @@ -19,11 +19,9 @@ package io.nosqlbench.adapter.stdout; import io.nosqlbench.adapters.api.activityimpl.OpDispenser; import io.nosqlbench.adapters.api.activityimpl.OpMapper; import io.nosqlbench.adapters.api.activityimpl.uniform.DriverAdapter; -import io.nosqlbench.adapters.api.activityimpl.uniform.Space; -import io.nosqlbench.adapters.api.activityimpl.uniform.ConcurrentSpaceCache; import io.nosqlbench.adapters.api.templating.ParsedOp; +import io.nosqlbench.nb.api.components.core.NBComponent; -import java.util.function.IntFunction; import java.util.function.LongFunction; public class StdoutOpMapper implements OpMapper { @@ -35,7 +33,7 @@ public class StdoutOpMapper implements OpMapper { } @Override - public OpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { return new StdoutOpDispenser(adapter,op,adapter.getSpaceFunc(op)); } diff --git a/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java index 3e74578a9..9ab086daa 100644 --- a/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java +++ b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java @@ -27,7 +27,7 @@ public class TcpClientOpDispenser extends BaseOpDispenser outFunction; public TcpClientOpDispenser(TcpClientDriverAdapter adapter, ParsedOp cmd, LongFunction ctxfunc) { - super(adapter,cmd); + super(adapter,cmd, adapter.getSpaceFunc(cmd)); this.ctxFunction = ctxfunc; LongFunction objectFunction = cmd.getAsRequiredFunction("stmt", Object.class); LongFunction stringFunction = l -> objectFunction.apply(l).toString(); @@ -35,9 +35,9 @@ public class TcpClientOpDispenser extends BaseOpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { LongFunction spacefunc = op.getAsFunctionOr("space", "default"); LongFunction ctxfunc = adapter.getSpaceFunc(op); return new TcpClientOpDispenser(adapter,op,ctxfunc); diff --git a/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java index 79d5f5925..4b553ce8f 100644 --- a/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java +++ b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java @@ -27,7 +27,7 @@ public class TcpServerOpDispenser extends BaseOpDispenser outFunction; public TcpServerOpDispenser(TcpServerDriverAdapter adapter, ParsedOp cmd, LongFunction ctxfunc) { - super(adapter,cmd); + super(adapter,cmd, ctxfunc); this.ctxFunction = ctxfunc; LongFunction objectFunction = cmd.getAsRequiredFunction("stmt", Object.class); LongFunction stringFunction = l -> objectFunction.apply(l).toString(); @@ -35,9 +35,9 @@ public class TcpServerOpDispenser extends BaseOpDispenser apply(ParsedOp op, LongFunction spaceInitF) { + public OpDispenser apply(NBComponent adapterC, ParsedOp op, LongFunction spaceInitF) { LongFunction spacefunc = op.getAsFunctionOr("space", "default"); LongFunction ctxfunc = adapter.getSpaceFunc(op); return new TcpServerOpDispenser(adapter,op,ctxfunc);