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

Merge branch 'master' into issue-67

Browse Source
This commit is contained in:
Jonathan Shook
2020-03-17 12:32:24 -05:00
parent 550a942712 335c88bc1d
commit af99ae88c2
103 changed files with 1132 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activitytype-cql/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>io.nosqlbench</groupId>
<artifactId>mvn-defaults</artifactId>
<version>3.12.30-SNAPSHOT</version>
<version>3.12.42-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@@ -28,7 +28,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>engine-api</artifactId>
<version>3.12.30-SNAPSHOT</version>
<version>3.12.42-SNAPSHOT</version>
</dependency>
<dependency>

10
activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java
View File

@@ -10,7 +10,7 @@ import io.nosqlbench.activitytype.cql.api.ErrorResponse;
import io.nosqlbench.activitytype.cql.api.ResultSetCycleOperator;
import io.nosqlbench.activitytype.cql.api.RowCycleOperator;
import io.nosqlbench.activitytype.cql.api.StatementFilter;
import io.nosqlbench.activitytype.cql.errorhandling.EbdseCycleErrorHandler;
import io.nosqlbench.activitytype.cql.errorhandling.NBCycleErrorHandler;
import io.nosqlbench.activitytype.cql.errorhandling.HashedCQLErrorHandler;
import io.nosqlbench.activitytype.cql.statements.binders.CqlBinderTypes;
import io.nosqlbench.activitytype.cql.statements.core.*;
@@ -505,7 +505,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef
if (keyval.length == 1) {
String verb = keyval[0];
newerrorHandler.setDefaultHandler(
new EbdseCycleErrorHandler(
new NBCycleErrorHandler(
ErrorResponse.valueOf(verb),
exceptionCountMetrics,
exceptionHistoMetrics,
@@ -516,8 +516,8 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef
String pattern = keyval[0];
String verb = keyval[1];
if (newerrorHandler.getGroupNames().contains(pattern)) {
EbdseCycleErrorHandler handler =
new EbdseCycleErrorHandler(
NBCycleErrorHandler handler =
new NBCycleErrorHandler(
ErrorResponse.valueOf(verb),
exceptionCountMetrics,
exceptionHistoMetrics,
@@ -526,7 +526,7 @@ public class CqlActivity extends SimpleActivity implements Activity, ActivityDef
logger.info("Handling error group '" + pattern + "' with handler:" + handler);
newerrorHandler.setHandlerForGroup(pattern, handler);
} else {
EbdseCycleErrorHandler handler = new EbdseCycleErrorHandler(
NBCycleErrorHandler handler = new NBCycleErrorHandler(
ErrorResponse.valueOf(keyval[1]),
exceptionCountMetrics,
exceptionHistoMetrics,

6
activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/EbdseCycleErrorHandler.java → activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java
View File

@@ -40,16 +40,16 @@ import org.slf4j.LoggerFactory;
* simply a no-op that allows you to specify it as the minimum case.
*/
@SuppressWarnings("Duplicates")
public class EbdseCycleErrorHandler implements CycleErrorHandler<Throwable, ErrorStatus> {
public class NBCycleErrorHandler implements CycleErrorHandler<Throwable, ErrorStatus> {
private static final Logger logger = LoggerFactory.getLogger(EbdseCycleErrorHandler.class);
private static final Logger logger = LoggerFactory.getLogger(NBCycleErrorHandler.class);
private ErrorResponse errorResponse;
private ExceptionCountMetrics exceptionCountMetrics;
private final ExceptionHistoMetrics exceptionHistoMetrics;
private boolean throwExceptionOnStop=false;
public EbdseCycleErrorHandler(
public NBCycleErrorHandler(
ErrorResponse errorResponse,
ExceptionCountMetrics exceptionCountMetrics,
ExceptionHistoMetrics exceptionHistoMetrics,

6
activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java
View File

@@ -83,12 +83,12 @@ public class CQLSessionCache implements Shutdownable {
contactPoints = activityDef.getParams().getOptionalString("hosts")
.map(h -> h.split(",")).orElse(null);
}
if (contactPoints == null && scb.isEmpty()) {
contactPoints = new String[]{"localhost"};
}
if (contactPoints != null) {
builder.addContactPoints(contactPoints);
}else if (scb.isEmpty()){
throw new BasicError("you must provide your contact " +
"points:\n hosts=<host1,host2,...>");
}
activityDef.getParams().getOptionalInteger("port").ifPresent(builder::withPort);

2
activitytype-cql/src/main/resources/activities/baselines/cql-iot-dse.yaml
View File

@@ -1,4 +1,4 @@
# ebdse -v run type=cql yaml=baselines/cql-iot tags=phase:schema host=dsehost
# nb -v run type=cql yaml=baselines/cql-iot tags=phase:schema host=dsehost
bindings:
machine_id: Mod(<<sources:10000>>); ToHashedUUID() -> java.util.UUID
sensor_name: HashedLineToString('data/variable_words.txt')

3
activitytype-cql/src/main/resources/activities/baselines/cql-iot.yaml
View File

@@ -1,5 +1,4 @@
# nb -v run type=cql yaml=baselines/cql-iot tags=phase:schema
host=dsehost
# nb -v run type=cql yaml=baselines/cql-iot tags=phase:schema host=dsehost
bindings:
machine_id: Mod(<<sources:10000>>); ToHashedUUID() -> java.util.UUID
sensor_name: HashedLineToString('data/variable_words.txt')

3
activitytype-cql/src/main/resources/activities/baselines/cql-keyvalue.yaml
View File

@@ -1,5 +1,4 @@
# nb -v run type=cql yaml=baselines/cql-keyvalue tags=phase:schema
host=dsehost
# nb -v run type=cql yaml=baselines/cql-keyvalue tags=phase:schema host=dsehost
bindings:
seq_key: Mod(<<keycount:1000000000>>); ToString() -> String
seq_value: Hash(); Mod(<<valuecount:1000000000>>); ToString() -> String

2
activitytype-cql/src/main/resources/activities/baselines/cql-widerows.yaml
View File

@@ -1,4 +1,4 @@
# ebdse -v run type=cql yaml=baselines/cql-widerows tags=phase:schema host=dsehost
# nb -v run type=cql yaml=baselines/cql-widerows tags=phase:schema host=dsehost
bindings:
# for ramp-up and verify
part_layout: Div(<<partsize:1000000>>); ToString() -> String