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

MongoDB adapter improvements

Browse Source
This commit is contained in:
Jonathan Shook
2022-09-09 11:08:50 -05:00
parent 5b830cfa26
commit dc10d9f501
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpDispenser.java → adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoCommandOpDispenser.java
View File

@@ -28,11 +28,11 @@ import org.bson.conversions.Bson;
import java.util.Map;
import java.util.function.LongFunction;
public class MongoOpDispenser extends BaseOpDispenser<Op,MongoSpace> {
public class MongoCommandOpDispenser extends BaseOpDispenser<Op,MongoSpace> {
private final LongFunction<MongoOp> opFunc;
private final LongFunction<MongoOp> mongoOpF;
public MongoOpDispenser(DriverAdapter adapter, LongFunction<MongoSpace> ctxFunc, ParsedOp op) {
public MongoCommandOpDispenser(DriverAdapter adapter, LongFunction<MongoSpace> ctxFunc, ParsedOp op) {
super(adapter,op);
opFunc = createOpFunc(ctxFunc, op);
this.mongoOpF = createOpFunc(ctxFunc,op);

36
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbOpMapper.java → adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
View File

@@ -17,6 +17,7 @@
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.OpMapper;
import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
@@ -28,12 +29,12 @@ import org.apache.logging.log4j.Logger;
import java.util.Optional;
import java.util.function.LongFunction;
public class MongodbOpMapper implements OpMapper<Op> {
private final static Logger logger = LogManager.getLogger(MongodbOpMapper.class);
public class MongoOpMapper implements OpMapper<Op> {
private final static Logger logger = LogManager.getLogger(MongoOpMapper.class);
private final MongodbDriverAdapter adapter;
public MongodbOpMapper(MongodbDriverAdapter adapter) {
public MongoOpMapper(MongodbDriverAdapter adapter) {
this.adapter = adapter;
}
@@ -41,25 +42,34 @@ public class MongodbOpMapper implements OpMapper<Op> {
public OpDispenser<? extends Op> apply(ParsedOp op) {
LongFunction<String> ctxNamer = op.getAsFunctionOr("space", "default");
LongFunction<MongoSpace> spaceF = l -> adapter.getSpaceCache().get(ctxNamer.apply(l));
TypeAndTarget<MongoDBOpTypes, String> opTypeAndTarget =
op.getOptionalTypeAndTargetEnum(MongoDBOpTypes.class, String.class)
.orElseThrow(() -> new RuntimeException("unable to determine MongoDB op type from '" + op.toString()));
Optional<LongFunction<String>> oDatabaseF = op.getAsOptionalFunction("database");
if (oDatabaseF.isEmpty()) {
logger.warn(() -> "");
logger.warn(() -> "op field 'database' was not defined");
}
return switch (opTypeAndTarget.enumId) {
case command -> null;
case update -> new MongoDbUpdateOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
Optional<TypeAndTarget<MongoDBOpTypes, String>> target = op.getOptionalTypeAndTargetEnum(MongoDBOpTypes.class, String.class);
// For any of the named operations which are called out directly AND supported via the fluent API,
// use specialized dispensers
if (target.isPresent()) {
TypeAndTarget<MongoDBOpTypes, String> targetdata = target.get();
return switch (targetdata.enumId) {
case update -> new MongoDbUpdateOpDispenser(adapter, op, targetdata.targetFunction);
// case insert -> new MongoDbInsertOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case delete -> new MongoDbDeleteOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case find -> new mongoDbFindOpDispenser(adapter, op, opTypeAndTarget.targetFunction);
// case findAndModify -> new MongoDbFindAndModifyOpDispenser(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
else {
return new MongoCommandOpDispenser(adapter, spaceF, op);
}
}
}

5
adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
View File

@@ -21,13 +21,10 @@ import io.nosqlbench.api.config.standard.NBConfiguration;
import io.nosqlbench.engine.api.activityimpl.OpMapper;
import io.nosqlbench.engine.api.activityimpl.uniform.BaseDriverAdapter;
import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
import io.nosqlbench.engine.api.activityimpl.uniform.DriverSpaceCache;
import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
import io.nosqlbench.engine.api.templating.ParsedOp;
import io.nosqlbench.nb.annotations.Service;
import java.util.function.Function;
import java.util.function.LongFunction;
/**
* Special thanks to Justin Chu who authored the original NoSQLBench MongoDB ActivityType.
@@ -37,7 +34,7 @@ public class MongodbDriverAdapter extends BaseDriverAdapter<Op, MongoSpace> {
@Override
public OpMapper<Op> getOpMapper() {
return new MongodbOpMapper(this);
return new MongoOpMapper(this);
}
@Override