cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Thu, 05 Sep 2013 14:37:29 GMT
Merge branch 'cassandra-1.2' 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/12671160
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12671160
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12671160

Branch: refs/heads/cassandra-2.0
Commit: 12671160bda849bc80b69e521885169c6eb462e0
Parents: edc7531 1f68442
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Sep 5 16:37:08 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Sep 5 16:37:08 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12671160/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --cc doc/cql3/CQL.textile
index e8f991b,168a05d..178d940
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@@ -367,11 -360,12 +367,11 @@@ p
  The @ALTER@ statement is used to manipulate table definitions. It allows to add new columns,
drop existing ones, change the type of existing columns, or update the table options. As for
table creation, @ALTER COLUMNFAMILY@ is allowed as an alias for @ALTER TABLE@.
  
  The @<tablename>@ is the table name optionally preceded by the keyspace name.  The
@<instruction>@ defines the alteration to perform:
- * @ALTER@: Update the type of a given defined column. Note that the type of the "clustering
keys":#createTablepartitionClustering cannot be modified as it induces the on-disk ordering
of rows. Columns on which a "secondary index":#createIndexStmt is defined have the same restriction.
Other columns are free from those restrictions (no validation of existing data is performed),
but it is usually a bad idea to change the type to a non-compatible one, unless no data have
been inserted for that column yet, as this could confuse CQL drivers/tools.
+ * @ALTER@: Update the type of a given defined column. Note that the type of the "clustering
columns":#createTablepartitionClustering cannot be modified as it induces the on-disk ordering
of rows. Columns on which a "secondary index":#createIndexStmt is defined have the same restriction.
Other columns are free from those restrictions (no validation of existing data is performed),
but it is usually a bad idea to change the type to a non-compatible one, unless no data have
been inserted for that column yet, as this could confuse CQL drivers/tools.
  * @ADD@: Adds a new column to the table. The @<identifier>@ for the new column must
not conflict with an existing column. Moreover, columns cannot be added to tables defined
with the @COMPACT STORAGE@ option.
 +* @DROP@: Removes a column from the table. Dropped columns will immediately become unavailable
in the queries and will not be included in compacted sstables in the future. If a column is
readded, queries won't return values written before the column was last dropped. It is assumed
that timestamps represent actual time, so if this is not your case, you should NOT readd previously
dropped columns. Columns can't be dropped from tables defined with the @COMPACT STORAGE@ option.
  * @WITH@: Allows to update the options of the table. The "supported @<option>@":#createTableOptions
(and syntax) are the same as for the @CREATE TABLE@ statement except that @COMPACT STORAGE@
is not supported. Note that setting any @compaction@ sub-options has the effect of erasing
all previous @compaction@ options, so you  need to re-specify all the sub-options if you want
to keep them. The same note applies to the set of @compression@ sub-options.
  
 -Dropping a column is no yet supported but is on "the roadmap":https://issues.apache.org/jira/browse/CASSANDRA-3919.
In the meantime, a declared but unused column has no impact on performance nor uses any storage.
 -
  h3(#dropTableStmt). DROP TABLE
  
  __Syntax:__


Mime
View raw message