Updated Branches: refs/heads/trunk d365faab0 -> 1152e4b39
Update docs, bump CQL3 version, correct CHANGES.txt 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/21bb5314 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21bb5314 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21bb5314 Branch: refs/heads/trunk Commit: 21bb5314603eb4b4f2b23aca82dca29ebfd7b4f4 Parents: 1727ea7 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Dec 18 22:07:13 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Dec 18 22:07:13 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- doc/cql3/CQL.textile | 10 +++++++++- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21bb5314/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 10c9c33..b876204 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,7 +8,7 @@ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) * 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) + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395) * Expose a total memtable size metric for a CF (CASSANDRA-6391) * cqlsh: handle symlinks properly (CASSANDRA-6425) * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) http://git-wip-us.apache.org/repos/asf/cassandra/blob/21bb5314/doc/cql3/CQL.textile ---------------------------------------------------------------------- diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile index 047da68..f31c65a 100644 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@ -1,6 +1,6 @@ <link rel="StyleSheet" href="CQL.css" type="text/css" media="screen"> -h1. Cassandra Query Language (CQL) v3.1.2 +h1. Cassandra Query Language (CQL) v3.1.3 <span id="tableOfContents"> @@ -804,15 +804,19 @@ They can also be input as string literals in any of the following ISO 8601 forma * @2011-02-03 04:05+0000@ * @2011-02-03 04:05:00+0000@ +* @2011-02-03 04:05:00.000+0000@ * @2011-02-03T04:05+0000@ * @2011-02-03T04:05:00+0000@ +* @2011-02-03T04:05:00.000+0000@ The @+0000@ above is an RFC 822 4-digit time zone specification; @+0000@ refers to GMT. US Pacific Standard Time is @-0800@. The time zone may be omitted if desired-- the date will be interpreted as being in the time zone under which the coordinating Cassandra node is configured. * @2011-02-03 04:05@ * @2011-02-03 04:05:00@ +* @2011-02-03 04:05:00.000@ * @2011-02-03T04:05@ * @2011-02-03T04:05:00@ +* @2011-02-03T04:05:00.000@ There are clear difficulties inherent in relying on the time zone configuration being as expected, though, so it is recommended that the time zone always be specified for timestamps when feasible. @@ -1098,6 +1102,10 @@ h2(#changes). Changes The following describes the addition/changes brought for each version of CQL. +h3. 3.1.3 + +* Millisecond precision formats have been added to the timestamp parser (see "working with dates":#usingdates). + h3. 3.1.2 * @NaN@ and @Infinity@ has been added as valid float contants. They are now reserved keywords. In the unlikely case you we using them as a column identifier (or keyspace/table one), you will noew need to double quote them (see "quote identifiers":#identifiers). http://git-wip-us.apache.org/repos/asf/cassandra/blob/21bb5314/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index 335da4b..ad3c4b4 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -44,7 +44,7 @@ import org.apache.cassandra.utils.SemanticVersion; public class QueryProcessor { - public static final SemanticVersion CQL_VERSION = new SemanticVersion("3.1.2"); + public static final SemanticVersion CQL_VERSION = new SemanticVersion("3.1.3"); private static final Logger logger = LoggerFactory.getLogger(QueryProcessor.class); private static final MemoryMeter meter = new MemoryMeter();
