giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject git commit: updated refs/heads/trunk to 8a95215
Date Wed, 11 Mar 2015 17:45:21 GMT
Repository: giraph
Updated Branches:
  refs/heads/trunk b9f414296 -> 8a952155d


GIRAPH-997: Upgrade findbugs to 3.0.0 (dlogothetis via majakabiljo)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/8a952155
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/8a952155
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/8a952155

Branch: refs/heads/trunk
Commit: 8a952155df33e56802a6e601eef22c75c034430c
Parents: b9f4142
Author: Maja Kabiljo <majakabiljo@fb.com>
Authored: Wed Mar 11 10:43:39 2015 -0700
Committer: Maja Kabiljo <majakabiljo@fb.com>
Committed: Wed Mar 11 10:45:02 2015 -0700

----------------------------------------------------------------------
 CHANGELOG                                                    | 2 ++
 giraph-core/pom.xml                                          | 2 +-
 .../giraph/io/formats/IntIntTextVertexValueInputFormat.java  | 4 ++--
 .../apache/giraph/io/formats/IntNullTextEdgeInputFormat.java | 4 ++--
 .../LongDoubleDoubleAdjacencyListVertexInputFormat.java      | 8 ++++----
 .../giraph/master/AggregatorToGlobalCommTranslation.java     | 6 ++++--
 .../src/main/java/org/apache/giraph/zk/ZooKeeperManager.java | 8 +++++---
 .../org/apache/giraph/io/gora/GoraGEdgeEdgeInputFormat.java  | 5 +++--
 pom.xml                                                      | 4 ++--
 9 files changed, 25 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 3c31eb0..9c8481b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 1.2.0 - unreleased
