incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Fixing BLUR-419
Date Fri, 13 Mar 2015 01:27:52 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master 2a00b7d3a -> 5e46ce88e


Fixing BLUR-419


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/5e46ce88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/5e46ce88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/5e46ce88

Branch: refs/heads/master
Commit: 5e46ce88ee858cd8e0b0acfc3d12abe006dc013b
Parents: 2a00b7d
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Mar 12 21:27:55 2015 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Mar 12 21:27:55 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java    | 4 +---
 .../java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java    | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5e46ce88/blur-mapred-hadoop1/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
----------------------------------------------------------------------
diff --git a/blur-mapred-hadoop1/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
b/blur-mapred-hadoop1/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
index 1814945..1f3ea80 100644
--- a/blur-mapred-hadoop1/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
+++ b/blur-mapred-hadoop1/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
@@ -227,13 +227,11 @@ public class CsvBlurDriver {
       }
     }
     BlurOutputFormat.setupJob(job, tableDescriptor);
-    
+    BlurMapReduceUtil.addDependencyJars(job.getConfiguration(), Splitter.class);
     if (cmd.hasOption("r")) {
       int reducerMultiplier = Integer.parseInt(cmd.getOptionValue("r"));
       BlurOutputFormat.setReducerMultiplier(job, reducerMultiplier);
     }
-    
-    BlurMapReduceUtil.addDependencyJars(job.getConfiguration(), Splitter.class);
     return job;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5e46ce88/blur-mapred-hadoop2/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
----------------------------------------------------------------------
diff --git a/blur-mapred-hadoop2/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
b/blur-mapred-hadoop2/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
index 76ae35f..db5ece9 100644
--- a/blur-mapred-hadoop2/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
+++ b/blur-mapred-hadoop2/src/main/java/org/apache/blur/mapreduce/lib/CsvBlurDriver.java
@@ -219,10 +219,6 @@ public class CsvBlurDriver {
       int maxDocumentBufferSize = Integer.parseInt(cmd.getOptionValue("b"));
       BlurOutputFormat.setMaxDocumentBufferSize(job, maxDocumentBufferSize);
     }
-    if (cmd.hasOption("r")) {
-      int reducerMultiplier = Integer.parseInt(cmd.getOptionValue("r"));
-      BlurOutputFormat.setReducerMultiplier(job, reducerMultiplier);
-    }
     // processing the 'd' option
     Option[] options = cmd.getOptions();
     for (Option option : options) {
@@ -237,6 +233,10 @@ public class CsvBlurDriver {
     }
     BlurOutputFormat.setupJob(job, tableDescriptor);
     BlurMapReduceUtil.addDependencyJars(job.getConfiguration(), Splitter.class);
+    if (cmd.hasOption("r")) {
+      int reducerMultiplier = Integer.parseInt(cmd.getOptionValue("r"));
+      BlurOutputFormat.setReducerMultiplier(job, reducerMultiplier);
+    }
     return job;
   }
 


Mime
View raw message