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

make labels and tags for nb5.21 canonical

Browse Source 
fixes #1779
This commit is contained in:
Jonathan Shook 2024-01-16 18:42:26 -06:00
parent e30054c63f
commit 0d2276cb56
6 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
View File

@ -43,7 +43,7 @@ public class OpDef extends OpTemplate {
@Override
public String getName() {
return block.getName() + "__" + rawOpDef.getName();
return rawOpDef.getName();
}
@Override
@ -100,7 +100,7 @@ public class OpDef extends OpTemplate {
private LinkedHashMap<String, String> composeTags() {
LinkedHashMap<String, String> tagsWithName = new LinkedHashMap<>(new MultiMapLookup<>(rawOpDef.getTags(), block.getTags()));
tagsWithName.put("block",block.getName());
tagsWithName.put("name",getName());
tagsWithName.put("name",this.rawOpDef.getName());
tagsWithName.put("op",this.rawOpDef.getName());
return tagsWithName;
}

24
adapters-api/src/main/resources/workload_definition/02_workload_structure.md
View File

@ -375,24 +375,24 @@ blocks:
[
{
"name": "namedblock1__op1",
"name": "op1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "namedblock1__op1",
"name": "op1",
"block": "namedblock1",
"op": "op1"
}
},
{
"name": "namedblock1__op2",
"name": "op2",
"op": {
"stmt": "insert into bar.table (a,b,c) values (1,2,3);",
"type": "batch"
},
"tags": {
"name": "namedblock1__op2",
"name": "op2",
"block": "namedblock1",
"op": "op2"
}
@ -450,35 +450,35 @@ blocks:
[
{
"name": "block1__op1",
"name": "op1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block1__op1",
"name": "op1",
"block": "block1",
"op": "op1"
}
},
{
"name": "block1__op2",
"name": "op2",
"op": {
"stmt": "insert into bar.table (a,b,c) values (1,2,3);",
"type": "batch"
},
"tags": {
"name": "block1__op2",
"name": "op2",
"block": "block1",
"op": "op2"
}
},
{
"name": "this_is_block_2__op3",
"name": "op3",
"op": {
"stmt": "select * from foo.table;"
},
"tags": {
"name": "this_is_block_2__op3",
"name": "op3",
"block": "this_is_block_2",
"op": "op3"
}
@ -523,12 +523,12 @@ blocks:
[
{
"name": "myblock__stmt1",
"name": "stmt1",
"op": {
"stmt": "test op"
},
"tags": {
"name": "myblock__stmt1",
"name": "stmt1",
"block": "myblock",
"op": "stmt1"
}

32
adapters-api/src/main/resources/workload_definition/04_op_template_basics.md
View File

@ -34,12 +34,12 @@ op: select * from bar.table;
[
{
"name": "block0__stmt1",
"name": "stmt1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block0__stmt1",
"name": "stmt1",
"block": "block0",
"op": "stmt1"
}
@ -73,12 +73,12 @@ ops:
[
{
"name": "block0__stmt1",
"name": "stmt1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block0__stmt1",
"name": "stmt1",
"block": "block0",
"op": "stmt1"
}
@ -117,12 +117,12 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
}
@ -160,12 +160,12 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
}
@ -199,12 +199,12 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
}
@ -241,12 +241,12 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"stmt": "select * from bar.table;"
},
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
}
@ -315,7 +315,7 @@ ops:
"binding1": "NumberNameToString();"
},
"description": "This is just an example operation",
"name": "block0__special-op-name",
"name": "special-op-name",
"op": {
"stmt": "select * from ks1.tb1;"
},
@ -324,7 +324,7 @@ ops:
},
"tags": {
"block": "block0",
"name": "block0__special-op-name",
"name": "special-op-name",
"op": "special-op-name"
}
}
@ -414,7 +414,7 @@ blocks:
"bindings": {
"binding1": "NumberNameToString();"
},
"name": "block_named_fred__special-op-name",
"name": "special-op-name",
"op": {
"stmt": "select * from ks1.tb1;"
},
@ -424,7 +424,7 @@ blocks:
"tags": {
"block": "block_named_fred",
"docleveltag": "is-tagging-everything",
"name": "block_named_fred__special-op-name",
"name": "special-op-name",
"op": "special-op-name"
}
}

36
adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md
View File

