Repository: cassandra Updated Branches: refs/heads/trunk e663ccd98 -> 76c7d02c9
Fix toDate function for timestamp arguments patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-14502 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76c7d02c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76c7d02c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76c7d02c Branch: refs/heads/trunk Commit: 76c7d02c94c735bc5e7ef6ff45d9ddc777b176dd Parents: e663ccd Author: Benjamin Lerer <[email protected]> Authored: Tue Jul 31 15:01:04 2018 +0200 Committer: Benjamin Lerer <[email protected]> Committed: Tue Jul 31 15:01:04 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/functions/TimeFcts.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c7d02c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ce70797..8afc0d6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Fix toDate function for timestamp arguments (CASSANDRA-14502) * Revert running dtests by default in circleci (CASSANDRA-14614) * Stream entire SSTables when possible (CASSANDRA-14556) * Add experimental support for Java 11 (CASSANDRA-9608) http://git-wip-us.apache.org/repos/asf/cassandra/blob/76c7d02c/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java index 881f636..f029e59 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java @@ -49,7 +49,7 @@ public abstract class TimeFcts toTimestamp(TimeUUIDType.instance), toUnixTimestamp(TimeUUIDType.instance), toUnixTimestamp(TimestampType.instance), - toDate(SimpleDateType.instance), + toDate(TimestampType.instance), toUnixTimestamp(SimpleDateType.instance), toTimestamp(SimpleDateType.instance)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
