Merge branch 'master' of https://github.com/nosqlbench/nosqlbench

# Conflicts:
#	driver-cql-shaded/src/main/resources/activities/baselines/cql-iot.yaml
#	driver-cql-shaded/src/main/resources/activities/baselines/cql-keyvalue.yaml
#	driver-cql-shaded/src/main/resources/activities/baselines/cql-tabular.yaml

driver-cql-shaded/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.nosqlbench</groupId>
         <artifactId>mvn-defaults</artifactId>
-        <version>3.12.118-SNAPSHOT</version>
+        <version>3.12.119-SNAPSHOT</version>
         <relativePath>../mvn-defaults</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>engine-api</artifactId>
-            <version>3.12.118-SNAPSHOT</version>
+            <version>3.12.119-SNAPSHOT</version>
         </dependency>
 
         <dependency>

driver-cql-shaded/src/main/resources/activities/baselines/cql-iot.yaml

@@ -7,7 +7,10 @@ scenarios:
     schema: run driver=cql tags==phase:schema threads==1 cycles==UNDEF
     rampup: run driver=cql tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
     main: run driver=cql tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
-
+  astra:
+    schema: run driver=cql tags==phase:schema-astra threads==1 cycles==UNDEF
+    rampup: run driver=cql tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
+    main: run driver=cql tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
 params:
   instrument: TEMPLATE(instrument,false)
 bindings:
@@ -52,6 +55,23 @@ blocks:
          truncate table <<keyspace:baselines>>.<<table:iot>>;
        tags:
          name: truncate-table
+  - tags:
+      phase: schema-astra
+    params:
+      prepared: false
+    statements:
+     - create-table-astra : |
+        create table if not exists <<keyspace:baselines>>.<<table:iot>> (
+        machine_id UUID,     // source machine
+        sensor_name text,    // sensor name
+        time timestamp,      // timestamp of collection
+        sensor_value double, //
+        station_id UUID,     // source location
+        data text,
+        PRIMARY KEY ((machine_id, sensor_name), time)
+        ) WITH CLUSTERING ORDER BY (time DESC);
+       tags:
+         name: create-table-astra
   - tags:
       phase: rampup
     params:

driver-cql-shaded/src/main/resources/activities/baselines/cql-keyvalue.yaml

@@ -4,6 +4,10 @@ scenarios:
     schema: run driver=cql tags==phase:schema threads==1 cycles==UNDEF
     rampup: run driver=cql tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
     main: run driver=cql tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
+  astra:
+    schema: run driver=cql tags==phase:schema-astra threads==1 cycles==UNDEF
+    rampup: run driver=cql tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
+    main: run driver=cql tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
 
 bindings:
   seq_key: Mod(<<keycount:1000000000>>); ToString() -> String
@@ -32,6 +36,20 @@ blocks:
         );
       tags:
         name: create-table
+  - name: schema-astra
+    tags:
+      phase: schema-astra
+    params:
+      prepared: false
+    statements:
+    - create-table: |
+        create table if not exists <<keyspace:baselines>>.<<table:keyvalue>> (
+        key text,
+         value text,
+         PRIMARY KEY (key)
+        );
+      tags:
+        name: create-table-astra
   - name: rampup
     tags:
       phase: rampup

driver-cql-shaded/src/main/resources/activities/baselines/cql-tabular.yaml

@@ -4,6 +4,11 @@ scenarios:
     schema: run driver=cql tags==phase:schema threads==1 cycles==UNDEF
     rampup: run driver=cql tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
     main: run driver=cql tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
+  astra:
+    schema: run driver=cql tags==phase:schema-astra threads==1 cycles==UNDEF
+    rampup: run driver=cql tags==phase:rampup cycles===TEMPLATE(rampup-cycles,10000000) threads=auto
+    main: run driver=cql tags==phase:main cycles===TEMPLATE(main-cycles,10000000) threads=auto
+
 bindings:
   # for ramp-up and verify
   part_layout: Div(<<partsize:1000000>>); ToString() -> String
@@ -40,6 +45,21 @@ blocks:
         );
       tags:
         name: create-table
+  - name: schema-astra
+    tags:
+      phase: schema-astra
+    params:
+      prepared: false
+    statements:
+    - create-table: |
+        create table if not exists <<keyspace:baselines>>.<<table:tabular>> (
+         part text,
+         clust text,
+         data text,
+         PRIMARY KEY (part,clust)
+        );
+      tags:
+        name: create-table-astra
   - name: rampup
     tags:
       phase: rampup