IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

minor naming updates

Browse Source
This commit is contained in:
Jonathan Shook 2022-09-21 12:58:24 -05:00
parent 0193481183
commit 1894716bd1
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoCommandOpDispenser.java
View File

@ -17,7 +17,7 @@
package io.nosqlbench.adapter.mongodb.core; package io.nosqlbench.adapter.mongodb.core;
import com.mongodb.ReadPreference; import com.mongodb.ReadPreference;
import io.nosqlbench.adapter.mongodb.ops.MongoOp; import io.nosqlbench.adapter.mongodb.ops.MongoDirectCommandOp;
import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser; import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser;
import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter; import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op; import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
@ -29,8 +29,8 @@ import java.util.Map;
import java.util.function.LongFunction; import java.util.function.LongFunction;
public class MongoCommandOpDispenser extends BaseOpDispenser<Op,MongoSpace> { public class MongoCommandOpDispenser extends BaseOpDispenser<Op,MongoSpace> {
private final LongFunction<MongoOp> opFunc; private final LongFunction<MongoDirectCommandOp> opFunc;
private final LongFunction<MongoOp> mongoOpF; private final LongFunction<MongoDirectCommandOp> mongoOpF;
public MongoCommandOpDispenser(DriverAdapter adapter, LongFunction<MongoSpace> ctxFunc, ParsedOp op) { public MongoCommandOpDispenser(DriverAdapter adapter, LongFunction<MongoSpace> ctxFunc, ParsedOp op) {
super(adapter,op); super(adapter,op);
@ -38,7 +38,7 @@ public class MongoCommandOpDispenser extends BaseOpDispenser<Op,MongoSpace> {
this.mongoOpF = createOpFunc(ctxFunc,op); this.mongoOpF = createOpFunc(ctxFunc,op);
} }
private LongFunction<MongoOp> createOpFunc(LongFunction<MongoSpace> ctxFunc, ParsedOp op) { private LongFunction<MongoDirectCommandOp> createOpFunc(LongFunction<MongoSpace> ctxFunc, ParsedOp op) {
LongFunction<String> rpstring = op.getAsOptionalFunction("readPreference") LongFunction<String> rpstring = op.getAsOptionalFunction("readPreference")
.orElseGet(() -> op.getAsOptionalFunction("read-preference") .orElseGet(() -> op.getAsOptionalFunction("read-preference")
@ -59,7 +59,7 @@ public class MongoCommandOpDispenser extends BaseOpDispenser<Op,MongoSpace> {
LongFunction<String> databaseNamerF = op.getAsRequiredFunction("database", String.class); LongFunction<String> databaseNamerF = op.getAsRequiredFunction("database", String.class);
return l-> new MongoOp( return l-> new MongoDirectCommandOp(
ctxFunc.apply(l).getClient(), ctxFunc.apply(l).getClient(),
databaseNamerF.apply(l), databaseNamerF.apply(l),
bsonFunc.apply(l) bsonFunc.apply(l)

8
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDBOpTypes.java
View File

@ -23,10 +23,10 @@ public enum MongoDBOpTypes {
*/ */
command, command,
/** // /**
* @see <a href="https://www.mongodb.com/docs/manual/reference/command/update/#mongodb-dbcommand-dbcmd.update">update</a> // * @see <a href="https://www.mongodb.com/docs/manual/reference/command/update/#mongodb-dbcommand-dbcmd.update">update</a>
*/ // */
update, // update,
// /** // /**
// * @see <a href="https://www.mongodb.com/docs/manual/reference/command/insert/">insert</a> // * @see <a href="https://www.mongodb.com/docs/manual/reference/command/insert/">insert</a>

6
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
View File

@ -16,8 +16,6 @@
package io.nosqlbench.adapter.mongodb.core; package io.nosqlbench.adapter.mongodb.core;
import io.nosqlbench.adapter.mongodb.dispensers.MongoDbUpdateOpDispenser;
import io.nosqlbench.api.errors.OpConfigError;
import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityimpl.OpDispenser;
import io.nosqlbench.engine.api.activityimpl.OpMapper; import io.nosqlbench.engine.api.activityimpl.OpMapper;
import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op; import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
@ -53,13 +51,13 @@ public class MongoOpMapper implements OpMapper<Op> {
if (target.isPresent()) { if (target.isPresent()) {
TypeAndTarget<MongoDBOpTypes, String> targetdata = target.get(); TypeAndTarget<MongoDBOpTypes, String> targetdata = target.get();
return switch (targetdata.enumId) { return switch (targetdata.enumId) {
case update -> new MongoDbUpdateOpDispenser(adapter, op, targetdata.targetFunction); case command -> new MongoCommandOpDispenser(adapter, spaceF, op);
// case update -> new MongoDbUpdateOpDispenser(adapter, op, targetdata.targetFunction);
// case insert -> new MongoDbInsertOpDispenser(adapter, op, opTypeAndTarget.targetFunction); // case insert -> new MongoDbInsertOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case delete -> new MongoDbDeleteOpDispenser(adapter, op, opTypeAndTarget.targetFunction); // case delete -> new MongoDbDeleteOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case find -> new mongoDbFindOpDispenser(adapter, op, opTypeAndTarget.targetFunction); // case find -> new mongoDbFindOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case findAndModify -> new MongoDbFindAndModifyOpDispenser(adapter, op, opTypeAndTarget.targetFunction); // case findAndModify -> new MongoDbFindAndModifyOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case getMore -> new MongoDbGetMoreOpDispenser(adapter, op, opTypeAndTarget.targetFunction); // case getMore -> new MongoDbGetMoreOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
case command -> throw new OpConfigError("invalid state, logic error in op mapper");
}; };
} }
// For everything else use the command API // For everything else use the command API

4
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoOp.java → adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoDirectCommandOp.java
View File

@ -21,7 +21,7 @@ import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.CycleOp;
import org.bson.Document; import org.bson.Document;
import org.bson.conversions.Bson; import org.bson.conversions.Bson;
public class MongoOp implements CycleOp<Document> { public class MongoDirectCommandOp implements CycleOp<Document> {
private final MongoClient client; private final MongoClient client;
private final Bson rqBson; private final Bson rqBson;
@ -29,7 +29,7 @@ public class MongoOp implements CycleOp<Document> {
private int resultSize; private int resultSize;
// https://docs.mongodb.com/manual/reference/method/db.runCommand/#command-response // https://docs.mongodb.com/manual/reference/method/db.runCommand/#command-response
public MongoOp(MongoClient client, String database, Bson rqBson) { public MongoDirectCommandOp(MongoClient client, String database, Bson rqBson) {
this.client = client; this.client = client;
this.database = database; this.database = database;
this.rqBson = rqBson; this.rqBson = rqBson;

4
adapter-mongodb/src/main/resources/mongodb.md
View File

@ -2,6 +2,10 @@
This is a driver for MongoDB. It supports the `db.runCommand` API described in [here](https://docs.mongodb.com/manual/reference/command/). This is a driver for MongoDB. It supports the `db.runCommand` API described in [here](https://docs.mongodb.com/manual/reference/command/).
Consult
[MongoDB commands](https://www.mongodb.com/docs/manual/reference/command/)
for details on command structure.
### Example activity definitions ### Example activity definitions
Run a mongodb activity with definitions from activities/mongodb-basic.yaml Run a mongodb activity with definitions from activities/mongodb-basic.yaml