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:43 UTC
[1/2] git commit: Add sub-ms precision formats to the timestamp parser
Updated Branches:
refs/heads/trunk 5bbcaa4da -> dc956751f
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/trunk
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"
};
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc956751
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc956751
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc956751
Branch: refs/heads/trunk
Commit: dc956751f8338acd049cfc85c7d67032fdba136e
Parents: 5bbcaa4 9aebf9d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sun Nov 24 21:23:47 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sun Nov 24 21:23:47 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/dc956751/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3fdb8e7,46f592e..eb0bc91
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,7 +1,23 @@@
+2.1
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+
+
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