Repository: kylin Updated Branches: refs/heads/KYLIN-2242 7de8aa120 -> 63cd178fb
KYLIN-2242 fix CI Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/63cd178f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/63cd178f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/63cd178f Branch: refs/heads/KYLIN-2242 Commit: 63cd178fb3436ba166bb60f0fd08a0bf508382b2 Parents: 7de8aa1 Author: shaofengshi <shaofeng...@apache.org> Authored: Sun Jan 22 09:43:10 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sun Jan 22 09:43:10 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/util/HadoopUtil.java | 4 ++++ .../org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java | 2 +- .../kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/63cd178f/core-common/src/main/java/org/apache/kylin/common/util/HadoopUtil.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/HadoopUtil.java b/core-common/src/main/java/org/apache/kylin/common/util/HadoopUtil.java index b9ffe38..f242515 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/HadoopUtil.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/HadoopUtil.java @@ -143,6 +143,10 @@ public class HadoopUtil { } public static Path getFilterOnlyPath(FileSystem fs, Path baseDir, final String filter) throws IOException { + if (fs.exists(baseDir) == false) { + return null; + } + FileStatus[] fileStatus = fs.listStatus(baseDir, new PathFilter() { @Override public boolean accept(Path path) { http://git-wip-us.apache.org/repos/asf/kylin/blob/63cd178f/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java index e5d053b..5b1a7cf 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java @@ -69,7 +69,7 @@ public class CreateDictionaryJob extends AbstractHadoopJob { @Override public Dictionary<String> getDictionary(TblColRef col) throws IOException { Path colDir = new Path(factColumnsInputPath, col.getName()); - FileSystem fs = HadoopUtil.getFileSystem(colDir.toString()); + FileSystem fs = HadoopUtil.getWorkingFileSystem(); Path dictFile = HadoopUtil.getFilterOnlyPath(fs, colDir, col.getName() + FactDistinctColumnsReducer.DICT_FILE_POSTFIX); if (dictFile == null) { http://git-wip-us.apache.org/repos/asf/kylin/blob/63cd178f/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java index 81d5c42..22faa4d 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterBuildStep.java @@ -81,7 +81,7 @@ public class UpdateCubeInfoAfterBuildStep extends AbstractExecutable { final TblColRef partitionCol = segment.getCubeDesc().getModel().getPartitionDesc().getPartitionDateColumnRef(); final String factColumnsInputPath = this.getParams().get(BatchConstants.CFG_OUTPUT_PATH); Path colDir = new Path(factColumnsInputPath, partitionCol.getName()); - FileSystem fs = HadoopUtil.getFileSystem(colDir.toString()); + FileSystem fs = HadoopUtil.getWorkingFileSystem(); Path outputFile = HadoopUtil.getFilterOnlyPath(fs, colDir, partitionCol.getName() + FactDistinctColumnsReducer.PARTITION_COL_INFO_FILE_POSTFIX); if (outputFile == null) { throw new IOException("fail to find the partition file in base dir: " + colDir);