Repository: cassandra Updated Branches: refs/heads/trunk dc35dc922 -> 20257310b
better ex messaging Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20257310 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20257310 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20257310 Branch: refs/heads/trunk Commit: 20257310ba16da954609481ef9b0a6d53f548e8a Parents: dc35dc9 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat May 23 17:29:47 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat May 23 17:29:47 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/CFPropDefs.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/20257310/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java index d72d2fc..9ba2b61 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/statements/CFPropDefs.java @@ -123,9 +123,9 @@ public class CFPropDefs extends PropertyDefinitions Integer minIndexInterval = getInt(KW_MIN_INDEX_INTERVAL, null); Integer maxIndexInterval = getInt(KW_MAX_INDEX_INTERVAL, null); if (minIndexInterval != null && minIndexInterval < 1) - throw new ConfigurationException(KW_MIN_INDEX_INTERVAL + " must be greater than 0"); + throw new ConfigurationException(KW_MIN_INDEX_INTERVAL + " must be greater than 0, but was " + minIndexInterval); if (maxIndexInterval != null && minIndexInterval != null && maxIndexInterval < minIndexInterval) - throw new ConfigurationException(KW_MAX_INDEX_INTERVAL + " must be greater than " + KW_MIN_INDEX_INTERVAL); + throw new ConfigurationException(KW_MAX_INDEX_INTERVAL + " must be greater than " + KW_MIN_INDEX_INTERVAL + ", but was " + maxIndexInterval); SpeculativeRetry.fromString(getString(KW_SPECULATIVE_RETRY, SpeculativeRetry.RetryType.NONE.name())); } @@ -161,7 +161,7 @@ public class CFPropDefs extends PropertyDefinitions else if (val instanceof String) // legacy syntax { options = CachingOptions.fromString(getSimple(KW_CACHING)); - logger.warn("Setting caching options with deprecated syntax."); + logger.warn("Setting caching options with deprecated syntax. {}", val); } return options; } @@ -209,7 +209,7 @@ public class CFPropDefs extends PropertyDefinitions @Override public String toString() { - return String.format("CFPropDefs(%s)", properties.toString()); + return String.format("CFPropDefs(%s)", properties); } private void validateMinimumInt(String field, int minimumValue, int defaultValue) throws SyntaxException, ConfigurationException @@ -217,7 +217,7 @@ public class CFPropDefs extends PropertyDefinitions Integer val = getInt(field, null); if (val != null && val < minimumValue) throw new ConfigurationException(String.format("%s cannot be smaller than %d, (default %d), but was %d", - field, minimumValue, defaultValue, Integer.valueOf(val))); + field, minimumValue, defaultValue, val)); } }