@ -39,14 +39,14 @@ ops: "cycle number '{{NumberNameToString}}'"
[
{
"tags": {
"name": "block0__stmt1",
"name": "stmt1",
"block": "block0",
"op": "stmt1"
},
"op": {
"stmt": "cycle number '{{NumberNameToString}}'"
},
"name": "block0__stmt1"
"name": "stmt1"
}
]
```
@ -83,25 +83,25 @@ ops:
[
{
"tags": {
"name": "block0__stmt1",
"name": "stmt1",
"block": "block0",
"op": "stmt1"
},
"op": {
"stmt": "even cycle '{{NumberNameToString}}'"
},
"name": "block0__stmt1"
"name": "stmt1"
},
{
"tags": {
"name": "block0__stmt2",
"name": "stmt2",
"block": "block0",
"op": "stmt2"
},
"op": {
"stmt": "odd cycle '{{NumberNameToString}}'"
},
"name": "block0__stmt2"
"name": "stmt2"
}
]
```
@ -138,25 +138,25 @@ ops:
[
{
"tags": {
"name": "block0__myop1",
"name": "myop1",
"block": "block0",
"op": "myop1"
},
"op": {
"stmt": "even cycle '{{NumberNameToString}}'"
},
"name": "block0__myop1"
"name": "myop1"
},
{
"tags": {
"name": "block0__myop2",
"name": "myop2",
"block": "block0",
"op": "myop2"
},
"op": {
"stmt": "odd cycle '{{NumberNameToString}}'"
},
"name": "block0__myop2"
"name": "myop2"
}
]
```
@ -198,7 +198,7 @@ ops:
[
{
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
},
@ -206,7 +206,7 @@ ops:
"opfield1": "opvalue1",
"opfield2": "opvalue2"
},
"name": "block0__op1"
"name": "op1"
}
]
```
@ -250,7 +250,7 @@ ops:
[
{
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
},
@ -260,7 +260,7 @@ ops:
"opvalue2"
]
},
"name": "block0__op1"
"name": "op1"
}
]
```
@ -310,7 +310,7 @@ ops:
[
{
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
},
@ -324,7 +324,7 @@ ops:
"by_session_len/@1h"
]
},
"name": "block0__op1"
"name": "op1"
}
]
@ -384,7 +384,7 @@ ops:
"user_index": "Mod(1000L); ToString();"
},
"tags": {
"name": "block0__op1",
"name": "op1",
"block": "block0",
"op": "op1"
},
@ -398,7 +398,7 @@ ops:
"by_session_len/@1h"
]
},
"name": "block0__op1"
"name": "op1"
}
]
```

48
adapters-api/src/main/resources/workload_definition/06_op_template_variations.md
View File

