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

make TypeAndTarget concept more obvious

Browse Source
This commit is contained in:
Jonathan Shook
2022-05-24 13:39:45 -05:00
parent 0164c49f97
commit 102cc3f559
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class Cqld4CoreOpMapper implements OpMapper<Op> {
CqlD4OpType opType = CqlD4OpType.prepared; CqlD4OpType opType = CqlD4OpType.prepared;
TypeAndTarget<CqlD4OpType, String> target = cmd.getTargetEnum(CqlD4OpType.class, String.class, "type", "stmt"); TypeAndTarget<CqlD4OpType, String> target = cmd.getTypeAndTarget(CqlD4OpType.class, String.class, "type", "stmt");
return switch (target.enumId) { return switch (target.enumId) {
case raw -> new CqlD4RawStmtMapper(sessionFunc, target.targetFunction).apply(cmd); case raw -> new CqlD4RawStmtMapper(sessionFunc, target.targetFunction).apply(cmd);

2
adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
View File

@@ -50,7 +50,7 @@ public class DynamoDBOpMapper implements OpMapper<DynamoDBOp> {
throw new RuntimeException("This mode is reserved for later. Do not use the 'body' op field."); throw new RuntimeException("This mode is reserved for later. Do not use the 'body' op field.");
// return new RawDynamoDBOpDispenser(cmd); // return new RawDynamoDBOpDispenser(cmd);
} else { } else {
TypeAndTarget<DynamoDBCmdType,String> cmdType = cmd.getTargetEnum(DynamoDBCmdType.class,String.class); TypeAndTarget<DynamoDBCmdType,String> cmdType = cmd.getTypeAndTarget(DynamoDBCmdType.class,String.class);
return switch (cmdType.enumId) { return switch (cmdType.enumId) {
case CreateTable -> new DDBCreateTableOpDispenser(ddb, cmd, cmdType.targetFunction); case CreateTable -> new DDBCreateTableOpDispenser(ddb, cmd, cmdType.targetFunction);
case DeleteTable -> new DDBDeleteTableOpDispenser(ddb, cmd, cmdType.targetFunction); case DeleteTable -> new DDBDeleteTableOpDispenser(ddb, cmd, cmdType.targetFunction);

10
adapters-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedOp.java
View File

@@ -440,18 +440,18 @@ public class ParsedOp implements LongFunction<Map<String, ?>>, StaticFieldReader
* @return Optionally, an enum value which matches, or {@link Optional#empty()} * @return Optionally, an enum value which matches, or {@link Optional#empty()}
* @throws OpConfigError if more than one field matches * @throws OpConfigError if more than one field matches
*/ */
public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getTypeFromEnum(Class<E> enumclass, Class<V> valueClass) { public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getTypeAndTargetFromEnum(Class<E> enumclass, Class<V> valueClass) {
return tmap.getOptionalTargetEnum(enumclass,valueClass); return tmap.getOptionalTargetEnum(enumclass,valueClass);
} }
public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTargetEnum( public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTypeAndTargetEnum(
Class<E> enumclass, Class<E> enumclass,
Class<V> valueClass Class<V> valueClass
){ ){
return tmap.getOptionalTargetEnum(enumclass,valueClass); return tmap.getOptionalTargetEnum(enumclass,valueClass);
} }
public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTargetEnum( public <E extends Enum<E>,V> Optional<TypeAndTarget<E,V>> getOptionalTypeAndTargetEnum(
Class<E> enumclass, Class<E> enumclass,
Class<V> valueClass, Class<V> valueClass,
String alternateTypeField, String alternateTypeField,
@@ -460,11 +460,11 @@ public class ParsedOp implements LongFunction<Map<String, ?>>, StaticFieldReader
return tmap.getOptionalTargetEnum(enumclass, valueClass, alternateTypeField, alternateValueField); return tmap.getOptionalTargetEnum(enumclass, valueClass, alternateTypeField, alternateValueField);
} }
public <E extends Enum<E>,V> TypeAndTarget<E,V> getTargetEnum(Class<E> enumclass, Class<V> valueClass) { public <E extends Enum<E>,V> TypeAndTarget<E,V> getTypeAndTarget(Class<E> enumclass, Class<V> valueClass) {
return tmap.getTargetEnum(enumclass, valueClass); return tmap.getTargetEnum(enumclass, valueClass);
} }
public <E extends Enum<E>,V> TypeAndTarget<E,V> getTargetEnum(Class<E> enumclass, Class<V> valueclass, String tname, String vname) { public <E extends Enum<E>,V> TypeAndTarget<E,V> getTypeAndTarget(Class<E> enumclass, Class<V> valueclass, String tname, String vname) {
return tmap.getTargetEnum(enumclass, valueclass,tname,vname); return tmap.getTargetEnum(enumclass, valueclass,tname,vname);
} }