Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FAD510634 for ; Wed, 5 Feb 2014 15:37:10 +0000 (UTC) Received: (qmail 91282 invoked by uid 500); 5 Feb 2014 15:37:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91245 invoked by uid 500); 5 Feb 2014 15:37:07 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 90989 invoked by uid 99); 5 Feb 2014 15:37:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Feb 2014 15:37:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 08C1F91C177; Wed, 5 Feb 2014 15:37:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Wed, 05 Feb 2014 15:37:06 -0000 Message-Id: <40766b941d554aeba7957d5e82ae1bbb@git.apache.org> In-Reply-To: <1839a49e810c4a9c8d97b9cf1e66cba4@git.apache.org> References: <1839a49e810c4a9c8d97b9cf1e66cba4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: Remove/update invalid sentences in CQL doc Remove/update invalid sentences in CQL doc Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16efdf4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16efdf4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16efdf4a Branch: refs/heads/cassandra-2.0 Commit: 16efdf4a0300b2499346156fd4e2a8e0785d2690 Parents: 178e086 Author: Sylvain Lebresne Authored: Wed Feb 5 16:32:24 2014 +0100 Committer: Sylvain Lebresne Committed: Wed Feb 5 16:32:24 2014 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/16efdf4a/doc/cql3/CQL.textile ---------------------------------------------------------------------- diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile index 8b6cb08..b18ce22 100644 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@ -275,8 +275,6 @@ CREATE TABLE t ( PRIMARY KEY (k) ) -Moreover, a table must define at least one column that is not part of the PRIMARY KEY as a row exists in Cassandra only if it contains at least one value for one such column. - h4(#createTablepartitionClustering). Partition key and clustering columns In CQL, the order in which columns are defined for the @PRIMARY KEY@ matters. The first column of the key is called the __partition key__. It has the property that all the rows sharing the same partition key (even across table in fact) are stored on the same physical node. Also, insertion/update/deletion on rows sharing the same partition key for a given table are performed __atomically__ and in __isolation__. Note that it is possible to have a composite partition key, i.e. a partition key formed of multiple columns, using an extra set of parentheses to define which columns forms the partition key. @@ -445,7 +443,7 @@ INSERT INTO NerdMovies (movie, director, main_actor, year) VALUES ('Serenity', 'Joss Whedon', 'Nathan Fillion', 2005) USING TTL 86400; -The @INSERT@ statement writes one or more columns for a given row in a table. Note that since a row is identified by its @PRIMARY KEY@, the columns that compose it must be specified. Also, since a row only exists when it contains one value for a column not part of the @PRIMARY KEY@, one such value must be specified too. +The @INSERT@ statement writes one or more columns for a given row in a table. Note that since a row is identified by its @PRIMARY KEY@, at least the columns composing it must be specified. Note that unlike in SQL, @INSERT@ does not check the prior existence of the row: the row is created if none existed before, and updated otherwise. Furthermore, there is no mean to know which of creation or update happened. In fact, the semantic of @INSERT@ and @UPDATE@ are identical.