Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7987835 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7987835 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7987835 Branch: refs/heads/trunk Commit: c79878355d215521ec97250f7291ceff4dea79c0 Parents: b0448e6 2a824c0 Author: Sylvain Lebresne <[email protected]> Authored: Thu Feb 11 13:59:32 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Feb 11 13:59:32 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/c7987835/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7987835/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/schema/SchemaKeyspace.java index d0b1256,62c78fd..2108e8a --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@@ -297,9 -297,14 +297,14 @@@ public final class SchemaKeyspac 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)) + try (ReadExecutionController executionController = cmd.executionController(); + PartitionIterator schema = cmd.executeInternal(executionController)) { while (schema.hasNext()) {