+  GIRAPH-997: Upgrade findbugs to 3.0.0 (dlogothetis via majakabiljo)
+
   GIRAPH-996: Large requests degrade performance. Print out warnings. (dlogothetis via majakabiljo)
 
   GIRAPH-990. Current trunk will build for hadoop 1.2.0 not 0.20.203 as stated by documentation

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-core/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index ff129d0..6fea1a3 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -145,7 +145,7 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>3.0.0</version>
         <configuration>
           <xmlOutput>true</xmlOutput>
           <findbugsXmlOutput>false</findbugsXmlOutput>

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntTextVertexValueInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntTextVertexValueInputFormat.java
b/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntTextVertexValueInputFormat.java
index 1038a32..a1bfd32 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntTextVertexValueInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntTextVertexValueInputFormat.java
@@ -57,8 +57,8 @@ public class IntIntTextVertexValueInputFormat<E extends Writable>
extends
     @Override
     protected IntPair preprocessLine(Text line) throws IOException {
       String[] tokens = SEPARATOR.split(line.toString());
-      return new IntPair(Integer.valueOf(tokens[0]),
-          Integer.valueOf(tokens[1]));
+      return new IntPair(Integer.parseInt(tokens[0]),
+          Integer.parseInt(tokens[1]));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-core/src/main/java/org/apache/giraph/io/formats/IntNullTextEdgeInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/IntNullTextEdgeInputFormat.java
b/giraph-core/src/main/java/org/apache/giraph/io/formats/IntNullTextEdgeInputFormat.java
index 2b4b5d5..83d78b6 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/IntNullTextEdgeInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/IntNullTextEdgeInputFormat.java
@@ -55,8 +55,8 @@ public class IntNullTextEdgeInputFormat extends
     @Override
     protected IntPair preprocessLine(Text line) throws IOException {
       String[] tokens = SEPARATOR.split(line.toString());
-      return new IntPair(Integer.valueOf(tokens[0]),
-          Integer.valueOf(tokens[1]));
+      return new IntPair(Integer.parseInt(tokens[0]),
+          Integer.parseInt(tokens[1]));
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
b/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
index 18e4a52..a83499e 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
@@ -62,18 +62,18 @@ public class LongDoubleDoubleAdjacencyListVertexInputFormat
 
     @Override
     public LongWritable decodeId(String s) {
-      return new LongWritable(Long.valueOf(s));
+      return new LongWritable(Long.parseLong(s));
     }
 
     @Override
     public DoubleWritable decodeValue(String s) {
-      return new DoubleWritable(Double.valueOf(s));
+      return new DoubleWritable(Double.parseDouble(s));
     }
 
     @Override
     public Edge<LongWritable, DoubleWritable> decodeEdge(String s1, String s2) {
-      return EdgeFactory.create(new LongWritable(Long.valueOf(s1)),
-          new DoubleWritable(Double.valueOf(s2)));
+      return EdgeFactory.create(new LongWritable(Long.parseLong(s1)),
+          new DoubleWritable(Double.parseDouble(s2)));
     }
   }
 

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java
b/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java
index fa3f376..60538e2 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/AggregatorToGlobalCommTranslation.java
@@ -155,14 +155,16 @@ public class AggregatorToGlobalCommTranslation
   public <A extends Writable> boolean registerAggregator(String name,
       Class<? extends Aggregator<A>> aggregatorClass) throws
       InstantiationException, IllegalAccessException {
-    return registerAggregator(name, aggregatorClass, false) != null;
+    registerAggregator(name, aggregatorClass, false);
+    return true;
   }
 
   @Override
   public <A extends Writable> boolean registerPersistentAggregator(String name,
       Class<? extends Aggregator<A>> aggregatorClass) throws
       InstantiationException, IllegalAccessException {
-    return registerAggregator(name, aggregatorClass, true) != null;
+    registerAggregator(name, aggregatorClass, true);
+    return true;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
index 82a408b..63b521c 100644
--- a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
+++ b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
@@ -333,7 +333,7 @@ public class ZooKeeperManager {
           }
           if (!hostnameTaskMap.containsKey(hostnameTaskArray[0])) {
             hostnameTaskMap.put(hostnameTaskArray[0],
-                new Integer(hostnameTaskArray[1]));
+                Integer.valueOf(hostnameTaskArray[1]));
           }
         }
         if (LOG.isInfoEnabled()) {
@@ -834,8 +834,10 @@ public class ZooKeeperManager {
    * Do necessary cleanup in zookeeper wrapper.
    */
   public void cleanup() {
-    if (zkRunner != null) {
-      zkRunner.cleanup();
+    synchronized (this) {
+      if (zkRunner != null) {
+        zkRunner.cleanup();
+      }
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/giraph-gora/src/main/java/org/apache/giraph/io/gora/GoraGEdgeEdgeInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-gora/src/main/java/org/apache/giraph/io/gora/GoraGEdgeEdgeInputFormat.java
b/giraph-gora/src/main/java/org/apache/giraph/io/gora/GoraGEdgeEdgeInputFormat.java
index a2a3417..dd06b43 100644
--- a/giraph-gora/src/main/java/org/apache/giraph/io/gora/GoraGEdgeEdgeInputFormat.java
+++ b/giraph-gora/src/main/java/org/apache/giraph/io/gora/GoraGEdgeEdgeInputFormat.java
@@ -70,9 +70,10 @@ public class GoraGEdgeEdgeInputFormat
       Edge<LongWritable, FloatWritable> edge = null;
       GEdge goraEdge = (GEdge) goraObject;
       this.sourceId = new LongWritable();
-      this.sourceId.set(Long.valueOf(goraEdge.getVertexInId().toString()));
+      this.sourceId.set(Long.parseLong(goraEdge.getVertexInId().toString()));
       edge = EdgeFactory.create(
-          new LongWritable(Long.valueOf(goraEdge.getVertexOutId().toString())),
+          new LongWritable(
+              Long.parseLong(goraEdge.getVertexOutId().toString())),
           new FloatWritable(goraEdge.getEdgeWeight()));
       return edge;
     }

http://git-wip-us.apache.org/repos/asf/giraph/blob/8a952155/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87792a3..6c1bb0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -736,7 +736,7 @@ under the License.
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.0</version>
           <configuration>
             <xmlOutput>true</xmlOutput>
             <findbugsXmlOutput>false</findbugsXmlOutput>
@@ -891,7 +891,7 @@ under the License.
           <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>findbugs-maven-plugin</artifactId>
-              <version>2.5.1</version>
+              <version>3.0.0</version>
           </plugin>
     </plugins>
   </reporting>


Mime
View raw message