cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/2] cassandra git commit: Add collections, tuple, and UDT to JSON type documentation
Date Fri, 12 Jun 2015 18:41:11 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk c2e54ddc3 -> 40c3e8922


Add collections, tuple, and UDT to JSON type documentation

These were accidentally omitted when the docs were first written for
CASSANDRA-7970.


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

Branch: refs/heads/trunk
Commit: a5be8f199150c5f7a7ad9df3babad1bf950dd4b3
Parents: 271c9e4
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Jun 12 13:39:44 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Jun 12 13:39:44 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5be8f19/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 3755a2d..69c6032 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1972,10 +1972,15 @@ Where possible, Cassandra will represent and accept data types in
their native @
 |@float@    |integer, float, string|float            |String must be valid integer or float|
 |@inet@     |string                |string           |IPv4 or IPv6 address|
 |@int@      |integer, string       |integer          |String must be valid 32 bit integer|
+|@list@     |list, string          |list             |Uses JSON's native list representation|
+|@map@      |map, string           |map              |Uses JSON's native map representation|
+|@set@      |list, string          |list             |Uses JSON's native list representation|
 |@text@     |string                |string           |Uses JSON's @\u@ character escape|
 |@time@     |string                |string           |Time of day in format @HH-MM-SS[.fffffffff]@|
 |@timestamp@|integer, string       |string           |A timestamp. Strings constant are allow
to input timestamps as dates, see "Working with dates":#usingdates below for more information.
 Datestamps with format @YYYY-MM-DD HH:MM:SS.SSS@ are returned.|
 |@timeuuid@ |string                |string           |Type 1 UUID. See "Constants":#constants
for the UUID format|
+|@tuple@    |list, string          |list             |Uses JSON's native list representation|
+|@UDT@      |map, string           |map              |Uses JSON's native map representation
with field names as keys|
 |@uuid@     |string                |string           |See "Constants":#constants for the
UUID format|
 |@varchar@  |string                |string           |Uses JSON's @\u@ character escape|
 |@varint@   |integer, string       |integer          |Variable length; may overflow 32 or
64 bit integers in client-side decoder|


Mime
View raw message