You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/10/19 03:05:59 UTC
[46/50] [abbrv] kylin git commit: KYLIN-1839 minor refactor
KYLIN-1839 minor refactor
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6cafc422
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6cafc422
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6cafc422
Branch: refs/heads/master-cdh5.7
Commit: 6cafc422bc0ca2fa19a4516bcb4388719c99184c
Parents: aa1550c
Author: Yang Li <li...@apache.org>
Authored: Wed Oct 19 08:19:35 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Wed Oct 19 08:30:49 2016 +0800
----------------------------------------------------------------------
.../kylin/engine/mr/common/AbstractHadoopJob.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/6cafc422/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java
index f70e3bb..a5b2d2e 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java
@@ -318,7 +318,7 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
}
if (fs.getFileStatus(p).isDirectory()) {
- appendTmpDir(job, fs, p);
+ appendTmpDir(job, fs, p, jarList, fileList);
continue;
}
@@ -335,18 +335,14 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
}
}
- private void appendTmpDir(Job job, FileSystem fs, Path tmpDir) {
+ private void appendTmpDir(Job job, FileSystem fs, Path tmpDir, StringBuilder jarList, StringBuilder fileList) {
try {
- Configuration jobConf = job.getConfiguration();
FileStatus[] fList = fs.listStatus(tmpDir);
- StringBuilder jarList = new StringBuilder();
- StringBuilder fileList = new StringBuilder();
-
for (FileStatus file : fList) {
Path p = file.getPath();
if (fs.getFileStatus(p).isDirectory()) {
- appendTmpDir(job, fs, p);
+ appendTmpDir(job, fs, p, jarList, fileList);
continue;
}
@@ -356,9 +352,6 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
list.append(fs.getFileStatus(p).getPath().toString());
}
- appendTmpFiles(fileList.toString(), jobConf);
- appendTmpJars(jarList.toString(), jobConf);
-
} catch (IOException e) {
throw new RuntimeException(e);
}