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

inject name into tags automatically

Browse Source
This commit is contained in:
Jonathan Shook 2021-06-24 11:18:44 -05:00
parent c31302e4d0
commit fb587ce426
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
driver-mongodb/src/main/resources/activities/mongodb-basic.yaml
View File

@ -40,8 +40,6 @@ blocks:
} }
params: params:
readPreference: primary readPreference: primary
tags:
name: main-find
- name: main-write - name: main-write
tags: tags:
phase: main phase: main
@ -57,5 +55,3 @@ blocks:
} }
params: params:
readPreference: primary readPreference: primary
tags:
name: main-insert

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

@ -61,7 +61,7 @@ public class ReadyMongoStatementTest {
@Test @Test
public void testResolvePhaseMainRead() { public void testResolvePhaseMainRead() {
String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:main-find"); String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:.*main-find");
List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter); List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
assertThat(stmts).hasSize(1); assertThat(stmts).hasSize(1);
@ -83,7 +83,7 @@ public class ReadyMongoStatementTest {
@Test @Test
public void testResolvePhaseMainWrite() { public void testResolvePhaseMainWrite() {
String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:main-insert"); String tagfilter = activityDef.getParams().getOptionalString("tags").orElse("phase:main,name:.*main-insert");
List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter); List<OpTemplate> stmts = stmtsDocList.getStmts(tagfilter);
assertThat(stmts).hasSize(1); assertThat(stmts).hasSize(1);

8
engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtDetailOverrideTest.java
View File

@ -47,7 +47,7 @@ public class StmtDetailOverrideTest {
assertThat(s.getStmt()).contains("globalstatement1"); assertThat(s.getStmt()).contains("globalstatement1");
assertThat(s.getBindings()).hasSize(1); assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1); assertThat(s.getParams()).hasSize(1);
assertThat(s.getTags()).hasSize(1); assertThat(s.getTags()).hasSize(2);
StmtsBlock doc1block1 = doc1.getBlocks().get(1); StmtsBlock doc1block1 = doc1.getBlocks().get(1);
List<OpTemplate> stmts = doc1block1.getOps(); List<OpTemplate> stmts = doc1block1.getOps();
@ -56,14 +56,14 @@ public class StmtDetailOverrideTest {
s = stmts.get(0); s = stmts.get(0);
assertThat(s.getName()).isEqualTo("testblock1--stmt1"); assertThat(s.getName()).isEqualTo("testblock1--stmt1");
assertThat(s.getStmt()).contains("astatement1"); assertThat(s.getStmt()).contains("astatement1");
assertThat(s.getTags()).hasSize(1); assertThat(s.getTags()).hasSize(2);
assertThat(s.getBindings()).hasSize(1); assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1); assertThat(s.getParams()).hasSize(1);
s = stmts.get(1); s = stmts.get(1);
assertThat(s.getName()).isEqualTo("testblock1--s2name"); assertThat(s.getName()).isEqualTo("testblock1--s2name");
assertThat(s.getStmt()).contains("s2statement data"); assertThat(s.getStmt()).contains("s2statement data");
assertThat(s.getTags()).hasSize(1); assertThat(s.getTags()).hasSize(2);
assertThat(s.getBindings()).hasSize(1); assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1); assertThat(s.getParams()).hasSize(1);
@ -78,7 +78,7 @@ public class StmtDetailOverrideTest {
s = stmts.get(3); s = stmts.get(3);
assertThat(s.getName()).isEqualTo("testblock1--s4"); assertThat(s.getName()).isEqualTo("testblock1--s4");
assertThat(s.getStmt()).contains("statement 4"); assertThat(s.getStmt()).contains("statement 4");
assertThat(s.getTags()).hasSize(1); assertThat(s.getTags()).hasSize(2);
assertThat(s.getBindings()).hasSize(1); assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1); assertThat(s.getParams()).hasSize(1);

4
engine-api/src/test/java/io/nosqlbench/engine/api/activityconfig/yaml/StmtsDocListTest.java
View File

@ -87,11 +87,11 @@ public class StmtsDocListTest {
assertThat(stmts1.get(0).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d")); assertThat(stmts1.get(0).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d"));
assertThat(stmts1.get(0).getParams()).containsExactly(MapEntry.entry("param1","value1")); assertThat(stmts1.get(0).getParams()).containsExactly(MapEntry.entry("param1","value1"));
assertThat(stmts1.get(0).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue")); assertThat(stmts1.get(0).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue"),MapEntry.entry("name","doc1--block0--stmt1"));
assertThat(stmts1.get(1).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d")); assertThat(stmts1.get(1).getBindings()).containsExactly(MapEntry.entry("b2","b2d"),MapEntry.entry("b1","b1d"));
assertThat(stmts1.get(1).getParams()).containsExactly(MapEntry.entry("param1","value1")); assertThat(stmts1.get(1).getParams()).containsExactly(MapEntry.entry("param1","value1"));
assertThat(stmts1.get(1).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue")); assertThat(stmts1.get(1).getTags()).containsExactly(MapEntry.entry("atagname","atagvalue"),MapEntry.entry("name","doc1--block0--stmt2"));
} }