You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/08/03 15:29:58 UTC
[1/6] cassandra git commit: Super columns are broken after upgrading
to 3.0 on thrift
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 f5c9d6e49 -> 3431934b4
refs/heads/cassandra-3.9 717c6d6bf -> 1323ad0fb
refs/heads/trunk a69d13ba8 -> 5cc0d152b
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.0
Commit: 3431934b4d97472882fd90d112ec5db1bf757b0d
Parents: f5c9d6e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 3 17:25:03 2016 +0200
Committer: Sylvain Lebresne <sy...@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
[2/6] cassandra git commit: Super columns are broken after upgrading
to 3.0 on thrift
Posted by sl...@apache.org.
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 <sy...@datastax.com>
Authored: Wed Aug 3 17:25:03 2016 +0200
Committer: Sylvain Lebresne <sy...@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
[3/6] cassandra git commit: Super columns are broken after upgrading
to 3.0 on thrift
Posted by sl...@apache.org.
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/trunk
Commit: 3431934b4d97472882fd90d112ec5db1bf757b0d
Parents: f5c9d6e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 3 17:25:03 2016 +0200
Committer: Sylvain Lebresne <sy...@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
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.9' into trunk
* cassandra-3.9:
Super columns are broken after upgrading to 3.0 on thrift
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cc0d152
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc0d152
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc0d152
Branch: refs/heads/trunk
Commit: 5cc0d152bde6eb027bf7c1e86f0bc4256e688daa
Parents: a69d13b 1323ad0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 3 17:29:44 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 3 17:29:44 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/5cc0d152/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc0d152/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
Super columns are broken after upgrading to 3.0 on thrift
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1323ad0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1323ad0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1323ad0f
Branch: refs/heads/trunk
Commit: 1323ad0fba0063b646eb0be5843956dd345159a4
Parents: 717c6d6 3431934
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 3 17:29:22 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 3 17:29:22 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/1323ad0f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bb58e77,e8b8abb..0d79a9f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.9
+3.9
+ * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
+ * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * 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/1323ad0f/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
* cassandra-3.0:
Super columns are broken after upgrading to 3.0 on thrift
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1323ad0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1323ad0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1323ad0f
Branch: refs/heads/cassandra-3.9
Commit: 1323ad0fba0063b646eb0be5843956dd345159a4
Parents: 717c6d6 3431934
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 3 17:29:22 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 3 17:29:22 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/1323ad0f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bb58e77,e8b8abb..0d79a9f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-3.0.9
+3.9
+ * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
+ * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * 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/1323ad0f/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
----------------------------------------------------------------------