Merge pull request #281 from jeromatron/main

Changed the schema creation to cql to be consistent with cql baselines.

driver-http/src/main/resources/activities/baselines/http-keyvalue.yaml

@@ -1,4 +1,4 @@
-# nb -v run driver=http yaml=http-keyvalue tags=phase:schema stargate_host=my_stargate_host auth_token=$AUTH_TOKEN
+# nb -v run driver=http yaml=http-keyvalue tags=phase:schema stargate_host=my_stargate_host host=my_stargate_host auth_token=$AUTH_TOKEN
 description: |
   This workload emulates a key-value data model and access patterns.
   This should be identical to the cql variant except for:
@@ -7,7 +7,7 @@ description: |
 
 scenarios:
   default:
-    - run driver=http tags==phase:schema threads==1 cycles==UNDEF
+    - run driver=cql tags==phase:schema threads==1 cycles==UNDEF
     - run driver=http tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
     - run driver=http tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
 bindings:
@@ -23,42 +23,21 @@ blocks:
   - name: schema
     tags:
       phase: schema
+    params:
+      prepared: false
     statements:
-      - create-keyspace: POST http://<<stargate_host:stargate>>:<<stargate_port:8082>>/v2/schemas/keyspaces
+      - create-keyspace: |
-        Accept: "application/json"
+          create keyspace if not exists <<keyspace:baselines>>
-        X-Cassandra-Request-Id: "{request_id}"
+          WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '<<rf:1>>'}
-        X-Cassandra-Token: "<<auth_token:my_auth_token>>"
+          AND durable_writes = true;
-        Content-Type: "application/json"
-        body: |
-          {
-            "name": "<<keyspace:baselines>>"
-          }
         tags:
           name: create-keyspace
-      - create-table: POST http://<<stargate_host:stargate>>:<<stargate_port:8082>>/v2/schemas/keyspaces/<<keyspace:baselines>>/tables
+      - create-table: |
-        Accept: "application/json"
+          create table if not exists <<keyspace:baselines>>.<<table:keyvalue>> (
-        X-Cassandra-Request-Id: "{request_id}"
+          key text,
-        X-Cassandra-Token: "<<auth_token:my_auth_token>>"
+           value text,
-        Content-Type: "application/json"
+           PRIMARY KEY (key)
-        body: |
+          );
-          {
-            "name": "<<table:keyvalue>>",
-            "columnDefinitions":
-              [
-                {
-                  "name": "key",
-                  "typeDefinition": "text"
-                },
-                {
-                  "name": "value",
-                  "typeDefinition": "text"
-                }
-              ],
-            "primaryKey":
-            {
-              "partitionKey": ["key"]
-            }
-          }
         tags:
           name: create-table
   - name: rampup

driver-http/src/main/resources/activities/baselines/http-tabular.yaml

@@ -1,4 +1,4 @@
-# nb -v http-tabular rampup-cycles=1E6 main-cycles=1E9 stargate_host=my_stargate_host auth_token=$AUTH_TOKEN
+# nb -v http-tabular rampup-cycles=1E6 main-cycles=1E9 stargate_host=my_stargate_host host=my_stargate_host auth_token=$AUTH_TOKEN
 description: |
   This workload emulates a time-series data model and access patterns.
   This should be identical to the cql variant except for:
@@ -8,7 +8,7 @@ description: |
 
 scenarios:
   default:
-    - run driver=http tags==phase:schema threads==1 cycles==UNDEF
+    - run driver=cql tags==phase:schema threads==1 cycles==UNDEF
     - run driver=http tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
     - run driver=http tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
 bindings:
@@ -31,47 +31,22 @@ blocks:
   - name: schema
     tags:
       phase: schema
+    params:
+      prepared: false
     statements:
-      - create-keyspace: POST http://<<stargate_host:stargate>>:<<stargate_port:8082>>/v2/schemas/keyspaces
+      - create-keyspace: |
-        Accept: "application/json"
+          create keyspace if not exists <<keyspace:baselines>>
-        X-Cassandra-Request-Id: "{request_id}"
+          WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '<<rf:1>>'}
-        X-Cassandra-Token: "<<auth_token:my_auth_token>>"
+          AND durable_writes = true;
-        Content-Type: "application/json"
-        body: |
-          {
-            "name": "<<keyspace:baselines>>"
-          }
         tags:
           name: create-keyspace
-      - create-table: POST http://<<stargate_host:stargate>>:<<stargate_port:8082>>/v2/schemas/keyspaces/<<keyspace:baselines>>/tables
+      - create-table: |
-        Accept: "application/json"
+          create table if not exists <<keyspace:baselines>>.<<table:tabular>> (
-        X-Cassandra-Request-Id: "{request_id}"
+           part text,
-        X-Cassandra-Token: "<<auth_token:my_auth_token>>"
+           clust text,
-        Content-Type: "application/json"
+           data text,
-        body: |
+           PRIMARY KEY (part,clust)
-          {
+          );
-            "name": "<<table:tabular>>",
-            "columnDefinitions":
-              [
-                {
-                  "name": "part",
-                  "typeDefinition": "text"
-                },
-                {
-                  "name": "clust",
-                  "typeDefinition": "text"
-                },
-                {
-                  "name": "data",
-                  "typeDefinition": "text"
-                }
-              ],
-            "primaryKey":
-            {
-              "partitionKey": ["part"],
-              "clusteringKey": ["clust"]
-            }
-          }
         tags:
           name: create-table
   - name: rampup