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:01 UTC
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
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.