giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ach...@apache.org
Subject git commit: GIRAPH-561: Only print vertex/edge input classes if not null (aching)
Date Wed, 13 Mar 2013 23:05:05 GMT
Updated Branches:
  refs/heads/trunk 1d9c7d314 -> a0433d21d


GIRAPH-561: Only print vertex/edge input classes if not null (aching)


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

Branch: refs/heads/trunk
Commit: a0433d21daeec7877e6f9a1567dd974dfdb64278
Parents: 1d9c7d3
Author: aching <aching@apache.org>
Authored: Wed Mar 13 15:27:00 2013 -0700
Committer: aching <aching@apache.org>
Committed: Wed Mar 13 15:54:17 2013 -0700

----------------------------------------------------------------------
 CHANGELOG                                          |    2 ++
 .../apache/giraph/io/ReverseEdgeDuplicator.java    |    2 +-
 .../org/apache/giraph/hive/HiveGiraphRunner.java   |   14 +++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/a0433d21/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9ca3b3b..b4802d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-561: Only print vertex/edge input classes if not null (aching)
+
   GIRAPH-554: Set PartitionContext in InternalVertexRunner (majakabiljo)
 
   GIRAPH-559: Giraph build breaks (nitay)

http://git-wip-us.apache.org/repos/asf/giraph/blob/a0433d21/giraph-core/src/main/java/org/apache/giraph/io/ReverseEdgeDuplicator.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/ReverseEdgeDuplicator.java b/giraph-core/src/main/java/org/apache/giraph/io/ReverseEdgeDuplicator.java
index e85931f..d6cb886 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/ReverseEdgeDuplicator.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/ReverseEdgeDuplicator.java
@@ -32,7 +32,7 @@ import java.io.IOException;
  * Used to create an undirected graph from a directed input.
  * This class is a decorator around any other EdgeReader.
  *
- * @param <I> Vertex ID
+ * @param <I> Vertex id
  * @param <E> Edge Value
  */
 public class ReverseEdgeDuplicator<I extends WritableComparable,

http://git-wip-us.apache.org/repos/asf/giraph/blob/a0433d21/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
----------------------------------------------------------------------
diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
index c40c482..8788a9d 100644
--- a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
+++ b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
@@ -658,17 +658,21 @@ public class HiveGiraphRunner implements Tool {
       LOG.info(LOG_PREFIX + "-hiveToVertexEdgesClass=" +
           hiveToVertexEdgesClass.getCanonicalName());
     }
-    LOG.info(LOG_PREFIX + "-vertexInputFormatClass=" +
-        classes.getVertexInputFormatClass().getCanonicalName());
-    logInputDesc(hiveVertexInputDescription, "vertex");
+    if (classes.getVertexInputFormatClass() != null) {
+      LOG.info(LOG_PREFIX + "-vertexInputFormatClass=" +
+          classes.getVertexInputFormatClass().getCanonicalName());
+      logInputDesc(hiveVertexInputDescription, "vertex");
+    }
 
     if (hiveToEdgeClass != null) {
       LOG.info(LOG_PREFIX + "-hiveToEdgeClass=" +
           hiveToEdgeClass.getCanonicalName());
     }
-    LOG.info(LOG_PREFIX + "-edgeInputFormatClass=" +
+    if (classes.getEdgeInputFormatClass() != null) {
+      LOG.info(LOG_PREFIX + "-edgeInputFormatClass=" +
         classes.getEdgeInputFormatClass().getCanonicalName());
-    logInputDesc(hiveEdgeInputDescription, "edge");
+      logInputDesc(hiveEdgeInputDescription, "edge");
+    }
 
     LOG.info(LOG_PREFIX + "-outputTable=" +
         hiveOutputDescription.getTableName());


Mime
View raw message