Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32de990b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32de990b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32de990b Branch: refs/heads/trunk Commit: 32de990b7abf1ae54f31ba728a9860031d0f435c Parents: 457733b 2fd33ba Author: Aleksey Yeschenko <alek...@yeschenko.com> Authored: Thu Aug 3 14:28:52 2017 +0100 Committer: Aleksey Yeschenko <alek...@yeschenko.com> Committed: Thu Aug 3 14:28:52 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/schema/SchemaKeyspace.java | 8 ++++++++ .../cassandra/cql3/validation/operations/DropTest.java | 13 +++++++++++++ 3 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32de990b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32de990b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java index 69bdf8d,1f8d2fc..b7de321 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@@ -640,15 -652,18 +640,18 @@@ public final class SchemaKeyspac // Include the serialized keyspace in case the target node missed a CREATE KEYSPACE migration (see CASSANDRA-5631). Mutation.SimpleBuilder builder = makeCreateKeyspaceMutation(keyspace.name, keyspace.params, timestamp); - builder.update(Tables).row(table.cfName).delete(); + builder.update(Tables).row(table.name).delete(); - for (ColumnDefinition column : table.allColumns()) + for (ColumnMetadata column : table.columns()) dropColumnFromSchemaMutation(table, column, builder); - for (CFMetaData.DroppedColumn column : table.getDroppedColumns().values()) - dropDroppedColumnFromSchemaMutation(table, column, timestamp, builder); - - for (TriggerMetadata trigger : table.getTriggers()) + for (TriggerMetadata trigger : table.triggers) dropTriggerFromSchemaMutation(table, trigger, builder); - for (IndexMetadata index : table.getIndexes()) ++ for (DroppedColumn column : table.droppedColumns.values()) ++ dropDroppedColumnFromSchemaMutation(table, column, builder); ++ + for (IndexMetadata index : table.indexes) dropIndexFromSchemaMutation(table, index, builder); return builder; @@@ -669,25 -684,29 +672,30 @@@ .add("type", type.asCQL3Type().toString()); } - private static void dropColumnFromSchemaMutation(CFMetaData table, ColumnDefinition column, Mutation.SimpleBuilder builder) + private static void dropColumnFromSchemaMutation(TableMetadata table, ColumnMetadata column, Mutation.SimpleBuilder builder) { // Note: we do want to use name.toString(), not name.bytes directly for backward compatibility (For CQL3, this won't make a difference). - builder.update(Columns).row(table.cfName, column.name.toString()).delete(); + builder.update(Columns).row(table.name, column.name.toString()).delete(); } - private static void addDroppedColumnToSchemaMutation(CFMetaData table, CFMetaData.DroppedColumn column, Mutation.SimpleBuilder builder) + private static void addDroppedColumnToSchemaMutation(TableMetadata table, DroppedColumn column, Mutation.SimpleBuilder builder) { builder.update(DroppedColumns) - .row(table.cfName, column.name) + .row(table.name, column.column.name.toString()) .add("dropped_time", new Date(TimeUnit.MICROSECONDS.toMillis(column.droppedTime))) - .add("type", expandUserTypes(column.type).asCQL3Type().toString()); + .add("type", expandUserTypes(column.column.type).asCQL3Type().toString()) + .add("kind", column.column.kind.toString().toLowerCase()); } - private static void dropDroppedColumnFromSchemaMutation(CFMetaData table, DroppedColumn column, long timestamp, Mutation.SimpleBuilder builder) ++ private static void dropDroppedColumnFromSchemaMutation(TableMetadata table, DroppedColumn column, Mutation.SimpleBuilder builder) + { - builder.update(DroppedColumns).row(table.cfName, column.name).delete(); ++ builder.update(DroppedColumns).row(table.name, column.column.name.toString()).delete(); + } + - private static void addTriggerToSchemaMutation(CFMetaData table, TriggerMetadata trigger, Mutation.SimpleBuilder builder) + private static void addTriggerToSchemaMutation(TableMetadata table, TriggerMetadata trigger, Mutation.SimpleBuilder builder) { builder.update(Triggers) - .row(table.cfName, trigger.name) + .row(table.name, trigger.name) .add("options", Collections.singletonMap("class", trigger.classOption)); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
