From 2bb4b5584c584bc70143d4c5c1693b9ad553180b Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Tue, 8 Feb 2022 15:10:12 -0600 Subject: [PATCH] simplify overzealous auto-naming --- .../cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java | 7 ++++--- ...impleCqlStatement.java => Cqld4CqlSimpleStatement.java} | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) rename adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/{Cqld4CqlSimpleCqlStatement.java => Cqld4CqlSimpleStatement.java} (71%) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java index d08c038c4..f5a9d423c 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java @@ -4,7 +4,7 @@ import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.cql.SimpleStatement; import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; import io.nosqlbench.adapter.cqld4.Cqld4OpMetrics; -import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleCqlStatement; +import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlSimpleStatement; import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser; import io.nosqlbench.engine.api.templating.ParsedOp; @@ -26,9 +26,10 @@ public class Cqld4SimpleCqlStmtDispenser extends BaseOpDispenser { } @Override - public Cqld4CqlSimpleCqlStatement apply(long value) { + public Cqld4CqlSimpleStatement apply(long value) { + // TODO: allow for the pre-rendering of a statement with certain template fields, for RAW mode String stmtBody = cmd.get("stmt",value); SimpleStatement simpleStatement = SimpleStatement.newInstance(stmtBody); - return new Cqld4CqlSimpleCqlStatement(session,simpleStatement,maxpages,retryreplace,metrics); + return new Cqld4CqlSimpleStatement(session,simpleStatement,maxpages,retryreplace,metrics); } } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleCqlStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java similarity index 71% rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleCqlStatement.java rename to adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java index b92b90c10..c705c1600 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleCqlStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java @@ -4,10 +4,10 @@ import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.cql.SimpleStatement; import io.nosqlbench.adapter.cqld4.Cqld4OpMetrics; -public class Cqld4CqlSimpleCqlStatement extends Cqld4CqlOp { +public class Cqld4CqlSimpleStatement extends Cqld4CqlOp { private final SimpleStatement stmt; - public Cqld4CqlSimpleCqlStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace, Cqld4OpMetrics metrics) { + public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace, Cqld4OpMetrics metrics) { super(session, maxpages,retryreplace,metrics); this.stmt = stmt; }