Repository: cassandra Updated Branches: refs/heads/trunk 4adf29d4e -> 0f72f79d5
Re-add cold_reads_to_omit param for backwards compatibility Patch by Tommy Stendahl; reviewed by marcuse for CASSANDRA-9203 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d88ff4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d88ff4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d88ff4e Branch: refs/heads/trunk Commit: 5d88ff4e41210f95d0e3e53ded779765b0136c2a Parents: df01403 Author: Tommy Stendahl <tommy.stend...@ericsson.com> Authored: Fri Apr 17 16:47:33 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Apr 17 16:47:33 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/SizeTieredCompactionStrategyOptions.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d88ff4e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 74ec921..80ab11c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.5 + * Re-add deprecated cold_reads_to_omit param for backwards compat (CASSANDRA-9203) * Make anticompaction visible in compactionstats (CASSANDRA-9098) * Improve nodetool getendpoints documentation about the partition key parameter (CASSANDRA-6458) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d88ff4e/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java index 911bb9f..9a840e1 100644 --- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java +++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java @@ -29,6 +29,8 @@ public final class SizeTieredCompactionStrategyOptions protected static final String MIN_SSTABLE_SIZE_KEY = "min_sstable_size"; protected static final String BUCKET_LOW_KEY = "bucket_low"; protected static final String BUCKET_HIGH_KEY = "bucket_high"; + @Deprecated + protected static final String COLD_READS_TO_OMIT_KEY = "cold_reads_to_omit"; protected long minSSTableSize; protected double bucketLow; @@ -91,6 +93,7 @@ public final class SizeTieredCompactionStrategyOptions uncheckedOptions.remove(MIN_SSTABLE_SIZE_KEY); uncheckedOptions.remove(BUCKET_LOW_KEY); uncheckedOptions.remove(BUCKET_HIGH_KEY); + uncheckedOptions.remove(COLD_READS_TO_OMIT_KEY); return uncheckedOptions; }
