Check the column name, not cell name, for dropped columns patch by slebresne; reviewed by krummas for CASSANDRA-11018
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1a113a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1a113a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1a113a9 Branch: refs/heads/trunk Commit: c1a113a9e3381d5278ca2254b0d0b062cfa7551b Parents: c7cbde2 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jan 18 16:02:06 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jan 19 11:01:32 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/LegacyLayout.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1a113a9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9c0ab85..04d0354 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 3.0.3 + * Check the column name, not cell name, for dropped columns when reading + legacy sstables (CASSANDRA-11018) * Don't attempt to index clustering values of static rows (CASSANDRA-11021) * Remove checksum files after replaying hints (CASSANDRA-10947) * Support passing base table metadata to custom 2i validation (CASSANDRA-10924) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1a113a9/src/java/org/apache/cassandra/db/LegacyLayout.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/LegacyLayout.java b/src/java/org/apache/cassandra/db/LegacyLayout.java index 91b7755..e9e5169 100644 --- a/src/java/org/apache/cassandra/db/LegacyLayout.java +++ b/src/java/org/apache/cassandra/db/LegacyLayout.java @@ -961,7 +961,7 @@ public abstract class LegacyLayout // then simply ignore the cell is fine. But also not that we ignore if it's the // system keyspace because for those table we actually remove columns without registering // them in the dropped columns - assert metadata.ksName.equals(SystemKeyspace.NAME) || metadata.getDroppedColumnDefinition(cellname) != null : e.getMessage(); + assert metadata.ksName.equals(SystemKeyspace.NAME) || metadata.getDroppedColumnDefinition(e.columnName) != null : e.getMessage(); } } }