@ -42,13 +42,13 @@ ops:
[
{
"name": "block0__special-op-name",
"name": "special-op-name",
"op": {
"stmt": "select * from ks1.tb1;"
},
"tags": {
"block": "block0",
"name": "block0__special-op-name",
"name": "special-op-name",
"op": "special-op-name"
}
}
@ -94,14 +94,14 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"field1": "select * from ks1.tb1;",
"field2": "field 2 value"
},
"tags": {
"block": "block0",
"name": "block0__op1",
"name": "op1",
"op": "op1"
}
}
@ -141,14 +141,14 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"field1": "select * from ks1.tb1;",
"field2": "field 2 value"
},
"tags": {
"block": "block0",
"name": "block0__op1",
"name": "op1",
"op": "op1"
}
}
@ -191,7 +191,7 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"field1": "select * from ks1.tb1;",
"field2": "field 2 value"
@ -201,7 +201,7 @@ ops:
},
"tags": {
"block": "block0",
"name": "block0__op1",
"name": "op1",
"op": "op1"
}
}
@ -244,7 +244,7 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"field1": "select * from ks1.tb1;",
"field2": "field 2 value"
@ -254,7 +254,7 @@ ops:
},
"tags": {
"block": "block0",
"name": "block0__op1",
"name": "op1",
"op": "op1"
}
}
@ -302,7 +302,7 @@ ops:
[
{
"name": "block0__op1",
"name": "op1",
"op": {
"field1": "select * from ks1.tb1;",
"field2": "field 2 value"
@ -312,7 +312,7 @@ ops:
},
"tags": {
"block": "block0",
"name": "block0__op1",
"name": "op1",
"op": "op1"
}
}
@ -351,14 +351,14 @@ ops: "my test op"
"pname": "pvalue"
},
"tags": {
"name": "block0__stmt1",
"name": "stmt1",
"block": "block0",
"op": "stmt1"
},
"op": {
"stmt": "my test op"
},
"name": "block0__stmt1"
"name": "stmt1"
}
]
```
@ -401,14 +401,14 @@ blocks:
"pname": "pvalue"
},
"tags": {
"name": "block1__stmt1",
"name": "stmt1",
"block": "block1",
"op": "stmt1"
},
"op": {
"stmt": "my test op"
},
"name": "block1__stmt1"
"name": "stmt1"
}
]
```
@ -458,14 +458,14 @@ blocks:
"pname": "pvalue"
},
"tags": {
"name": "block1__op1",
"name": "op1",
"block": "block1",
"op": "op1"
},
"op": {
"stmt": "my test op"
},
"name": "block1__op1"
"name": "op1"
}
]
```
@ -520,7 +520,7 @@ blocks:
[
{
"tags": {
"name": "block1__op1",
"name": "op1",
"block": "block1",
"op": "op1"
},
@ -530,7 +530,7 @@ blocks:
"pname": "pvalue"
}
},
"name": "block1__op1"
"name": "op1"
}
]
```
@ -583,18 +583,18 @@ blocks:
[
{
"tags": {
"name": "block1__op1",
"name": "op1",
"block": "block1",
"op": "op1"
},
"op": {
"stmt": "my test op"
},
"name": "block1__op1"
"name": "op1"
},
{
"tags": {
"name": "block1__params",
"name": "params",
"block": "block1",
"op": "params"
},
@ -602,7 +602,7 @@ blocks:
"pname": "pvalue"
},
"name": "block1__params"
"name": "params"
}
]
```

18
adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDetailOverrideTest.java
View File

@ -43,32 +43,32 @@ public class OpDetailOverrideTest {
OpsBlock doc1block0 = doc1.getBlocks().get(0);
assertThat(doc1block0.getOps().size()).isEqualTo(1);
OpTemplate s = doc1block0.getOps().get(0);
assertThat(s.getName()).isEqualTo("block0__stmt1");
assertThat(s.getName()).isEqualTo("stmt1");
assertThat(s.getStmt()).contains("globalstatement1");
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);
assertThat(s.getTags()).isEqualTo(Map.of("block","block0","global_tag1","tag value","name","block0__stmt1", "op","stmt1"));
assertThat(s.getTags()).isEqualTo(Map.of("block","block0","global_tag1","tag value","name","stmt1", "op","stmt1"));
OpsBlock doc1block1 = doc1.getBlocks().get(1);
List<OpTemplate> ops = doc1block1.getOps();
assertThat(ops).hasSize(4);
s = ops.get(0);
assertThat(s.getName()).isEqualTo("testblock1__stmt1");
assertThat(s.getName()).isEqualTo("stmt1");
assertThat(s.getStmt()).contains("astatement1");
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1__stmt1","op","stmt1"));
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","stmt1","op","stmt1"));
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);
s = ops.get(1);
assertThat(s.getName()).isEqualTo("testblock1__s2name");
assertThat(s.getName()).isEqualTo("s2name");
assertThat(s.getStmt()).contains("s2statement data");
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1__s2name","op","s2name"));
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","s2name","op","s2name"));
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);
s = ops.get(2);
assertThat(s.getName()).isEqualTo("testblock1__s3");
assertThat(s.getName()).isEqualTo("s3");
assertThat(s.getStmt()).contains("statement three");
assertThat(s.getTags()).containsEntry("tname1", "tval1");
assertThat(s.getTags()).containsEntry("global_tag1", "tag value");
@ -76,9 +76,9 @@ public class OpDetailOverrideTest {
assertThat(s.getParams()).hasSize(2);
s = ops.get(3);
assertThat(s.getName()).isEqualTo("testblock1__s4");
assertThat(s.getName()).isEqualTo("s4");
assertThat(s.getStmt()).contains("statement 4");
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","testblock1__s4","op","s4"));
assertThat(s.getTags()).isEqualTo(Map.of("block","testblock1","global_tag1","tag value","name","s4","op","s4"));
assertThat(s.getBindings()).hasSize(1);
assertThat(s.getParams()).hasSize(1);