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

use ParsedTemplate everywhere

Browse Source
This commit is contained in:
Jonathan Shook
2021-07-06 11:12:49 -05:00
parent 0bddb0bdaf
commit b3195f8e0a
8 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
driver-mongodb/src/main/java/io/nosqlbench/driver/mongodb/MongoActivity.java
View File

@@ -11,7 +11,6 @@ import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver;
import io.nosqlbench.engine.api.activityapi.planning.OpSequence;
import io.nosqlbench.engine.api.activityapi.planning.SequencePlanner;
import io.nosqlbench.engine.api.activityapi.planning.SequencerType;
import io.nosqlbench.engine.api.activityconfig.ParsedStmtOp;
import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
@@ -20,6 +19,7 @@ import io.nosqlbench.engine.api.activityimpl.SimpleActivity;
import io.nosqlbench.engine.api.metrics.ActivityMetrics;
import io.nosqlbench.engine.api.templating.StrInterpolator;
import io.nosqlbench.engine.api.util.TagFilter;
import io.nosqlbench.virtdata.core.templates.ParsedTemplate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bson.UuidRepresentation;
@@ -117,7 +117,7 @@ public class MongoActivity extends SimpleActivity implements ActivityDefObserver
logger.error("No statements found for this activity");
} else {
for (OpTemplate stmt : stmts) {
ParsedStmtOp parsed = stmt.getParsed().orElseThrow();
ParsedTemplate parsed = stmt.getParsed().orElseThrow();
String statement = parsed.getPositionalStatement(Function.identity());
Objects.requireNonNull(statement);

8
driver-mongodb/src/test/java/io/nosqlbench/driver/mongodb/ReadyMongoStatementTest.java
View File

@@ -1,12 +1,12 @@
package io.nosqlbench.driver.mongodb;
import io.nosqlbench.engine.api.activityconfig.ParsedStmtOp;
import io.nosqlbench.engine.api.activityconfig.StatementsLoader;
import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate;
import io.nosqlbench.engine.api.activityconfig.yaml.StmtsDocList;
import io.nosqlbench.engine.api.activityimpl.ActivityDef;
import io.nosqlbench.engine.api.templating.StrInterpolator;
import io.nosqlbench.virtdata.core.templates.BindPoint;
import io.nosqlbench.virtdata.core.templates.ParsedTemplate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bson.conversions.Bson;
@@ -43,7 +43,7 @@ public class ReadyMongoStatementTest {
List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
assertThat(stmts).hasSize(1);
for (OpTemplate stmt : stmts) {
ParsedStmtOp parsed = stmt.getParsed().orElseThrow();
ParsedTemplate parsed = stmt.getParsed().orElseThrow();
assertThat(parsed.getBindPoints()).hasSize(2);
BindPoint seqKey = new BindPoint("seq_key", "Mod(1000000L); ToInt()");
@@ -66,7 +66,7 @@ public class ReadyMongoStatementTest {
List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
assertThat(stmts).hasSize(1);
for (OpTemplate stmt : stmts) {
ParsedStmtOp parsed = stmt.getParsed().orElseThrow();
ParsedTemplate parsed = stmt.getParsed().orElseThrow();
assertThat(parsed.getBindPoints()).hasSize(1);
BindPoint rwKey = new BindPoint("rw_key", "Uniform(0,1000000)->long; ToInt()");
@@ -88,7 +88,7 @@ public class ReadyMongoStatementTest {
List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
assertThat(stmts).hasSize(1);
for (OpTemplate stmt : stmts) {
ParsedStmtOp parsed = stmt.getParsed().orElseThrow();
ParsedTemplate parsed = stmt.getParsed().orElseThrow();
assertThat(parsed.getBindPoints()).hasSize(2);
BindPoint rwKey = new BindPoint("rw_key", "Uniform(0,1000000)->long; ToInt()");