From 6bd253e794bb107c03b40a751158235557b65f60 Mon Sep 17 00:00:00 2001
From: Madhavan Sridharan <madhavan.sridharan@datastax.com>
Date: Tue, 9 Jan 2024 15:55:08 -0500
Subject: [PATCH 1/2] Fix the cql_alltypes workload

---
 .../test/resources/testschemas/cql_alltypes.yaml   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml b/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml
index 82498b886..9d42d7af5 100644
--- a/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml
+++ b/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml
@@ -23,9 +23,9 @@ bindings:
   boolean: ToBoolean();
   date: EpochMillisToJavaLocalDate();
   decimal: ToBigDecimal();
-  double: ToDouble()
+  double: HashRange(0.0,1.0);
   duration: ToCqlDurationNanos();
-  float: ToFloat()
+  float: HashRange(0.0,1.0); DoubleToFloat();
   frozen<list<int>>: ListSizedHashed(HashRange(3,7),ToInt()));
   list<text>: ListStepped(NumberNameToString(),NumberNameToString())
   map<text,text>: MapSized(3, Combinations('A-Z;0-9'), NumberNameToString(), ToString());
@@ -47,11 +47,7 @@ blocks:
     ops:
       create-keyspace-ks_00001:
         simple: |
-          create keyspace ks_00001
-          with replication = {'class': 'SimpleStrategy',
-          'replication_factor': 'TEMPLATE(rf:1)'
-          }
-           and durable writes = false;
+          create keyspace IF NOT EXISTS ks_00001 with replication = {'class': 'SimpleStrategy','replication_factor': 'TEMPLATE(rf,1)'};
   schema-tables:
     params:
       timeout: 60.0
@@ -150,7 +146,7 @@ blocks:
       timeout: 30.0
     ops:
       scan-tb_00001-table-tb_00001:
-        prepared: "select * from ks_00001.tb_00001\nwhere \n LIMIT 10;\n"
+        prepared: "select * from ks_00001.tb_00001 LIMIT 10;"
         ratio: 1
   main-update:
     params:
@@ -159,7 +155,7 @@ blocks:
       update-tb_00001-table-tb_00001:
         prepared: |
           update ks_00001.tb_00001
-          set col_00001={text}, col_00002={bigint}, col_00003={blob}, col_00004={boolean}, col_00005={date}, col_00006={decimal}, col_00007={double}, col_00008={duration}, col_00009={float}, col_00010={frozen<list<int>>}, col_00011={list<text>}, col_00012={map<text,text>}, col_00013={set<text>}, col_00014={smallint}, col_00015={text}, col_00016={time}, col_00017={timestamp}, col_00018={timeuuid}, col_00019={tinyint}, col_00020={uuid}, col_00021={text}, col_00022={varint}, col_00023={ascii}, col_00024={inet}, col_00025={int}
+          set col_00002={bigint}, col_00003={blob}, col_00004={boolean}, col_00005={date}, col_00006={decimal}, col_00007={double}, col_00008={duration}, col_00009={float}, col_00010={frozen<list<int>>}, col_00011={list<text>}, col_00012={map<text,text>}, col_00013={set<text>}, col_00014={smallint}, col_00015={text}, col_00016={time}, col_00017={timestamp}, col_00018={timeuuid}, col_00019={tinyint}, col_00020={uuid}, col_00021={text}, col_00022={varint}, col_00023={ascii}, col_00024={inet}, col_00025={int}
           where col_00001={text};
         ratio: 1
 params:

From 8871abbeff474a5d34aca0b2ce0e53d234602c88 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Wed, 10 Jan 2024 15:59:20 +0000
Subject: [PATCH 2/2] fix: upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.610
 to 1.12.621

Snyk has created this PR to upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.610 to 1.12.621.

See this package in Maven Repository:
https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3/

See this project in Snyk:
https://app.snyk.io/org/nosqlbench/project/024e32ec-7f80-485c-b7bf-f69d45f933ce?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 mvn-defaults/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 087d517cb..721034067 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -290,7 +290,7 @@
             <dependency>
                 <groupId>com.amazonaws</groupId>
                 <artifactId>aws-java-sdk-s3</artifactId>
-                <version>1.12.610</version>
+                <version>1.12.621</version>
             </dependency>
             <dependency>
                 <groupId>com.elega9t</groupId>