From f77a7a29e8bbfc647dd69d42d2fa33ff6de765a5 Mon Sep 17 00:00:00 2001 From: Bereng Date: Tue, 21 Jun 2022 11:34:51 +0200 Subject: [PATCH] Update the CQL version for the 4.1 release Patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-17570 --- README.asc | 2 +- doc/modules/cassandra/pages/cql/changes.adoc | 10 ++++++++++ doc/modules/cassandra/pages/new/virtualtables.adoc | 4 ++-- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/README.asc b/README.asc index 3c40bf4970..f484aa277e 100644 --- a/README.asc +++ b/README.asc @@ -39,7 +39,7 @@ be sitting in front of a prompt: ---- Connected to Test Cluster at localhost:9160. -[cqlsh 6.0.0 | Cassandra 4.0.2 | CQL spec 3.4.5 | Native protocol v5] +[cqlsh 6.0.0 | Cassandra 4.1 | CQL spec 3.4.6 | Native protocol v5] Use HELP for help. cqlsh> ---- diff --git a/doc/modules/cassandra/pages/cql/changes.adoc b/doc/modules/cassandra/pages/cql/changes.adoc index 1f89469a32..df99a39ef6 100644 --- a/doc/modules/cassandra/pages/cql/changes.adoc +++ b/doc/modules/cassandra/pages/cql/changes.adoc @@ -2,6 +2,16 @@ The following describes the changes in each version of CQL. +== 3.4.6 + +* Add support for IF EXISTS and IF NOT EXISTS in ALTER statements (`16916`) +* Allow GRANT/REVOKE multiple permissions in a single statement (`17030`) +* Pre hashed passwords in CQL (`17334`) +* Add support for type casting in WHERE clause components and in the values of INSERT/UPDATE statements (`14337`) +* Add support for CONTAINS and CONTAINS KEY in conditional UPDATE and DELETE statement (`10537`) +* Allow to grant permission for all tables in a keyspace (`17027`) +* Allow to aggregate by time intervals (`11871`) + == 3.4.5 * Adds support for arithmetic operators (`11935`) diff --git a/doc/modules/cassandra/pages/new/virtualtables.adoc b/doc/modules/cassandra/pages/new/virtualtables.adoc index 3e612580ba..7a7a4befa7 100644 --- a/doc/modules/cassandra/pages/new/virtualtables.adoc +++ b/doc/modules/cassandra/pages/new/virtualtables.adoc @@ -124,7 +124,7 @@ cqlsh> SELECT * FROM system_views.clients; ------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- address | 127.0.0.1 port | 50687 - client_options | {'CQL_VERSION': '3.4.5', 'DRIVER_NAME': 'DataStax Python Driver', 'DRIVER_VERSION': '3.25.0'} + client_options | {'CQL_VERSION': '3.4.6', 'DRIVER_NAME': 'DataStax Python Driver', 'DRIVER_VERSION': '3.25.0'} connection_stage | ready driver_name | DataStax Python Driver driver_version | 3.25.0 @@ -140,7 +140,7 @@ cqlsh> SELECT * FROM system_views.clients; ------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- address | 127.0.0.1 port | 50688 - client_options | {'CQL_VERSION': '3.4.5', 'DRIVER_NAME': 'DataStax Python Driver', 'DRIVER_VERSION': '3.25.0'} + client_options | {'CQL_VERSION': '3.4.6', 'DRIVER_NAME': 'DataStax Python Driver', 'DRIVER_VERSION': '3.25.0'} connection_stage | ready driver_name | DataStax Python Driver driver_version | 3.25.0 diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index f0a0a7425f..64a075ba04 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -79,7 +79,7 @@ import static org.apache.cassandra.utils.Clock.Global.nanoTime; public class QueryProcessor implements QueryHandler { - public static final CassandraVersion CQL_VERSION = new CassandraVersion("3.4.5"); + public static final CassandraVersion CQL_VERSION = new CassandraVersion("3.4.6"); // See comments on QueryProcessor #prepare public static final CassandraVersion NEW_PREPARED_STATEMENT_BEHAVIOUR_SINCE_30 = new CassandraVersion("3.0.26");