crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwi...@apache.org
Subject git commit: CRUNCH-461: Use properly configured JobContext with the CombineFileInputFormat
Date Sat, 09 Aug 2014 17:23:53 GMT
Repository: crunch
Updated Branches:
  refs/heads/master f17d7f7b0 -> f0f75f3c7


CRUNCH-461: Use properly configured JobContext with the CombineFileInputFormat


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

Branch: refs/heads/master
Commit: f0f75f3c731fca2c629e881532ac6d66ece97f65
Parents: f17d7f7
Author: Josh Wills <jwills@apache.org>
Authored: Fri Aug 8 17:40:13 2014 -0700
Committer: Josh Wills <jwills@apache.org>
Committed: Fri Aug 8 17:40:13 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/crunch/impl/mr/run/CrunchInputFormat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/crunch/blob/f0f75f3c/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputFormat.java
----------------------------------------------------------------------
diff --git a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputFormat.java
b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputFormat.java
index 8f1c853..8c173cc 100644
--- a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputFormat.java
+++ b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputFormat.java
@@ -53,7 +53,7 @@ public class CrunchInputFormat<K, V> extends InputFormat<K, V>
{
       InputFormat<?, ?> format = (InputFormat<?, ?>) ReflectionUtils.newInstance(inputBundle.getFormatClass(),
           jobCopy.getConfiguration());
       if (format instanceof FileInputFormat && !conf.getBoolean(RuntimeParameters.DISABLE_COMBINE_FILE,
true)) {
-        format = new CrunchCombineFileInputFormat<Object, Object>(job);
+        format = new CrunchCombineFileInputFormat<Object, Object>(jobCopy);
       }
       for (Map.Entry<Integer, List<Path>> nodeEntry : entry.getValue().entrySet())
{
         Integer nodeIndex = nodeEntry.getKey();


Mime
View raw message