You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/11/24 19:24:17 UTC
git commit: Add sub-ms precision formats to the timestamp parser
Updated Branches:
refs/heads/cassandra-2.0 9ebb09182 -> 9aebf9daf
Add sub-ms precision formats to the timestamp parser
patch by Lorcan Coyle; reviewed by Aleksey Yeschenko for CASSANDRA-6395
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9aebf9da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aebf9da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9aebf9da
Branch: refs/heads/cassandra-2.0
Commit: 9aebf9daf81b6888db99a3439733aa8b52dcc001
Parents: 9ebb091
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Nov 24 21:22:49 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Nov 24 21:22:49 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/serializers/TimestampSerializer.java | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aebf9da/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 77d2841..46f592e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
2.0.4
* Fix divide-by-zero in PCI (CASSANDRA-6403)
* Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
2.0.3
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aebf9da/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
index 77bd59a..6203427 100644
--- a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
@@ -30,10 +30,14 @@ public class TimestampSerializer implements TypeSerializer<Date>
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd HH:mmZ",
"yyyy-MM-dd HH:mm:ssZ",
+ "yyyy-MM-dd HH:mm:ss.SSS",
+ "yyyy-MM-dd HH:mm:ss.SSSZ",
"yyyy-MM-dd'T'HH:mm",
"yyyy-MM-dd'T'HH:mmZ",
"yyyy-MM-dd'T'HH:mm:ss",
"yyyy-MM-dd'T'HH:mm:ssZ",
+ "yyyy-MM-dd'T'HH:mm:ss.SSS",
+ "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
"yyyy-MM-dd",
"yyyy-MM-ddZ"
};