Repository: cassandra Updated Branches: refs/heads/trunk 76542b666 -> 46283cdc5
Consider removing Config.index_interval patch by Robert Stupp; reviewed by Jason Brown for CASSANDRA-10671 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/46283cdc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46283cdc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46283cdc Branch: refs/heads/trunk Commit: 46283cdc5b76ea053387a00254d27315027cd5b8 Parents: 76542b6 Author: Robert Stupp <[email protected]> Authored: Tue Mar 7 06:32:28 2017 +0100 Committer: Robert Stupp <[email protected]> Committed: Tue Mar 7 06:32:28 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + src/java/org/apache/cassandra/config/Config.java | 3 --- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46283cdc/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b00a141..6cf571a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Remove config option index_interval (CASSANDRA-10671) * Reduce lock contention for collection types and serializers (CASSANDRA-13271) * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283) * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292) http://git-wip-us.apache.org/repos/asf/cassandra/blob/46283cdc/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index d53d069..027786d7 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -43,6 +43,7 @@ Upgrading full and incremental repairs. For full repairs, data is no longer marked repaired. For incremental repairs, anticompaction is run at the beginning of the repair, instead of at the end. + - Config option index_interval has been removed (it was deprecated since 2.0) 3.11.0 ====== http://git-wip-us.apache.org/repos/asf/cassandra/blob/46283cdc/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index dbad65e..36ce576 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -217,9 +217,6 @@ public class Config public InternodeCompression internode_compression = InternodeCompression.none; - @Deprecated - public Integer index_interval = null; - public int hinted_handoff_throttle_in_kb = 1024; public int batchlog_replay_throttle_in_kb = 1024; public int max_hints_delivery_threads = 2; http://git-wip-us.apache.org/repos/asf/cassandra/blob/46283cdc/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index e5d59fc..4fb742c 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -622,9 +622,6 @@ public class DatabaseDescriptor throw new ConfigurationException("index_summary_capacity_in_mb option was set incorrectly to '" + conf.index_summary_capacity_in_mb + "', it should be a non-negative integer.", false); - if (conf.index_interval != null) - logger.warn("index_interval has been deprecated and should be removed from cassandra.yaml"); - if(conf.encryption_options != null) { logger.warn("Please rename encryption_options as server_encryption_options in the yaml");
