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/12/18 20:11:16 UTC
[1/2] git commit: Update docs, bump CQL3 version,
correct CHANGES.txt for CASSANDRA-6395
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 <al...@apache.org>
Authored: Wed Dec 18 22:07:13 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
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();
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1152e4b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1152e4b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1152e4b3
Branch: refs/heads/trunk
Commit: 1152e4b3924603106313130ca396e9d0027a6b5e
Parents: d365faa 21bb531
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Dec 18 22:10:39 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Dec 18 22:10:39 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
doc/cql3/CQL.textile | 10 +++++++++-
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1152e4b3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 08e96fb,b876204..7074d2a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,3 +1,25 @@@
+2.1
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * 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, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine (CASSANDRA-5417)
++ * Add snapshot space used to cfstats (CASSANDRA-6231)
+
+
2.0.4
* Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
* Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1152e4b3/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------