From df9ee20f0a6ec1603f1d689c8b87b68eb576497d Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 15 Feb 2022 21:24:03 -0600 Subject: [PATCH] minor typos and readability improvements --- .../adapter/cqld4/CqlDriverAdapterStub.java | 2 +- .../adapter/cqld4/Cqld3DriverAdapterStub.java | 2 +- .../adapter/dynamodb/DynamoDBOpMapper.java | 6 +++--- .../core/lifecycle/PolyglotScenarioController.java | 12 ++++++------ .../api/config/fieldreaders/DynamicFieldReader.java | 2 +- pom.xml | 6 ------ .../engine/api/templating/ParsedTemplateMap.java | 8 ++++---- .../engine/api/templating/binders/ArrayBinder.java | 2 +- .../engine/api/templating/binders/ListBinder.java | 2 +- .../api/templating/binders/OrderedMapBinder.java | 2 +- 10 files changed, 19 insertions(+), 25 deletions(-) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java index b42a2fa4f..ccef5fe59 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java @@ -17,7 +17,7 @@ public class CqlDriverAdapterStub extends Cqld4DriverAdapter { @Override public OpMapper getOpMapper() { - logger.warn("This version of NoSQLBench uses the DataStax Java Driver version 4 for all CQL workloads. In this preview version, advanced testing features present in the previous cql and cqld3 drivers are being back-ported. If you need those features, please use only the release artifacts. To suppress this message, use driver=cqld4. This warning will be removed in a future version when all features are completely back-ported."); + logger.warn("This version of NoSQLBench uses the DataStax Java Driver version 4 for all CQL workloads. In this preview version, advanced testing features present in the previous cql and cqld3 drivers are being back-ported. If you need those features before the porting is complete, please use only the release artifacts from the 4.15.x branch. To suppress this message, use driver=cqld4. This warning will be removed in a future version when all features are completely back-ported."); return super.getOpMapper(); } } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld3DriverAdapterStub.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld3DriverAdapterStub.java index e50985ed7..0537c120e 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld3DriverAdapterStub.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld3DriverAdapterStub.java @@ -17,7 +17,7 @@ public class Cqld3DriverAdapterStub extends Cqld4DriverAdapter { @Override public OpMapper getOpMapper() { - logger.warn("This version of NoSQLBench uses the DataStax Java Driver version 4 for all CQL workloads. In this preview version, advanced testing features present in the previous cql and cqld3 drivers are being back-ported. If you need those features, please use only the release artifacts. To suppress this message, use driver=cqld4. This warning will be removed in a future version when all features are completely back-ported."); + logger.warn("This version of NoSQLBench uses the DataStax Java Driver version 4 for all CQL workloads. In this preview version, advanced testing features present in the previous cql and cqld3 drivers are being back-ported. If you need those features before the porting is complete, please use only the release artifacts from the 4.15.x branch. To suppress this message, use driver=cqld4. This warning will be removed in a future version when all features are completely back-ported."); return super.getOpMapper(); } } diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java index eaad65145..e6793bd12 100644 --- a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java +++ b/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java @@ -9,7 +9,7 @@ import io.nosqlbench.adapter.dynamodb.optypes.DynamoDBOp; import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityimpl.OpMapper; import io.nosqlbench.engine.api.activityimpl.uniform.DriverSpaceCache; -import io.nosqlbench.engine.api.templating.NamedTarget; +import io.nosqlbench.engine.api.templating.TypeAndTarget; import io.nosqlbench.engine.api.templating.ParsedOp; import io.nosqlbench.nb.api.config.standard.NBConfiguration; import io.nosqlbench.nb.api.errors.OpConfigError; @@ -38,7 +38,7 @@ public class DynamoDBOpMapper implements OpMapper { throw new RuntimeException("This mode is reserved for later. Do not use the 'body' op field."); // return new RawDynamoDBOpDispenser(cmd); } else { - NamedTarget cmdType = cmd.getRequiredTypeFromEnum(DynamoDBCmdType.class); + TypeAndTarget cmdType = cmd.getTargetEnum(DynamoDBCmdType.class,String.class); switch (cmdType.enumId) { case CreateTable: return new DDBCreateTableOpDispenser(ddb, cmd, cmdType.targetFunction); @@ -50,7 +50,7 @@ public class DynamoDBOpMapper implements OpMapper { return new DDBQueryOpDispenser(ddb, cmd, cmdType.targetFunction); default: - throw new OpConfigError("No implementation for " + cmdType.toString()); + throw new OpConfigError("No implementation for " + cmdType); } } diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java index ce6a6e990..f1c51d84c 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/PolyglotScenarioController.java @@ -53,7 +53,7 @@ public class PolyglotScenarioController { } else if (o instanceof String) { controller.run(timeout, o.toString()); } else { - throw new RuntimeException("Uncrecognized type: " + o.getClass().getCanonicalName()); + throw new RuntimeException("Unrecognized type: " + o.getClass().getCanonicalName()); } } @@ -74,10 +74,10 @@ public class PolyglotScenarioController { if (o instanceof ActivityDef) { controller.run(timeout, (ActivityDef) o); } else { - throw new RuntimeException("unrecognized polyglot host object type for run: " + spec.toString()); + throw new RuntimeException("unrecognized polyglot host object type for run: " + spec); } } else { - throw new RuntimeException("unrecognized polyglot base type for run: " + spec.toString()); + throw new RuntimeException("unrecognized polyglot base type for run: " + spec); } } @@ -102,7 +102,7 @@ public class PolyglotScenarioController { } else if (spec.hasMembers()) { controller.start(spec.as(Map.class)); } else { - throw new RuntimeException("unknown base type for graal polyglot: " + spec.toString()); + throw new RuntimeException("unknown base type for graal polyglot: " + spec); } } @@ -126,7 +126,7 @@ public class PolyglotScenarioController { } else if (spec.hasMembers()) { controller.stop(spec.as(Map.class)); } else { - throw new RuntimeException("unknown base type for graal polyglot: " + spec.toString()); + throw new RuntimeException("unknown base type for graal polyglot: " + spec); } } @@ -193,7 +193,7 @@ public class PolyglotScenarioController { controller.waitMillis(spec.asLong()); } else { throw new InvalidParameterException( - "unable to convert polyglot type " + spec.toString() + " to a long for waitMillis"); + "unable to convert polyglot type " + spec + " to a long for waitMillis"); } } diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java b/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java index 043e2d9bc..aa7ac7958 100644 --- a/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java +++ b/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java @@ -12,7 +12,7 @@ import java.util.function.LongFunction; * and {@link EnvironmentReader} */ public interface DynamicFieldReader { - boolean isDefinedDynamic(String field); + boolean isDynamic(String field); T get(String field, long input); diff --git a/pom.xml b/pom.xml index 984f65898..d17898a37 100644 --- a/pom.xml +++ b/pom.xml @@ -43,12 +43,6 @@ driver-stdout driver-tcp driver-http - - - - - - driver-kafka driver-mongodb driver-jmx diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java index b60c0cc7a..9bc527d23 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java +++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java @@ -159,7 +159,7 @@ public class ParsedTemplateMap implements LongFunction>, StaticFi } @Override - public boolean isDefinedDynamic(String field) { + public boolean isDynamic(String field) { return dynamics.containsKey(field); } @@ -430,7 +430,7 @@ public class ParsedTemplateMap implements LongFunction>, StaticFi if (isStatic(name)) { V value = getStaticValue(name); return l -> value; - } else if (isDefinedDynamic(name)) { + } else if (isDynamic(name)) { return l -> get(name, l); } else { return l -> defaultValue; @@ -522,9 +522,9 @@ public class ParsedTemplateMap implements LongFunction>, StaticFi if (specmap.containsKey(fieldname)) { Object fval = specmap.get(fieldname); if (fval instanceof CharSequence) { - return Optional.of(new ParsedTemplate(fval.toString(),this.bindings)); + return Optional.of(new ParsedTemplate(fval.toString(), this.bindings)); } else { - throw new RuntimeException("Can not make a parsed text template from op template field '" + fieldname +"' of type '" + fval.getClass().getSimpleName() + "'"); + throw new RuntimeException("Can not make a parsed text template from op template field '" + fieldname + "' of type '" + fval.getClass().getSimpleName() + "'"); } } return Optional.empty(); diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java index 7df77f9d4..afa010990 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java +++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java @@ -27,7 +27,7 @@ public class ArrayBinder implements LongFunction { String field = fields[i]; if (cmd.isStatic(field)) { protoary[i] = cmd.getStaticValue(field); - } else if (cmd.isDefinedDynamic(field)) { + } else if (cmd.isDynamic(field)) { mapperary[i] = cmd.getMapper(field); indexes[nextIndex++] = i; } else { diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java index 41b495c48..9ce1d306b 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java +++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java @@ -25,7 +25,7 @@ public class ListBinder implements LongFunction> { if (cmd.isStatic(field)) { protolist.add(cmd.getStaticValue(field)); mapperlist.add(null); - } else if (cmd.isDefinedDynamic(field)) { + } else if (cmd.isDynamic(field)) { protolist.add(null); mapperlist.add(cmd.getMapper(field)); indexes[lastIndex++]=i; diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java index 4a84c2da5..241026933 100644 --- a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java +++ b/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java @@ -17,7 +17,7 @@ public class OrderedMapBinder implements LongFunction> { for (String field : fields) { if (cmd.isStatic(field)) { protomap.put(field,cmd.getStaticValue(field)); - } else if (cmd.isDefinedDynamic(field)) { + } else if (cmd.isDynamic(field)) { bindermap.put(field,cmd.getMapper(field)); protomap.put(field,null); } else {