[20/50] [abbrv] kylin git commit: KYLIN-1839 minor refactor

2016-10-20 Thread liyang 
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/KYLIN-1971
Commit: 6cafc422bc0ca2fa19a4516bcb4388719c99184c
Parents: aa1550c
Author: Yang Li 
Authored: Wed Oct 19 08:19:35 2016 +0800
Committer: Yang Li 
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);
 }

[46/50] [abbrv] kylin git commit: KYLIN-1839 minor refactor

2016-10-18 Thread lidong 
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 
Authored: Wed Oct 19 08:19:35 2016 +0800
Committer: Yang Li 
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);
 }

[47/50] [abbrv] kylin git commit: KYLIN-1839 minor refactor

2016-10-18 Thread lidong 
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-hbase1.x
Commit: 6cafc422bc0ca2fa19a4516bcb4388719c99184c
Parents: aa1550c
Author: Yang Li 
Authored: Wed Oct 19 08:19:35 2016 +0800
Committer: Yang Li 
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);
 }

kylin git commit: KYLIN-1839 minor refactor

2016-10-18 Thread liyang 
Repository: kylin
Updated Branches:
  refs/heads/master aa1550c9e -> 6cafc422b


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
Commit: 6cafc422bc0ca2fa19a4516bcb4388719c99184c
Parents: aa1550c
Author: Yang Li 
Authored: Wed Oct 19 08:19:35 2016 +0800
Committer: Yang Li 
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);
 }