You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/07/09 18:55:21 UTC
[1/2] cassandra git commit: Clarify CQL literal handling of JSON in
CQL3 docs
Repository: cassandra
Updated Branches:
refs/heads/trunk 0c59c1f5b -> 55455dc65
Clarify CQL literal handling of JSON in CQL3 docs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136ffeda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136ffeda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136ffeda
Branch: refs/heads/trunk
Commit: 136ffeda7399f8c1dbbac1f33ddd034b00172c74
Parents: af1c658
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Jul 9 11:54:11 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Jul 9 11:54:11 2015 -0500
----------------------------------------------------------------------
doc/cql3/CQL.textile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/136ffeda/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index ca09627..773ff91 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -2000,7 +2000,9 @@ Any columns which are ommitted from the @JSON@ map will be defaulted to a @NULL@
h3(#jsonEncoding). JSON Encoding of Cassandra Data Types
-Where possible, Cassandra will represent and accept data types in their native @JSON@ representation. Cassandra will also accept string representations matching the CQL literal format for all data types. The following table describes the encodings that Cassandra will accept in @INSERT JSON@ values (and @fromJson()@ arguments) as well as the format Cassandra will use when returning data for @SELECT JSON@ statements (and @fromJson()@):
+Where possible, Cassandra will represent and accept data types in their native @JSON@ representation. Cassandra will also accept string representations matching the CQL literal format for all single-field types. For example, floats, ints, UUIDs, and dates can be represented by CQL literal strings. However, compound types, such as collections, tuples, and user-defined types must be represented by native @JSON@ collections (maps and lists) or a JSON-encoded string representation of the collection.
+
+The following table describes the encodings that Cassandra will accept in @INSERT JSON@ values (and @fromJson()@ arguments) as well as the format Cassandra will use when returning data for @SELECT JSON@ statements (and @fromJson()@):
|_. type |_. formats accepted |_. return format |_. notes|
|@ascii@ |string |string |Uses JSON's @\u@ character escape|
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55455dc6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55455dc6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55455dc6
Branch: refs/heads/trunk
Commit: 55455dc65043c8c07adb29c2bc1040891bd0f0ec
Parents: 0c59c1f 136ffed
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Jul 9 11:55:00 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Jul 9 11:55:00 2015 -0500
----------------------------------------------------------------------
doc/cql3/CQL.textile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------