From 60e8d3d6969f2ff3e5d80c307c3ad51401576866 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Sat, 9 Sep 2023 00:38:32 -0500 Subject: [PATCH] update uniform specification tests to honor snake case requirement --- .../02_workload_structure.md | 30 ++++++------ .../04_op_template_basics.md | 38 +++++++-------- .../05_op_template_payloads.md | 36 +++++++------- .../06_op_template_variations.md | 48 +++++++++---------- 4 files changed, 76 insertions(+), 76 deletions(-) diff --git a/adapters-api/src/main/resources/workload_definition/02_workload_structure.md b/adapters-api/src/main/resources/workload_definition/02_workload_structure.md index b21d11e29..2b62ed37b 100644 --- a/adapters-api/src/main/resources/workload_definition/02_workload_structure.md +++ b/adapters-api/src/main/resources/workload_definition/02_workload_structure.md @@ -375,23 +375,23 @@ blocks: [ { - "name": "namedblock1--op1", + "name": "namedblock1__op1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "namedblock1--op1", + "name": "namedblock1__op1", "block": "namedblock1" } }, { - "name": "namedblock1--op2", + "name": "namedblock1__op2", "op": { "stmt": "insert into bar.table (a,b,c) values (1,2,3);", "type": "batch" }, "tags": { - "name": "namedblock1--op2", + "name": "namedblock1__op2", "block": "namedblock1" } } @@ -411,7 +411,7 @@ blocks: op2: type: batch stmt: insert into bar.table (a,b,c) values (1,2,3); - - name: this-is-block-2 + - name: this_is_block_2 ops: op3: select * from foo.table; @@ -433,7 +433,7 @@ blocks: } }, { - "name": "this-is-block-2", + "name": "this_is_block_2", "ops": { "op3": "select * from foo.table;" } @@ -448,34 +448,34 @@ blocks: [ { - "name": "block1--op1", + "name": "block1__op1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block1--op1", + "name": "block1__op1", "block": "block1" } }, { - "name": "block1--op2", + "name": "block1__op2", "op": { "stmt": "insert into bar.table (a,b,c) values (1,2,3);", "type": "batch" }, "tags": { - "name": "block1--op2", + "name": "block1__op2", "block": "block1" } }, { - "name": "this-is-block-2--op3", + "name": "this_is_block_2__op3", "op": { "stmt": "select * from foo.table;" }, "tags": { - "name": "this-is-block-2--op3", - "block": "this-is-block-2" + "name": "this_is_block_2__op3", + "block": "this_is_block_2" } } ] @@ -518,12 +518,12 @@ blocks: [ { - "name": "myblock--stmt1", + "name": "myblock__stmt1", "op": { "stmt": "test op" }, "tags": { - "name": "myblock--stmt1", + "name": "myblock__stmt1", "block": "myblock" } } diff --git a/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md b/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md index 849347f3a..5c31916b8 100644 --- a/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md +++ b/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md @@ -34,12 +34,12 @@ op: select * from bar.table; [ { - "name": "block0--stmt1", + "name": "block0__stmt1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block0--stmt1", + "name": "block0__stmt1", "block": "block0" } } @@ -72,12 +72,12 @@ ops: [ { - "name": "block0--stmt1", + "name": "block0__stmt1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block0--stmt1", + "name": "block0__stmt1", "block": "block0" } } @@ -115,12 +115,12 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" } } @@ -157,12 +157,12 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" } } @@ -195,12 +195,12 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" } } @@ -236,12 +236,12 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "stmt": "select * from bar.table;" }, "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" } } @@ -309,7 +309,7 @@ ops: "binding1": "NumberNameToString();" }, "description": "This is just an example operation", - "name": "block0--special-op-name", + "name": "block0__special-op-name", "op": { "stmt": "select * from ks1.tb1;" }, @@ -318,7 +318,7 @@ ops: }, "tags": { "block": "schema", - "name": "block0--special-op-name", + "name": "block0__special-op-name", "block": "block0" } } @@ -347,7 +347,7 @@ params: prepared: true # set prepared true by default for all contained op templates blocks: - block-named-fred: + block_named_fred: bindings: binding1: NumberNameToString(); tags: @@ -377,7 +377,7 @@ blocks: "prepared": true }, "blocks": { - "block-named-fred": { + "block_named_fred": { "bindings": { "binding1": "NumberNameToString();" }, @@ -408,7 +408,7 @@ blocks: "bindings": { "binding1": "NumberNameToString();" }, - "name": "block-named-fred--special-op-name", + "name": "block_named_fred__special-op-name", "op": { "stmt": "select * from ks1.tb1;" }, @@ -418,8 +418,8 @@ blocks: "tags": { "block": "schema", "docleveltag": "is-tagging-everything", - "name": "block-named-fred--special-op-name", - "block": "block-named-fred" + "name": "block_named_fred__special-op-name", + "block": "block_named_fred" } } ] diff --git a/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md b/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md index aa7513a01..77bf6ba0c 100644 --- a/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md +++ b/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md @@ -39,13 +39,13 @@ ops: "cycle number '{{NumberNameToString}}'" [ { "tags": { - "name": "block0--stmt1", + "name": "block0__stmt1", "block": "block0" }, "op": { "stmt": "cycle number '{{NumberNameToString}}'" }, - "name": "block0--stmt1" + "name": "block0__stmt1" } ] ``` @@ -82,23 +82,23 @@ ops: [ { "tags": { - "name": "block0--stmt1", + "name": "block0__stmt1", "block": "block0" }, "op": { "stmt": "even cycle '{{NumberNameToString}}'" }, - "name": "block0--stmt1" + "name": "block0__stmt1" }, { "tags": { - "name": "block0--stmt2", + "name": "block0__stmt2", "block": "block0" }, "op": { "stmt": "odd cycle '{{NumberNameToString}}'" }, - "name": "block0--stmt2" + "name": "block0__stmt2" } ] ``` @@ -135,23 +135,23 @@ ops: [ { "tags": { - "name": "block0--myop1", + "name": "block0__myop1", "block": "block0" }, "op": { "stmt": "even cycle '{{NumberNameToString}}'" }, - "name": "block0--myop1" + "name": "block0__myop1" }, { "tags": { - "name": "block0--myop2", + "name": "block0__myop2", "block": "block0" }, "op": { "stmt": "odd cycle '{{NumberNameToString}}'" }, - "name": "block0--myop2" + "name": "block0__myop2" } ] ``` @@ -193,14 +193,14 @@ ops: [ { "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" }, "op": { "opfield1": "opvalue1", "opfield2": "opvalue2" }, - "name": "block0--op1" + "name": "block0__op1" } ] ``` @@ -244,7 +244,7 @@ ops: [ { "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" }, "op": { @@ -253,7 +253,7 @@ ops: "opvalue2" ] }, - "name": "block0--op1" + "name": "block0__op1" } ] ``` @@ -303,7 +303,7 @@ ops: [ { "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" }, "op": { @@ -316,7 +316,7 @@ ops: "by_session_len/@1h" ] }, - "name": "block0--op1" + "name": "block0__op1" } ] @@ -376,7 +376,7 @@ ops: "user_index": "Mod(1000L); ToString();" }, "tags": { - "name": "block0--op1", + "name": "block0__op1", "block": "block0" }, "op": { @@ -389,7 +389,7 @@ ops: "by_session_len/@1h" ] }, - "name": "block0--op1" + "name": "block0__op1" } ] ``` diff --git a/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md b/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md index ff4bede01..6c6775ad1 100644 --- a/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md +++ b/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md @@ -42,13 +42,13 @@ ops: [ { - "name": "block0--special-op-name", + "name": "block0__special-op-name", "op": { "stmt": "select * from ks1.tb1;" }, "tags": { "block": "block0", - "name": "block0--special-op-name" + "name": "block0__special-op-name" } } ] @@ -93,14 +93,14 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "field1": "select * from ks1.tb1;", "field2": "field 2 value" }, "tags": { "block": "block0", - "name": "block0--op1" + "name": "block0__op1" } } ] @@ -139,14 +139,14 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "field1": "select * from ks1.tb1;", "field2": "field 2 value" }, "tags": { "block": "block0", - "name": "block0--op1" + "name": "block0__op1" } } ] @@ -188,7 +188,7 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "field1": "select * from ks1.tb1;", "field2": "field 2 value" @@ -198,7 +198,7 @@ ops: }, "tags": { "block": "block0", - "name": "block0--op1" + "name": "block0__op1" } } ] @@ -240,7 +240,7 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "field1": "select * from ks1.tb1;", "field2": "field 2 value" @@ -250,7 +250,7 @@ ops: }, "tags": { "block": "block0", - "name": "block0--op1" + "name": "block0__op1" } } ] @@ -297,7 +297,7 @@ ops: [ { - "name": "block0--op1", + "name": "block0__op1", "op": { "field1": "select * from ks1.tb1;", "field2": "field 2 value" @@ -307,7 +307,7 @@ ops: }, "tags": { "block": "block0", - "name": "block0--op1" + "name": "block0__op1" } } ] @@ -345,13 +345,13 @@ ops: "my test op" "pname": "pvalue" }, "tags": { - "name": "block0--stmt1", + "name": "block0__stmt1", "block": "block0" }, "op": { "stmt": "my test op" }, - "name": "block0--stmt1" + "name": "block0__stmt1" } ] ``` @@ -394,13 +394,13 @@ blocks: "pname": "pvalue" }, "tags": { - "name": "block1--stmt1", + "name": "block1__stmt1", "block": "block1" }, "op": { "stmt": "my test op" }, - "name": "block1--stmt1" + "name": "block1__stmt1" } ] ``` @@ -450,13 +450,13 @@ blocks: "pname": "pvalue" }, "tags": { - "name": "block1--op1", + "name": "block1__op1", "block": "block1" }, "op": { "stmt": "my test op" }, - "name": "block1--op1" + "name": "block1__op1" } ] ``` @@ -511,7 +511,7 @@ blocks: [ { "tags": { - "name": "block1--op1", + "name": "block1__op1", "block": "block1" }, "op": { @@ -520,7 +520,7 @@ blocks: "pname": "pvalue" } }, - "name": "block1--op1" + "name": "block1__op1" } ] ``` @@ -573,23 +573,23 @@ blocks: [ { "tags": { - "name": "block1--op1", + "name": "block1__op1", "block": "block1" }, "op": { "stmt": "my test op" }, - "name": "block1--op1" + "name": "block1__op1" }, { "tags": { - "name": "block1--params", + "name": "block1__params", "block": "block1" }, "op": { "pname": "pvalue" }, - "name": "block1--params" + "name": "block1__params" } ] ```