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

improve graph op mappers and pre-processors

Browse Source
This commit is contained in:
Jonathan Shook 2022-02-15 23:21:17 -06:00
parent ec5128396f
commit 8fd8a6cb98
5 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
View File

@ -59,6 +59,26 @@ public class Cqld4DriverAdapter extends BaseDriverAdapter<Op, Cqld4Space> {
map.remove("type"); map.remove("type");
} }
} }
if (map.containsKey("type")) {
String type = map.get("type").toString();
if (type.equals("gremlin")&&map.containsKey("script")) {
map.put("gremlin",map.get("script").toString());
map.remove("script");
map.remove("type");
}
if (type.equals("gremlin")&&map.containsKey("stmt")) {
map.put("gremlin",map.get("stmt"));
map.remove("type");
map.remove("stmt");
}
if (type.equals("fluent")&&map.containsKey("fluent")) {
map.remove("type");
}
if (type.equals("fluent")&&map.containsKey("stmt")) {
map.put("fluent",map.get("stmt"));
map.remove("stmt");
}
}
return map; return map;
}); });

11
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java
View File

@ -16,7 +16,7 @@ public class Cqld4GremlinOpDispenser extends BaseOpDispenser<Cqld4ScriptGraphOp>
private final LongFunction<CqlSession> sessionFunc; private final LongFunction<CqlSession> sessionFunc;
private final LongFunction<Long> diagFunc; private final LongFunction<Long> diagFunc;
public Cqld4GremlinOpDispenser(LongFunction<CqlSession> sessionFunc, ParsedOp cmd) { public Cqld4GremlinOpDispenser(LongFunction<CqlSession> sessionFunc, LongFunction<String> targetFunction, ParsedOp cmd) {
super(cmd); super(cmd);
this.sessionFunc = sessionFunc; this.sessionFunc = sessionFunc;
this.diagFunc = cmd.getAsFunctionOr("diag", 0L); this.diagFunc = cmd.getAsFunctionOr("diag", 0L);
@ -31,15 +31,8 @@ public class Cqld4GremlinOpDispenser extends BaseOpDispenser<Cqld4ScriptGraphOp>
func = l -> finalFunc.apply(l).setGraphName(stringLongFunction.apply(l)); func = l -> finalFunc.apply(l).setGraphName(stringLongFunction.apply(l));
} }
// script
Optional<LongFunction<String>> scriptFunc = cmd.getAsOptionalFunction("script");
if (scriptFunc.isPresent()) {
LongFunction<ScriptGraphStatementBuilder> finalFunc = func;
func = l -> finalFunc.apply(l).setScript(scriptFunc.get().apply(l));
}
LongFunction<ScriptGraphStatementBuilder> finalFunc = func; LongFunction<ScriptGraphStatementBuilder> finalFunc = func;
this.stmtFunc = l -> finalFunc.apply(l).build(); this.stmtFunc = l -> finalFunc.apply(l).setScript(targetFunction.apply(l)).build();
} }

4
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
View File

@ -48,8 +48,8 @@ public class Cqld4CoreOpMapper implements OpMapper<Op> {
case raw -> new CqlD4RawStmtMapper(sessionFunc, target.targetFunction).apply(cmd); case raw -> new CqlD4RawStmtMapper(sessionFunc, target.targetFunction).apply(cmd);
case simple -> new CqlD4CqlSimpleStmtMapper(sessionFunc, target.targetFunction).apply(cmd); case simple -> new CqlD4CqlSimpleStmtMapper(sessionFunc, target.targetFunction).apply(cmd);
case prepared -> new CqlD4PreparedStmtMapper(sessionFunc, target).apply(cmd); case prepared -> new CqlD4PreparedStmtMapper(sessionFunc, target).apply(cmd);
case gremlin -> new Cqld4GremlinOpMapper(sessionFunc).apply(cmd); case gremlin -> new Cqld4GremlinOpMapper(sessionFunc, target.targetFunction).apply(cmd);
case fluent -> new Cqld4FluentGraphOpMapper(sessionFunc).apply(cmd); case fluent -> new Cqld4FluentGraphOpMapper(sessionFunc, target).apply(cmd);
}; };
} }

7
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java
View File

@ -10,6 +10,7 @@ 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;
import io.nosqlbench.engine.api.templating.ParsedOp; import io.nosqlbench.engine.api.templating.ParsedOp;
import io.nosqlbench.engine.api.templating.TypeAndTarget;
import io.nosqlbench.virtdata.core.bindings.Bindings; import io.nosqlbench.virtdata.core.bindings.Bindings;
import io.nosqlbench.virtdata.core.bindings.BindingsTemplate; import io.nosqlbench.virtdata.core.bindings.BindingsTemplate;
import io.nosqlbench.virtdata.core.templates.ParsedTemplate; import io.nosqlbench.virtdata.core.templates.ParsedTemplate;
@ -30,17 +31,19 @@ public class Cqld4FluentGraphOpMapper implements OpMapper<Op> {
private final static Logger logger = LogManager.getLogger(Cqld4FluentGraphOpMapper.class); private final static Logger logger = LogManager.getLogger(Cqld4FluentGraphOpMapper.class);
private final LongFunction<CqlSession> sessionFunc; private final LongFunction<CqlSession> sessionFunc;
private final TypeAndTarget<CqlD4OpType, String> target;
private GraphTraversalSource gtsPlaceHolder; private GraphTraversalSource gtsPlaceHolder;
public Cqld4FluentGraphOpMapper(LongFunction<CqlSession> sessionFunc) { public Cqld4FluentGraphOpMapper(LongFunction<CqlSession> sessionFunc, TypeAndTarget<CqlD4OpType, String> target) {
this.sessionFunc = sessionFunc; this.sessionFunc = sessionFunc;
this.target = target;
} }
@Override @Override
public OpDispenser<? extends Op> apply(ParsedOp cmd) { public OpDispenser<? extends Op> apply(ParsedOp cmd) {
GraphTraversalSource g = DseGraph.g; GraphTraversalSource g = DseGraph.g;
ParsedTemplate fluent = cmd.getAsTemplate("fluent").orElseThrow(); ParsedTemplate fluent = cmd.getAsTemplate(target.field).orElseThrow();
String scriptBodyWithRawVarRefs = fluent.getPositionalStatement(); String scriptBodyWithRawVarRefs = fluent.getPositionalStatement();
CompilerConfiguration compilerConfiguration = new CompilerConfiguration(); CompilerConfiguration compilerConfiguration = new CompilerConfiguration();

6
adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java
View File

@ -11,12 +11,14 @@ import java.util.function.LongFunction;
public class Cqld4GremlinOpMapper implements OpMapper<Cqld4ScriptGraphOp> { public class Cqld4GremlinOpMapper implements OpMapper<Cqld4ScriptGraphOp> {
private final LongFunction<CqlSession> sessionFunc; private final LongFunction<CqlSession> sessionFunc;
private final LongFunction<String> targetFunction;
public Cqld4GremlinOpMapper(LongFunction<CqlSession> session) { public Cqld4GremlinOpMapper(LongFunction<CqlSession> session, LongFunction<String> targetFunction) {
this.sessionFunc = session; this.sessionFunc = session;
this.targetFunction = targetFunction;
} }
public OpDispenser<Cqld4ScriptGraphOp> apply(ParsedOp cmd) { public OpDispenser<Cqld4ScriptGraphOp> apply(ParsedOp cmd) {
return new Cqld4GremlinOpDispenser(sessionFunc, cmd); return new Cqld4GremlinOpDispenser(sessionFunc, targetFunction, cmd);
} }
} }