Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/serializers/TimestampSerializer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e35f84e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e35f84e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e35f84e Branch: refs/heads/cassandra-3.0 Commit: 8e35f84e93e96be6c8d893a7d396c9ef6d4919fd Parents: adc9a24 ebbd516 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Dec 21 19:26:12 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Dec 21 19:26:12 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/marshal/DateType.java | 2 +- .../apache/cassandra/db/marshal/TimestampType.java | 2 +- .../cassandra/serializers/TimestampSerializer.java | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e35f84e/src/java/org/apache/cassandra/db/marshal/DateType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e35f84e/src/java/org/apache/cassandra/db/marshal/TimestampType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e35f84e/src/java/org/apache/cassandra/serializers/TimestampSerializer.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/serializers/TimestampSerializer.java index 01a85e0,78ee7e7..ad56cd5 --- a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java +++ b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java @@@ -97,19 -96,14 +97,27 @@@ public class TimestampSerializer implem } }; + private static final String UTC_FORMAT = dateStringPatterns[40]; + private static final ThreadLocal<SimpleDateFormat> FORMATTER_UTC = new ThreadLocal<SimpleDateFormat>() + { + protected SimpleDateFormat initialValue() + { + SimpleDateFormat sdf = new SimpleDateFormat(UTC_FORMAT); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + return sdf; + } + }; ++ + private static final ThreadLocal<SimpleDateFormat> FORMATTER_TO_JSON = new ThreadLocal<SimpleDateFormat>() + { + protected SimpleDateFormat initialValue() + { + return new SimpleDateFormat(dateStringPatterns[15]); + } + }; + - public static final SimpleDateFormat TO_JSON_FORMAT = new SimpleDateFormat(dateStringPatterns[15]); + + public static final TimestampSerializer instance = new TimestampSerializer(); public Date deserialize(ByteBuffer bytes)