[cassandra] branch trunk updated: Include DROPPED_COLUMNS in schema digest computation.

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new c230ec9  Include DROPPED_COLUMNS in schema digest computation.
c230ec9 is described below

commit c230ec9ed07b9077ce8422bce8db4e94d5b644cb
Author: Jon Meredith <jm...@apple.com>
AuthorDate: Mon Jun 1 11:52:50 2020 -0600

    Include DROPPED_COLUMNS in schema digest computation.
    
    CASSANDRA-11050 introduced dropped columns but excluded it from schema digest computations, with
    a comment to include the table in the next major release - 4.0.
    
    The patch now includes DROPPED_COLUMNS in the schema digest computation.
    
    Patch by Jon Meredith; reviewed by Aleksey Yeschenko for CASSANDRA-15843
---
 CHANGES.txt                                              | 1 +
 src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3a58b05..09635e8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-alpha5
+ * Include DROPPED_COLUMNS in schema digest computation (CASSANDRA-15843)
  * Fix Cassandra restart from rpm install (CASSANDRA-15830)
  * Improve handling of 2i initialization failures (CASSANDRA-13606)
  * Add completion_ratio column to sstable_tasks virtual table (CASANDRA-15759)
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 76bda0f..a10156c 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -355,11 +355,6 @@ public final class SchemaKeyspace
         Digest digest = Digest.forSchema();
         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 (ReadExecutionController executionController = cmd.executionController();
                  PartitionIterator schema = cmd.executeInternal(executionController))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org