giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edu...@apache.org
Subject git commit: updated refs/heads/trunk to ebb4249
Date Wed, 29 Mar 2017 16:57:19 GMT
Repository: giraph
Updated Branches:
  refs/heads/trunk 2173d87cf -> ebb424989


closes #29


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

Branch: refs/heads/trunk
Commit: ebb424989c23060feb869e0cf817a4d5285c853e
Parents: 2173d87
Author: Dionysios Logothetis <dionysios@fb.com>
Authored: Wed Mar 29 09:56:59 2017 -0700
Committer: Sergey Edunov <edunov@fb.com>
Committed: Wed Mar 29 09:56:59 2017 -0700

----------------------------------------------------------------------
 .../block_app/framework/output/BlockOutputFormat.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/ebb42498/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/output/BlockOutputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/output/BlockOutputFormat.java
b/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/output/BlockOutputFormat.java
index 818a311..6c1e960 100644
--- a/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/output/BlockOutputFormat.java
+++ b/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/output/BlockOutputFormat.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
  */
 public class BlockOutputFormat extends BspOutputFormat {
   private static final StrConfOption OUTPUT_CONF_OPTIONS = new StrConfOption(
-      "digraph.outputConfOptions", "",
+      "giraph.outputConfOptions", "",
       "List of conf options for outputs used");
 
   public static <OD> void addOutputDesc(OD outputDesc, String confOption,
@@ -53,7 +53,12 @@ public class BlockOutputFormat extends BspOutputFormat {
     ConfigurationObjectUtils.setObjectKryo(outputDesc, confOption, conf);
   }
 
-  private static String[] getOutputConfOptions(Configuration conf) {
+  /**
+   * Returns an array of output configuration options set in the input configuration.
+   * @param conf Configuration
+   * @return Array of options
+   */
+  public static String[] getOutputConfOptions(Configuration conf) {
     String outputConfOptions = OUTPUT_CONF_OPTIONS.get(conf);
     return outputConfOptions.isEmpty() ?
         new String[0] : outputConfOptions.split(",");


Mime
View raw message