Super columns are broken after upgrading to 3.0 on thrift patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-12335
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3431934b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3431934b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3431934b Branch: refs/heads/cassandra-3.9 Commit: 3431934b4d97472882fd90d112ec5db1bf757b0d Parents: f5c9d6e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 3 17:25:03 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 3 17:25:03 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3431934b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d78345a..e8b8abb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.9 + * Fix upgrade of super columns on thrift (CASSANDRA-12335) * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased corruption size (CASSANDRA-12359) * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277) * Exception when computing read-repair for range tombstones (CASSANDRA-12263) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3431934b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java index b6d8d2b..09af763 100644 --- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java +++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java @@ -284,7 +284,7 @@ public final class LegacySchemaMigrator AbstractType<?> subComparator = tableRow.has("subcomparator") ? TypeParser.parse(tableRow.getString("subcomparator")) : null; boolean isSuper = "super".equals(tableRow.getString("type").toLowerCase()); - boolean isCompound = rawComparator instanceof CompositeType; + boolean isCompound = rawComparator instanceof CompositeType || isSuper; /* * Determine whether or not the table is *really* dense