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/02/11 13:59:53 UTC
[2/3] cassandra git commit: Flush dropped_columns when flushing schema
Flush dropped_columns when flushing schema
patch by amorton; reviewed by slebresne for CASSANDRA-11050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a824c02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a824c02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a824c02
Branch: refs/heads/trunk
Commit: 2a824c024a153a4a43f79992dc5ec549daf770ab
Parents: 1aa97e3
Author: Aaron Morton <aa...@thelastpickle.com>
Authored: Thu Jan 21 14:41:47 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 11 13:59:10 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a824c02/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bca5fcd..828ba21 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,8 @@
* Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
* Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
* Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
+ * Add dropped_columns to the list of schema table so it gets handled
+ properly (CASSANDRA-11050)
Merged from 2.2.6:
* Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a824c02/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index f1ea6cf..62c78fd 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -82,7 +82,7 @@ public final class SchemaKeyspace
public static final String INDEXES = "indexes";
public static final List<String> ALL =
- ImmutableList.of(KEYSPACES, TABLES, COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
+ ImmutableList.of(KEYSPACES, TABLES, COLUMNS, DROPPED_COLUMNS, TRIGGERS, VIEWS, TYPES, FUNCTIONS, AGGREGATES, INDEXES);
private static final CFMetaData Keyspaces =
compile(KEYSPACES,
@@ -297,6 +297,11 @@ public final class SchemaKeyspace
for (String table : ALL)
{
+ // Due to CASSANDRA-11050 we want to exclude DROPPED_COLUMNS for schema digest computation. We can and
+ // should remove that in the next major release (so C* 4.0).
+ if (table.equals(DROPPED_COLUMNS))
+ continue;
+
ReadCommand cmd = getReadCommandForTableSchema(table);
try (ReadOrderGroup orderGroup = cmd.startOrderGroup();
PartitionIterator schema = cmd.executeInternal(orderGroup))