You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2012/09/08 05:11:37 UTC
git commit: remove unnecessary boxing
Updated Branches:
refs/heads/trunk a85b57770 -> 8b374b206
remove unnecessary boxing
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b374b20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b374b20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b374b20
Branch: refs/heads/trunk
Commit: 8b374b206991255bde336911c68a7f988ab62a61
Parents: a85b577
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 7 23:06:54 2012 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 7 23:06:54 2012 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql/CFPropDefs.java | 4 +-
src/java/org/apache/cassandra/cql3/CFPropDefs.java | 4 +-
.../db/commitlog/CommitLogDescriptor.java | 26 +++++++-------
.../apache/cassandra/db/marshal/DoubleType.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
.../apache/cassandra/hadoop/BulkRecordWriter.java | 10 +++---
.../org/apache/cassandra/hadoop/ConfigHelper.java | 2 +-
.../cassandra/hadoop/pig/CassandraStorage.java | 8 ++--
.../org/apache/cassandra/tools/BulkLoader.java | 4 +-
src/java/org/apache/cassandra/tools/NodeCmd.java | 6 ++--
.../apache/cassandra/utils/SemanticVersion.java | 6 ++--
11 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/cql/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CFPropDefs.java b/src/java/org/apache/cassandra/cql/CFPropDefs.java
index 8771c1b..b402b29 100644
--- a/src/java/org/apache/cassandra/cql/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql/CFPropDefs.java
@@ -249,7 +249,7 @@ public class CFPropDefs {
{
try
{
- result = Double.parseDouble(value);
+ result = Double.valueOf(value);
}
catch (NumberFormatException e)
{
@@ -271,7 +271,7 @@ public class CFPropDefs {
{
try
{
- result = Integer.parseInt(value);
+ result = Integer.valueOf(value);
}
catch (NumberFormatException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index bd452a3..0d1722c 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -190,7 +190,7 @@ public class CFPropDefs
{
try
{
- result = Double.parseDouble(value);
+ result = Double.valueOf(value);
}
catch (NumberFormatException e)
{
@@ -217,7 +217,7 @@ public class CFPropDefs
{
try
{
- result = Integer.parseInt(value);
+ result = Integer.valueOf(value);
}
catch (NumberFormatException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
index b31c1e4..17f3519 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.cassandra.db.commitlog;
@@ -30,20 +30,20 @@ public class CommitLogDescriptor
private static final String SEPARATOR = "-";
private static final String FILENAME_PREFIX = "CommitLog" + SEPARATOR;
private static final String FILENAME_EXTENSION = ".log";
- // match both legacy and new version of commitlogs Ex: CommitLog-12345.log and CommitLog-4-12345.log.
+ // match both legacy and new version of commitlogs Ex: CommitLog-12345.log and CommitLog-4-12345.log.
private static final Pattern COMMIT_LOG_FILE_PATTERN = Pattern.compile(FILENAME_PREFIX + "((\\d+)(" + SEPARATOR + "\\d+)?)" + FILENAME_EXTENSION);
-
+
public static final int LEGACY_VERSION = 1;
public static final int VERSION_12 = 2;
- /**
+ /**
* Increment this number if there is a changes in the commit log disc layout or MessagingVersion changes.
* Note: make sure to handle {@link #getMessagingVersion()}
*/
public static final int current_version = VERSION_12;
-
+
private final int version;
public final long id;
-
+
public CommitLogDescriptor(int version, long id)
{
this.version = version;
@@ -63,12 +63,12 @@ public class CommitLogDescriptor
if (matcher.group(3) != null)
{
- long id = Long.valueOf(matcher.group(3).split(SEPARATOR)[1]);
- return new CommitLogDescriptor(Integer.valueOf(matcher.group(2)), id);
+ long id = Long.parseLong(matcher.group(3).split(SEPARATOR)[1]);
+ return new CommitLogDescriptor(Integer.parseInt(matcher.group(2)), id);
}
else
{
- long id = Long.valueOf(matcher.group(1));
+ long id = Long.parseLong(matcher.group(1));
return new CommitLogDescriptor(LEGACY_VERSION, id);
}
}
@@ -88,7 +88,7 @@ public class CommitLogDescriptor
}
public String fileName()
- {
+ {
return FILENAME_PREFIX + version + SEPARATOR + id + FILENAME_EXTENSION;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/db/marshal/DoubleType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DoubleType.java b/src/java/org/apache/cassandra/db/marshal/DoubleType.java
index 9d73983..2bed8ea 100644
--- a/src/java/org/apache/cassandra/db/marshal/DoubleType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DoubleType.java
@@ -73,7 +73,7 @@ public class DoubleType extends AbstractType<Double>
Double d;
try
{
- d = Double.parseDouble(source);
+ d = Double.valueOf(source);
}
catch (NumberFormatException e1)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index c9cbf7f..6c4bf43 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -622,7 +622,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
if (MessagingService.instance().knowsVersion(endpoint) && MessagingService.instance().getVersion(endpoint) >= MessagingService.VERSION_12)
return true;
- else if (getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION) != null && Integer.valueOf(getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION).value) >= MessagingService.VERSION_12)
+ else if (getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION) != null && Integer.parseInt(getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.NET_VERSION).value) >= MessagingService.VERSION_12)
return true;
return false;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
index a45a574..4883743 100644
--- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
@@ -97,8 +97,8 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
Config.setLoadYaml(false);
Config.setOutboundBindAny(true);
this.conf = conf;
- DatabaseDescriptor.setStreamThroughputOutboundMegabitsPerSec(Integer.valueOf(conf.get(STREAM_THROTTLE_MBITS, "0")));
- maxFailures = Integer.valueOf(conf.get(MAX_FAILED_HOSTS, "0"));
+ DatabaseDescriptor.setStreamThroughputOutboundMegabitsPerSec(Integer.parseInt(conf.get(STREAM_THROTTLE_MBITS, "0")));
+ maxFailures = Integer.parseInt(conf.get(MAX_FAILED_HOSTS, "0"));
String keyspace = ConfigHelper.getOutputKeyspace(conf);
outputdir = new File(getOutputLocation() + File.separator + keyspace + File.separator + ConfigHelper.getOutputColumnFamily(conf)); //dir must be named by ks/cf for the loader
outputdir.mkdirs();
@@ -138,7 +138,7 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
if (cfType == CFType.SUPER)
subcomparator = BytesType.instance;
-
+
this.writer = new SSTableSimpleUnsortedWriter(
outputdir,
ConfigHelper.getOutputPartitioner(conf),
@@ -146,10 +146,10 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
ConfigHelper.getOutputColumnFamily(conf),
BytesType.instance,
subcomparator,
- Integer.valueOf(conf.get(BUFFER_SIZE_IN_MB, "64")),
+ Integer.parseInt(conf.get(BUFFER_SIZE_IN_MB, "64")),
ConfigHelper.getOutputCompressionParamaters(conf));
- externalClient = new ExternalClient(ConfigHelper.getOutputInitialAddress(conf),
+ externalClient = new ExternalClient(ConfigHelper.getOutputInitialAddress(conf),
ConfigHelper.getOutputRpcPort(conf),
username,
password);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
index 0c390cc..6282143 100644
--- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
@@ -332,7 +332,7 @@ public class ConfigHelper
public static boolean getInputIsWide(Configuration conf)
{
- return Boolean.valueOf(conf.get(INPUT_WIDEROWS_CONFIG));
+ return Boolean.parseBoolean(conf.get(INPUT_WIDEROWS_CONFIG));
}
public static String getOutputColumnFamily(Configuration conf)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index c0c2997..443c4ae 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -536,7 +536,7 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo
else
outputFormatClass = DEFAULT_OUTPUT_FORMAT;
if (System.getenv(PIG_ALLOW_DELETES) != null)
- allow_deletes = Boolean.valueOf(System.getenv(PIG_ALLOW_DELETES));
+ allow_deletes = Boolean.parseBoolean(System.getenv(PIG_ALLOW_DELETES));
}
private String getFullyQualifiedClassName(String classname)
@@ -557,10 +557,10 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo
}
widerows = DEFAULT_WIDEROW_INPUT;
if (System.getenv(PIG_WIDEROW_INPUT) != null)
- widerows = Boolean.valueOf(System.getProperty(PIG_WIDEROW_INPUT));
+ widerows = Boolean.parseBoolean(System.getProperty(PIG_WIDEROW_INPUT));
usePartitionFilter = DEFAULT_USE_SECONDARY;
if (System.getenv() != null)
- usePartitionFilter = Boolean.valueOf(System.getenv(PIG_USE_SECONDARY));
+ usePartitionFilter = Boolean.parseBoolean(System.getenv(PIG_USE_SECONDARY));
if (usePartitionFilter && getIndexExpressions() != null)
ConfigHelper.setInputRange(conf, getIndexExpressions());
@@ -805,7 +805,7 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo
// we have to do this again here for the check in writeColumnsFromTuple
usePartitionFilter = DEFAULT_USE_SECONDARY;
if (System.getenv() != null)
- usePartitionFilter = Boolean.valueOf(System.getenv(PIG_USE_SECONDARY));
+ usePartitionFilter = Boolean.parseBoolean(System.getenv(PIG_USE_SECONDARY));
initSchema(storeSignature);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index 24b2423..2f76680 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -309,10 +309,10 @@ public class BulkLoader
opts.noProgress = cmd.hasOption(NOPROGRESS_OPTION);
if (cmd.hasOption(THROTTLE_MBITS))
- opts.throttle = Integer.valueOf(cmd.getOptionValue(THROTTLE_MBITS));
+ opts.throttle = Integer.parseInt(cmd.getOptionValue(THROTTLE_MBITS));
if (cmd.hasOption(RPC_PORT_OPTION))
- opts.rpcPort = Integer.valueOf(cmd.getOptionValue(RPC_PORT_OPTION));
+ opts.rpcPort = Integer.parseInt(cmd.getOptionValue(RPC_PORT_OPTION));
if (cmd.hasOption(INITIAL_HOST_ADDRESS_OPTION))
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 3f3a62a..31910aa 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -1028,17 +1028,17 @@ public class NodeCmd
case SETCOMPACTIONTHROUGHPUT :
if (arguments.length != 1) { badUse("Missing value argument."); }
- probe.setCompactionThroughput(Integer.valueOf(arguments[0]));
+ probe.setCompactionThroughput(Integer.parseInt(arguments[0]));
break;
case SETSTREAMTHROUGHPUT :
if (arguments.length != 1) { badUse("Missing value argument."); }
- probe.setStreamThroughput(Integer.valueOf(arguments[0]));
+ probe.setStreamThroughput(Integer.parseInt(arguments[0]));
break;
case SETTRACEPROBABILITY :
if (arguments.length != 1) { badUse("Missing value argument."); }
- probe.setTraceProbability(Double.valueOf(arguments[0]));
+ probe.setTraceProbability(Double.parseDouble(arguments[0]));
break;
case REBUILD :
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b374b20/src/java/org/apache/cassandra/utils/SemanticVersion.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SemanticVersion.java b/src/java/org/apache/cassandra/utils/SemanticVersion.java
index 99b2aca..00305cb 100644
--- a/src/java/org/apache/cassandra/utils/SemanticVersion.java
+++ b/src/java/org/apache/cassandra/utils/SemanticVersion.java
@@ -66,9 +66,9 @@ public class SemanticVersion implements Comparable<SemanticVersion>
try
{
- this.major = Integer.valueOf(matcher.group(1));
- this.minor = Integer.valueOf(matcher.group(2));
- this.patch = Integer.valueOf(matcher.group(3));
+ this.major = Integer.parseInt(matcher.group(1));
+ this.minor = Integer.parseInt(matcher.group(2));
+ this.patch = Integer.parseInt(matcher.group(3));
String pr = matcher.group(4);
String bld = matcher.group(5);