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/08/10 02:43:00 UTC

[1/3] git commit: Correct timestamp formatting in CQL3 doc

Updated Branches:
  refs/heads/cassandra-2.0 9abead4ca -> 27ccae882


Correct timestamp formatting in CQL3 doc


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a837937
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a837937
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a837937

Branch: refs/heads/cassandra-2.0
Commit: 2a8379372e6cbcd2fa3008b203c70f57ad29f392
Parents: fd14512
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:41:58 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:41:58 2013 +0200

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a837937/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 532d341..22248ef 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -611,8 +611,8 @@ SELECT name, occupation FROM users WHERE userid IN (199, 200, 207);
 SELECT time, value
 FROM events
 WHERE event_type = 'myEvent'
-  AND time > 2011-02-03
-  AND time <= 2012-01-01
+  AND time > '2011-02-03'
+  AND time <= '2012-01-01'
 
 SELECT COUNT(*) FROM users;
 p. 
@@ -646,13 +646,13 @@ CREATE TABLE posts (
 The following query is allowed:
 
 bc(sample). 
-SELECT entry_title, content FROM posts WHERE userid='john doe' AND blog_title='John's Blog' AND posted_at >= 2012-01-01 AND posted_at < 2012-01-31
+SELECT entry_title, content FROM posts WHERE userid='john doe' AND blog_title='John's Blog' AND posted_at >= '2012-01-01' AND posted_at < '2012-01-31'
 
 But the following one is not, as it does not select a contiguous set of rows (and we suppose no secondary indexes are set):
 
 bc(sample). 
 // Needs a blog_title to be set to select ranges of posted_at
-SELECT entry_title, content FROM posts WHERE userid='john doe' AND posted_at >= 2012-01-01 AND posted_at < 2012-01-31
+SELECT entry_title, content FROM posts WHERE userid='john doe' AND posted_at >= '2012-01-01' AND posted_at < '2012-01-31'
 
 When specifying relations, the @TOKEN@ function can be used on the @PARTITION KEY@ column to query. In that case, rows will be selected based on the token of their @PARTITION_KEY@ rather than on the value. Note that the token of a key depends on the partitioner in use, and that in particular the RandomPartitioner won't yeld a meaningful order. Also note that ordering partitioners always order token values by bytes (so even if the partition key is of type int, @token(-1) > token(0)@ in particular). Example:
 


[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0

Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/298e91df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/298e91df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/298e91df

Branch: refs/heads/cassandra-2.0
Commit: 298e91df73d752c7a0bf412dcd72d0076dab9c95
Parents: 5a9dd3d 2a83793
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:42:25 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:42:25 2013 +0200

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/298e91df/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index ece3a2d,22248ef..ba90994
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -630,13 -611,10 +630,13 @@@ SELECT name AS user_name, occupation A
  SELECT time, value
  FROM events
  WHERE event_type = 'myEvent'
-   AND time > 2011-02-03
-   AND time <= 2012-01-01
+   AND time > '2011-02-03'
+   AND time <= '2012-01-01'
  
  SELECT COUNT(*) FROM users;
 +
 +SELECT COUNT(*) AS user_count FROM users;
 +
  p. 
  The @SELECT@ statements reads one or more columns for one or more rows in a table. It returns a result-set of rows, where each row contains the collection of columns corresponding to the query.
  


[3/3] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0

Posted by al...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27ccae88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ccae88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27ccae88

Branch: refs/heads/cassandra-2.0
Commit: 27ccae88200073289e40a4569a046f4743b7f309
Parents: 9abead4 298e91d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 10 02:42:51 2013 +0200
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 10 02:42:51 2013 +0200

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------