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/12/30 08:11:08 UTC
[43/50] [abbrv] kylin git commit: KYLIN-2328 minor review,
open protected dumpKylinPropsAndMetadata for sub-class
KYLIN-2328 minor review, open protected dumpKylinPropsAndMetadata for sub-class
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5cbef32f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5cbef32f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5cbef32f
Branch: refs/heads/master-hbase1.x
Commit: 5cbef32fcd51bffe31f92a985bb5d02405fb7b7c
Parents: 75c8d13
Author: Yang Li <li...@apache.org>
Authored: Fri Dec 30 06:57:42 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Fri Dec 30 06:57:42 2016 +0800
----------------------------------------------------------------------
.../apache/kylin/engine/mr/common/AbstractHadoopJob.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5cbef32f/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 4693ac3..e4e5e82 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
@@ -451,11 +451,11 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
protected void attachTableMetadata(TableDesc table, Configuration conf) throws IOException {
Set<String> dumpList = new LinkedHashSet<>();
dumpList.add(table.getResourcePath());
- attachKylinPropsAndMetadata(dumpList, KylinConfig.getInstanceFromEnv(), conf);
+ dumpKylinPropsAndMetadata(dumpList, KylinConfig.getInstanceFromEnv(), conf);
}
protected void attachCubeMetadata(CubeInstance cube, Configuration conf) throws IOException {
- attachKylinPropsAndMetadata(collectCubeMetadata(cube), cube.getConfig(), conf);
+ dumpKylinPropsAndMetadata(collectCubeMetadata(cube), cube.getConfig(), conf);
}
protected void attachCubeMetadataWithDict(CubeInstance cube, Configuration conf) throws IOException {
@@ -464,14 +464,14 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
for (CubeSegment segment : cube.getSegments()) {
dumpList.addAll(segment.getDictionaryPaths());
}
- attachKylinPropsAndMetadata(dumpList, cube.getConfig(), conf);
+ dumpKylinPropsAndMetadata(dumpList, cube.getConfig(), conf);
}
protected void attachSegmentMetadataWithDict(CubeSegment segment, Configuration conf) throws IOException {
Set<String> dumpList = new LinkedHashSet<>();
dumpList.addAll(collectCubeMetadata(segment.getCubeInstance()));
dumpList.addAll(segment.getDictionaryPaths());
- attachKylinPropsAndMetadata(dumpList, segment.getConfig(), conf);
+ dumpKylinPropsAndMetadata(dumpList, segment.getConfig(), conf);
}
private Set<String> collectCubeMetadata(CubeInstance cube) {
@@ -490,7 +490,7 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
return dumpList;
}
- private void attachKylinPropsAndMetadata(Set<String> dumpList, KylinConfig kylinConfig, Configuration conf) throws IOException {
+ protected void dumpKylinPropsAndMetadata(Set<String> dumpList, KylinConfig kylinConfig, Configuration conf) throws IOException {
File tmp = File.createTempFile("kylin_job_meta", "");
FileUtils.forceDelete(tmp); // we need a directory, so delete the file first