From ff211a4c445cd74859aabf00f3ec81a5e69473f2 Mon Sep 17 00:00:00 2001 From: Aleksey Yeschenko Date: Tue, 22 Jul 2014 01:42:24 +0300 Subject: [PATCH 1/2] Fix ReversedType(DateType) mapping to native protocol patch by Ben Hood; reviewed by Aleksey Yeschenko for CASSANDRA-7576 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/DataType.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index d3393095d3..9909760462 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541) * Fix range merging when DES scores are zero (CASSANDRA-7535) * Warn when SSL certificates have expired (CASSANDRA-7528) diff --git a/src/java/org/apache/cassandra/transport/DataType.java b/src/java/org/apache/cassandra/transport/DataType.java index 1656d24346..8cd7194073 100644 --- a/src/java/org/apache/cassandra/transport/DataType.java +++ b/src/java/org/apache/cassandra/transport/DataType.java @@ -146,8 +146,9 @@ public enum DataType implements OptionCodec.Codecable // shouldn't have to care about it. if (type instanceof ReversedType) type = ((ReversedType)type).baseType; + // For compatibility sake, we still return DateType as the timestamp type in resultSet metadata (#5723) - else if (type instanceof DateType) + if (type instanceof DateType) type = TimestampType.instance; DataType dt = dataTypeMap.get(type); From 9906a4e5de083b3d23d4e2b68c2bf1736405d878 Mon Sep 17 00:00:00 2001 From: Tyler Hobbs Date: Tue, 22 Jul 2014 11:59:53 -0500 Subject: [PATCH 2/2] Ninja: add note about CQL2 removal to CQL2 docs --- doc/cql/CQL.textile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/cql/CQL.textile b/doc/cql/CQL.textile index 1cfe8834f9..a874a29adf 100644 --- a/doc/cql/CQL.textile +++ b/doc/cql/CQL.textile @@ -2,6 +2,8 @@ h1. Cassandra Query Language (CQL) v2.0 +%{color:red}NOTICE%: CQL 2 has been deprecated since Cassandra 2.0, and will be removed in Cassandra 3.0. It is recommended that you upgrade to CQL 3, which has much better driver support and many new features. For further reading, see the "CQL 3 documentation":http://cassandra.apache.org/doc/cql3/CQL.html and the "CQL 3 drivers":http://wiki.apache.org/cassandra/ClientOptions. + h2. Table of Contents {toc}