Updated Branches: refs/heads/cassandra-1.1 a2bdc8ff9 -> c716fc7fa
(cql3) delete "component_index" column on DROP TABLE call patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4420 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c716fc7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c716fc7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c716fc7f Branch: refs/heads/cassandra-1.1 Commit: c716fc7fa03c75f9029d35a2b80ee729f605814e Parents: a2bdc8f Author: Pavel Yaskevich <[email protected]> Authored: Sat Jul 7 18:31:04 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Sun Jul 8 14:04:31 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/config/ColumnDefinition.java | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c716fc7f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 15a1a30..85ff9ca 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,7 @@ * (stress) support for CQL prepared statements (CASSANDRA-3633) * Correctly catch exception when Snappy cannot be loaded (CASSANDRA-4400) * (cql3) Support ORDER BY when IN condition is given in WHERE clause (CASSANDRA-4327) + * (cql3) delete "component_index" column on DROP TABLE call (CASSANDRA-4420) Merged from 1.0: * allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow (CASSANDRA-4396) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c716fc7f/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java index bfd9481..8c33d73 100644 --- a/src/java/org/apache/cassandra/config/ColumnDefinition.java +++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java @@ -183,6 +183,7 @@ public class ColumnDefinition cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "index_type")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "index_options")); cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "index_name")); + cf.addColumn(DeletedColumn.create(ldt, timestamp, cfName, comparator.getString(name), "component_index")); } public void toSchema(RowMutation rm, String cfName, AbstractType<?> comparator, long timestamp)
