Repository: cassandra Updated Branches: refs/heads/trunk ad3056199 -> 5cc7a11ab
fix boxing confusion Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cc7a11a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc7a11a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc7a11a Branch: refs/heads/trunk Commit: 5cc7a11ab8684af2f9b127341f4029657b5fa3b2 Parents: ad30561 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Sep 6 14:39:54 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Sep 6 14:39:54 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Memtable.java | 2 +- src/java/org/apache/cassandra/dht/RangeStreamer.java | 2 +- src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 4 ++-- src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 2 +- .../apache/cassandra/stress/settings/OptionAnyProbabilities.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 4825676..ef157a3 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -52,7 +52,7 @@ public class Memtable private static final Logger logger = LoggerFactory.getLogger(Memtable.class); static final MemtablePool MEMORY_POOL = DatabaseDescriptor.getMemtableAllocatorPool(); - private static final int ROW_OVERHEAD_HEAP_SIZE = estimateRowOverhead(Integer.valueOf(System.getProperty("cassandra.memtable_row_overhead_computation_step", "100000"))); + private static final int ROW_OVERHEAD_HEAP_SIZE = estimateRowOverhead(Integer.parseInt(System.getProperty("cassandra.memtable_row_overhead_computation_step", "100000"))); private final MemtableAllocator allocator; private final AtomicLong liveDataSize = new AtomicLong(0); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/dht/RangeStreamer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java index d84a951..be58d77 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -47,7 +47,7 @@ import org.apache.cassandra.utils.FBUtilities; public class RangeStreamer { private static final Logger logger = LoggerFactory.getLogger(RangeStreamer.class); - public static final boolean useStrictConsistency = Boolean.valueOf(System.getProperty("cassandra.consistent.rangemovement","true")); + public static final boolean useStrictConsistency = Boolean.parseBoolean(System.getProperty("cassandra.consistent.rangemovement","true")); private final Collection<Token> tokens; private final TokenMetadata metadata; private final InetAddress address; http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java index 73a291b..30d742c 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java @@ -525,7 +525,7 @@ public class CqlConfigHelper String setting = conf.get(parameter); if (setting == null) return Optional.absent(); - return Optional.of(Integer.parseInt(setting)); + return Optional.of(Integer.valueOf(setting)); } private static Optional<Boolean> getBooleanSetting(String parameter, Configuration conf) @@ -533,7 +533,7 @@ public class CqlConfigHelper String setting = conf.get(parameter); if (setting == null) return Optional.absent(); - return Optional.of(Boolean.parseBoolean(setting)); + return Optional.of(Boolean.valueOf(setting)); } private static Optional<String> getStringSetting(String parameter, Configuration conf) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java index bcf9869..3baf833 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java +++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java @@ -201,7 +201,7 @@ public class StandaloneSplitter opts.sizeInMB = DEFAULT_SSTABLE_SIZE; if (cmd.hasOption(SIZE_OPTION)) - opts.sizeInMB = Integer.valueOf(cmd.getOptionValue(SIZE_OPTION)); + opts.sizeInMB = Integer.parseInt(cmd.getOptionValue(SIZE_OPTION)); return opts; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc7a11a/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java index b685294..6f8e903 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionAnyProbabilities.java @@ -48,7 +48,7 @@ public final class OptionAnyProbabilities extends OptionMulti String[] args = param.split("="); if (args.length == 2 && args[1].length() > 0 && args[0].length() > 0) { - if (options.put(args[0], Double.parseDouble(args[1])) != null) + if (options.put(args[0], Double.valueOf(args[1])) != null) throw new IllegalArgumentException(args[0] + " set twice"); return true; }
