Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 3d2da7987 -> f9af6ab58
Fix ReversedType(DateType) mapping to native protocol patch by Ben Hood; reviewed by Aleksey Yeschenko for CASSANDRA-7576 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff211a4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff211a4c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff211a4c Branch: refs/heads/cassandra-2.1 Commit: ff211a4c445cd74859aabf00f3ec81a5e69473f2 Parents: 8754809 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jul 22 01:42:24 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jul 22 01:42:24 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/DataType.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff211a4c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d339309..9909760 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff211a4c/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 1656d24..8cd7194 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<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);
