From 3677a60ec846e8a4d43726777d84f7a11764dc1f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 13:36:24 -0600 Subject: [PATCH 1/3] nosqlbench-830 limit spin-looping with cqld4 retryreplace option. --- .../cqld4/Cqld4CqlReboundStatement.java | 4 +- .../ExceededRetryReplaceException.java | 45 +++++++++++++++++++ .../opdispensers/Cqld4BaseOpDispenser.java | 7 +++ .../Cqld4PreparedStmtDispenser.java | 1 + .../opdispensers/Cqld4RawStmtDispenser.java | 3 +- .../Cqld4SimpleCqlStmtDispenser.java | 3 +- .../cqld4/optypes/Cqld4CqlBatchStatement.java | 4 +- .../adapter/cqld4/optypes/Cqld4CqlOp.java | 21 ++++++++- .../optypes/Cqld4CqlPreparedStatement.java | 4 +- .../optypes/Cqld4CqlSimpleStatement.java | 4 +- adapter-cqld4/src/main/resources/cqld4.md | 5 +++ 11 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java index 0ac61009c..e2fb9e1d9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java @@ -24,8 +24,8 @@ import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; public class Cqld4CqlReboundStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlReboundStatement(CqlSession session, int maxpages, boolean retryreplace, BoundStatement rebound, RSProcessors processors) { - super(session,maxpages,retryreplace,processors); + public Cqld4CqlReboundStatement(CqlSession session, int maxpages, boolean retryreplace, int maxlwtretries, int lwtRetryCount, BoundStatement rebound, RSProcessors processors) { + super(session,maxpages,retryreplace,maxlwtretries,lwtRetryCount, processors); this.stmt = rebound; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java new file mode 100644 index 000000000..3d7cb3b4b --- /dev/null +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2022 nosqlbench + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.nosqlbench.adapter.cqld4.exceptions; + + +import com.datastax.oss.driver.api.core.cql.ResultSet; + +/** + * This is a synthetic error generated by the cql driver in NoSQLBench when + * the retryreplace option is used but the number of LWT round-trips from the driver + * is excessive. The number of LWT round trips allowed is controlled by the + * maxlwtretries op field. + */ +public class ExceededRetryReplaceException extends CqlGenericCycleException { + + private final ResultSet resultSet; + private final String queryString; + private final int retries; + + public ExceededRetryReplaceException(ResultSet resultSet, String queryString, int retries) { + super("After " + retries + " retires using the retryreplace option, Operation was not applied:" + queryString); + this.retries = retries; + this.resultSet = resultSet; + this.queryString = queryString; + } + + public ResultSet getResultSet() { + return resultSet; + } + public String getQueryString() { return queryString; } +} diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java index 34200479e..540b34dc1 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java @@ -45,12 +45,14 @@ public abstract class Cqld4BaseOpDispenser extends BaseOpDispenser sessionFunc; private final boolean isRetryReplace; + private final int maxLwtRetries; public Cqld4BaseOpDispenser(DriverAdapter adapter, LongFunction sessionFunc, ParsedOp op) { super(adapter, op); this.sessionFunc = sessionFunc; this.maxpages = op.getStaticConfigOr("maxpages", 1); this.isRetryReplace = op.getStaticConfigOr("retryreplace", false); + this.maxLwtRetries = op.getStaticConfigOr("maxlwtretries", 1); } public int getMaxPages() { @@ -61,6 +63,11 @@ public abstract class Cqld4BaseOpDispenser extends BaseOpDispenser getSessionFunc() { return sessionFunc; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java index 497b67b99..83503c9c8 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java @@ -89,6 +89,7 @@ public class Cqld4PreparedStmtDispenser extends Cqld4BaseOpDispenser { boundStatement, getMaxPages(), isRetryReplace(), + getMaxLwtRetries(), processors ); } catch (Exception exception) { diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java index fe986415c..16b999e60 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java @@ -49,7 +49,8 @@ public class Cqld4RawStmtDispenser extends Cqld4BaseOpDispenser { getSessionFunc().apply(value), (SimpleStatement) stmtFunc.apply(value), getMaxPages(), - isRetryReplace() + isRetryReplace(), + getMaxLwtRetries() ); } 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 a3e85cac5..f58ce6dc3 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 @@ -46,7 +46,8 @@ public class Cqld4SimpleCqlStmtDispenser extends Cqld4BaseOpDispenser { getSessionFunc().apply(value), (SimpleStatement) stmtFunc.apply(value), getMaxPages(), - isRetryReplace() + isRetryReplace(), + getMaxLwtRetries() ); } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java index bf8a64c3b..6828a70ec 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlBatchStatement extends Cqld4CqlOp { private final BatchStatement stmt; - public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxpages, boolean retryreplace) { - super(session,maxpages,retryreplace,new RSProcessors()); + public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxpages, int maxlwtretries, boolean retryreplace) { + super(session,maxpages,retryreplace,maxlwtretries,new RSProcessors()); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java index e72c835c3..ec9a147b6 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java @@ -23,6 +23,7 @@ import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.api.core.cql.Statement; import io.nosqlbench.adapter.cqld4.*; import io.nosqlbench.adapter.cqld4.exceptions.ChangeUnappliedCycleException; +import io.nosqlbench.adapter.cqld4.exceptions.ExceededRetryReplaceException; import io.nosqlbench.adapter.cqld4.exceptions.UndefinedResultSetException; import io.nosqlbench.adapter.cqld4.exceptions.UnexpectedPagingException; import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.*; @@ -46,15 +47,27 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private final CqlSession session; private final int maxpages; private final boolean retryreplace; + private final int maxLwtRetries; + private int retryReplaceCount =0; private ResultSet rs; private Cqld4CqlOp nextOp; private final RSProcessors processors; - public Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, RSProcessors processors) { + public Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { this.session = session; this.maxpages = maxpages; this.retryreplace = retryreplace; + this.maxLwtRetries =maxLwtRetries; + this.processors = processors; + } + + protected Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, int retryRplaceCount, RSProcessors processors) { + this.session = session; + this.maxpages = maxpages; + this.retryreplace = retryreplace; + this.maxLwtRetries =maxLwtRetries; + this.retryReplaceCount=retryRplaceCount; this.processors = processors; } @@ -69,6 +82,10 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, if (!retryreplace) { throw new ChangeUnappliedCycleException(rs, getQueryString()); } else { + retryReplaceCount++; + if (retryReplaceCount >maxLwtRetries) { + throw new ExceededRetryReplaceException(rs,getQueryString(), retryReplaceCount); + } Row one = rs.one(); processors.buffer(one); totalRows++; @@ -119,7 +136,7 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private Cqld4CqlOp rebindLwt(Statement stmt, Row row) { BoundStatement rebound = LWTRebinder.rebindUnappliedStatement(stmt, row); - return new Cqld4CqlReboundStatement(session, maxpages, retryreplace, rebound, processors); + return new Cqld4CqlReboundStatement(session, maxpages, retryreplace, maxLwtRetries, retryReplaceCount, rebound, processors); } } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java index 4c8720196..938475f7d 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlPreparedStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxpages, boolean retryreplace, RSProcessors processors) { - super(session,maxpages,retryreplace,processors); + public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { + super(session,maxpages,retryreplace,maxLwtRetries,processors); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java index 19f1a6936..3fb6a9578 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java @@ -23,8 +23,8 @@ import io.nosqlbench.adapter.cqld4.RSProcessors; public class Cqld4CqlSimpleStatement extends Cqld4CqlOp { private final SimpleStatement stmt; - public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace) { - super(session, maxpages,retryreplace, new RSProcessors()); + public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace, int maxlwtretries) { + super(session, maxpages,retryreplace, maxlwtretries, new RSProcessors()); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/resources/cqld4.md b/adapter-cqld4/src/main/resources/cqld4.md index cb83996ce..473969a14 100644 --- a/adapter-cqld4/src/main/resources/cqld4.md +++ b/adapter-cqld4/src/main/resources/cqld4.md @@ -198,6 +198,11 @@ params: # match the preconditions) in order to test LWT performance. retryreplace: true + # Set the number of retries allowed by the retryreplace option. This is set + # to 1 conservatively, as with the maxpages setting. This means that you will + # see an error if the first LWT retry after an unapplied change was not successful. + maxlwtretries: 1 + ## The following options are meant for advanced testing scenarios only, ## and are not generally meant to be used in typical application-level, ## data mode, performance or scale testing. These expose properties From d90731ec7abef823966fdc431e089a883e8b4bd2 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 13:41:20 -0600 Subject: [PATCH 2/3] typo fix --- .../adapter/cqld4/exceptions/ExceededRetryReplaceException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java index 3d7cb3b4b..a5e5f1f46 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java @@ -32,7 +32,7 @@ public class ExceededRetryReplaceException extends CqlGenericCycleException { private final int retries; public ExceededRetryReplaceException(ResultSet resultSet, String queryString, int retries) { - super("After " + retries + " retires using the retryreplace option, Operation was not applied:" + queryString); + super("After " + retries + " retries using the retryreplace option, Operation was not applied:" + queryString); this.retries = retries; this.resultSet = resultSet; this.queryString = queryString; From 2b63b8e64569fd19e3146618c7621f34bfa69230 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 7 Dec 2022 15:07:34 -0600 Subject: [PATCH 3/3] fix camel case across all affected method signatures --- .../cqld4/Cqld4CqlReboundStatement.java | 4 ++-- .../cqld4/optypes/Cqld4CqlBatchStatement.java | 4 ++-- .../adapter/cqld4/optypes/Cqld4CqlOp.java | 24 +++++++++---------- .../optypes/Cqld4CqlPreparedStatement.java | 4 ++-- .../optypes/Cqld4CqlSimpleStatement.java | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java index e2fb9e1d9..6cf024b36 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java @@ -24,8 +24,8 @@ import io.nosqlbench.adapter.cqld4.optypes.Cqld4CqlOp; public class Cqld4CqlReboundStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlReboundStatement(CqlSession session, int maxpages, boolean retryreplace, int maxlwtretries, int lwtRetryCount, BoundStatement rebound, RSProcessors processors) { - super(session,maxpages,retryreplace,maxlwtretries,lwtRetryCount, processors); + public Cqld4CqlReboundStatement(CqlSession session, int maxPages, boolean retryReplace, int maxLwtRetries, int lwtRetryCount, BoundStatement rebound, RSProcessors processors) { + super(session,maxPages,retryReplace,maxLwtRetries,lwtRetryCount, processors); this.stmt = rebound; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java index 6828a70ec..d122aa2eb 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlBatchStatement extends Cqld4CqlOp { private final BatchStatement stmt; - public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxpages, int maxlwtretries, boolean retryreplace) { - super(session,maxpages,retryreplace,maxlwtretries,new RSProcessors()); + public Cqld4CqlBatchStatement(CqlSession session, BatchStatement stmt, int maxPage, int maxLwtRetries, boolean retryReplace) { + super(session,maxPage,retryReplace,maxLwtRetries,new RSProcessors()); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java index ec9a147b6..67931b83a 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java @@ -45,8 +45,8 @@ import java.util.Map; public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, OpGenerator, OpResultSize { private final CqlSession session; - private final int maxpages; - private final boolean retryreplace; + private final int maxPages; + private final boolean retryReplace; private final int maxLwtRetries; private int retryReplaceCount =0; @@ -54,18 +54,18 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private Cqld4CqlOp nextOp; private final RSProcessors processors; - public Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { + public Cqld4CqlOp(CqlSession session, int maxPages, boolean retryReplace, int maxLwtRetries, RSProcessors processors) { this.session = session; - this.maxpages = maxpages; - this.retryreplace = retryreplace; + this.maxPages = maxPages; + this.retryReplace = retryReplace; this.maxLwtRetries =maxLwtRetries; this.processors = processors; } - protected Cqld4CqlOp(CqlSession session, int maxpages, boolean retryreplace, int maxLwtRetries, int retryRplaceCount, RSProcessors processors) { + protected Cqld4CqlOp(CqlSession session, int maxPages, boolean retryReplace, int maxLwtRetries, int retryRplaceCount, RSProcessors processors) { this.session = session; - this.maxpages = maxpages; - this.retryreplace = retryreplace; + this.maxPages = maxPages; + this.retryReplace = retryReplace; this.maxLwtRetries =maxLwtRetries; this.retryReplaceCount=retryRplaceCount; this.processors = processors; @@ -79,7 +79,7 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, int totalRows = 0; if (!rs.wasApplied()) { - if (!retryreplace) { + if (!retryReplace) { throw new ChangeUnappliedCycleException(rs, getQueryString()); } else { retryReplaceCount++; @@ -103,8 +103,8 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, Row row = reader.next(); processors.buffer(row); } - if (pages++ > maxpages) { - throw new UnexpectedPagingException(rs, getQueryString(), pages, maxpages, stmt.getPageSize()); + if (pages++ > maxPages) { + throw new UnexpectedPagingException(rs, getQueryString(), pages, maxPages, stmt.getPageSize()); } if (rs.isFullyFetched()) { break; @@ -136,7 +136,7 @@ public abstract class Cqld4CqlOp implements CycleOp, VariableCapture, private Cqld4CqlOp rebindLwt(Statement stmt, Row row) { BoundStatement rebound = LWTRebinder.rebindUnappliedStatement(stmt, row); - return new Cqld4CqlReboundStatement(session, maxpages, retryreplace, maxLwtRetries, retryReplaceCount, rebound, processors); + return new Cqld4CqlReboundStatement(session, maxPages, retryReplace, maxLwtRetries, retryReplaceCount, rebound, processors); } } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java index 938475f7d..9e6dfcad9 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java @@ -24,8 +24,8 @@ public class Cqld4CqlPreparedStatement extends Cqld4CqlOp { private final BoundStatement stmt; - public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxpages, boolean retryreplace, int maxLwtRetries, RSProcessors processors) { - super(session,maxpages,retryreplace,maxLwtRetries,processors); + public Cqld4CqlPreparedStatement(CqlSession session, BoundStatement stmt, int maxPages, boolean retryReplace, int maxLwtRetries, RSProcessors processors) { + super(session,maxPages,retryReplace,maxLwtRetries,processors); this.stmt = stmt; } diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java index 3fb6a9578..0f119c91d 100644 --- a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java +++ b/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java @@ -23,8 +23,8 @@ import io.nosqlbench.adapter.cqld4.RSProcessors; public class Cqld4CqlSimpleStatement extends Cqld4CqlOp { private final SimpleStatement stmt; - public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxpages, boolean retryreplace, int maxlwtretries) { - super(session, maxpages,retryreplace, maxlwtretries, new RSProcessors()); + public Cqld4CqlSimpleStatement(CqlSession session, SimpleStatement stmt, int maxPages, boolean retryReplace, int maxLwtRetries) { + super(session, maxPages,retryReplace, maxLwtRetries, new RSProcessors()); this.stmt = stmt; }