Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8915D10370 for ; Tue, 29 Oct 2013 20:41:32 +0000 (UTC) Received: (qmail 83237 invoked by uid 500); 29 Oct 2013 20:41:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 83209 invoked by uid 500); 29 Oct 2013 20:41:32 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 83161 invoked by uid 99); 29 Oct 2013 20:41:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Oct 2013 20:41:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BD78088B917; Tue, 29 Oct 2013 20:41:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 29 Oct 2013 20:41:34 -0000 Message-Id: <6853633c14bd416381e33139a527772e@git.apache.org> In-Reply-To: <1dec1e3cf6104fe8b96d9bccbc01af9b@git.apache.org> References: <1dec1e3cf6104fe8b96d9bccbc01af9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/11] git commit: update COLD_READS_TO_OMIT_KEY update COLD_READS_TO_OMIT_KEY Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb6e4d0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb6e4d0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb6e4d0f Branch: refs/heads/trunk Commit: eb6e4d0f07db3ec9996c7b8e374c97d873f5b99c Parents: e506651 Author: Jonathan Ellis Authored: Tue Oct 29 15:39:30 2013 -0500 Committer: Jonathan Ellis Committed: Tue Oct 29 15:39:30 2013 -0500 ---------------------------------------------------------------------- .../compaction/SizeTieredCompactionStrategyOptions.java | 10 +++++----- .../db/compaction/SizeTieredCompactionStrategyTest.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb6e4d0f/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 711ec6e..c6c5f1b 100644 --- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java +++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java @@ -30,7 +30,7 @@ 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"; - protected static final String MAX_COLD_READS_RATIO_KEY = "max_cold_reads_ratio"; + protected static final String COLD_READS_TO_OMIT_KEY = "cold_reads_to_omit"; protected long minSSTableSize; protected double bucketLow; @@ -45,7 +45,7 @@ public final class SizeTieredCompactionStrategyOptions bucketLow = optionValue == null ? DEFAULT_BUCKET_LOW : Double.parseDouble(optionValue); optionValue = options.get(BUCKET_HIGH_KEY); bucketHigh = optionValue == null ? DEFAULT_BUCKET_HIGH : Double.parseDouble(optionValue); - optionValue = options.get(MAX_COLD_READS_RATIO_KEY); + optionValue = options.get(COLD_READS_TO_OMIT_KEY); coldReadsToOmit = optionValue == null ? DEFAULT_COLD_READS_TO_OMIT : Double.parseDouble(optionValue); } @@ -94,17 +94,17 @@ public final class SizeTieredCompactionStrategyOptions BUCKET_HIGH_KEY, bucketHigh, BUCKET_LOW_KEY, bucketLow)); } - double maxColdReadsRatio = parseDouble(options, MAX_COLD_READS_RATIO_KEY, DEFAULT_COLD_READS_TO_OMIT); + double maxColdReadsRatio = parseDouble(options, COLD_READS_TO_OMIT_KEY, DEFAULT_COLD_READS_TO_OMIT); if (maxColdReadsRatio < 0.0 || maxColdReadsRatio > 1.0) { throw new ConfigurationException(String.format("%s value (%s) should be between between 0.0 and 1.0", - MAX_COLD_READS_RATIO_KEY, optionValue)); + COLD_READS_TO_OMIT_KEY, optionValue)); } uncheckedOptions.remove(MIN_SSTABLE_SIZE_KEY); uncheckedOptions.remove(BUCKET_LOW_KEY); uncheckedOptions.remove(BUCKET_HIGH_KEY); - uncheckedOptions.remove(MAX_COLD_READS_RATIO_KEY); + uncheckedOptions.remove(COLD_READS_TO_OMIT_KEY); return uncheckedOptions; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb6e4d0f/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java index 5e79bd8..6bfa4e8 100644 --- a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java @@ -49,7 +49,7 @@ public class SizeTieredCompactionStrategyTest extends SchemaLoader public void testOptionsValidation() throws ConfigurationException { Map options = new HashMap<>(); - options.put(SizeTieredCompactionStrategyOptions.MAX_COLD_READS_RATIO_KEY, "0.35"); + options.put(SizeTieredCompactionStrategyOptions.COLD_READS_TO_OMIT_KEY, "0.35"); options.put(SizeTieredCompactionStrategyOptions.BUCKET_LOW_KEY, "0.5"); options.put(SizeTieredCompactionStrategyOptions.BUCKET_HIGH_KEY, "1.5"); options.put(SizeTieredCompactionStrategyOptions.MIN_SSTABLE_SIZE_KEY, "10000"); @@ -58,21 +58,21 @@ public class SizeTieredCompactionStrategyTest extends SchemaLoader try { - options.put(SizeTieredCompactionStrategyOptions.MAX_COLD_READS_RATIO_KEY, "-0.5"); + options.put(SizeTieredCompactionStrategyOptions.COLD_READS_TO_OMIT_KEY, "-0.5"); validateOptions(options); - fail(String.format("Negative %s should be rejected", SizeTieredCompactionStrategyOptions.MAX_COLD_READS_RATIO_KEY)); + fail(String.format("Negative %s should be rejected", SizeTieredCompactionStrategyOptions.COLD_READS_TO_OMIT_KEY)); } catch (ConfigurationException e) {} try { - options.put(SizeTieredCompactionStrategyOptions.MAX_COLD_READS_RATIO_KEY, "10.0"); + options.put(SizeTieredCompactionStrategyOptions.COLD_READS_TO_OMIT_KEY, "10.0"); validateOptions(options); - fail(String.format("%s > 1.0 should be rejected", SizeTieredCompactionStrategyOptions.MAX_COLD_READS_RATIO_KEY)); + fail(String.format("%s > 1.0 should be rejected", SizeTieredCompactionStrategyOptions.COLD_READS_TO_OMIT_KEY)); } catch (ConfigurationException e) { - options.put(SizeTieredCompactionStrategyOptions.MAX_COLD_READS_RATIO_KEY, "0.25"); + options.put(SizeTieredCompactionStrategyOptions.COLD_READS_TO_OMIT_KEY, "0.25"); } try