Fix ReversedType(DateType) mapping to native protocol patch by Karl Rieb; reviewed by Aleksey Yeschenko for CASSANDRA-7576
Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f6e108e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f6e108e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f6e108e Branch: refs/heads/trunk Commit: 4f6e108e146f5226a6a20ad83fb5c46c7d18d046 Parents: 465d520 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jul 22 01:42:24 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Jul 24 20:33:49 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/transport/DataType.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f6e108e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 78b0186..7117a77 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,8 @@ (CASSANDRA-7578) * Fix cqlsh display when zero rows are returned (CASSANDRA-7580) * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572) +Merged from 2.0: + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) 2.1.0-rc4 http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f6e108e/src/java/org/apache/cassandra/transport/DataType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/DataType.java b/src/java/org/apache/cassandra/transport/DataType.java index 0710645..a45d7ce 100644 --- a/src/java/org/apache/cassandra/transport/DataType.java +++ b/src/java/org/apache/cassandra/transport/DataType.java @@ -202,8 +202,9 @@ public enum DataType implements OptionCodec.Codecable<DataType> // 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);