You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/09/06 04:55:04 UTC
incubator-kylin git commit: KYLIN-1001 fix duplicated “/“ in hdfs path
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 b5c9722bb -> cc0ede30a
KYLIN-1001 fix duplicated “/“ in hdfs path
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/cc0ede30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/cc0ede30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/cc0ede30
Branch: refs/heads/0.8
Commit: cc0ede30a9dc27cf615b8b311066de49201e81a6
Parents: b5c9722
Author: shaofengshi <sh...@apache.org>
Authored: Sun Sep 6 10:54:30 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sun Sep 6 10:54:55 2015 +0800
----------------------------------------------------------------------
core-job/src/main/java/org/apache/kylin/job/JobInstance.java | 2 +-
.../main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java | 2 +-
.../java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java | 2 +-
.../main/java/org/apache/kylin/job/invertedindex/IIJobBuilder.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/cc0ede30/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/job/JobInstance.java b/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
index 80a5d78..001dfe5 100644
--- a/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
+++ b/core-job/src/main/java/org/apache/kylin/job/JobInstance.java
@@ -65,7 +65,7 @@ public class JobInstance extends RootPersistentEntity implements Comparable<JobI
if (jobUuid == null || jobUuid.equals("")) {
throw new IllegalArgumentException("jobUuid can't be null or empty");
}
- return hdfsWorkdingDir + "/" + JOB_WORKING_DIR_PREFIX + jobUuid;
+ return hdfsWorkdingDir + JOB_WORKING_DIR_PREFIX + jobUuid;
}
@JsonProperty("name")
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/cc0ede30/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
index 5f977bc..5fba37c 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
@@ -157,7 +157,7 @@ public class JobBuilderSupport {
// ----------------------------------------------------------------------------
public static String getJobWorkingDir(JobEngineConfig conf, String jobId) {
- return conf.getHdfsWorkingDirectory() + "/" + "kylin-" + jobId;
+ return conf.getHdfsWorkingDirectory() + "kylin-" + jobId;
}
public static StringBuilder appendExecCmdParameters(StringBuilder buf, String paraName, String paraValue) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/cc0ede30/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
index f140784..53b489e 100644
--- a/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
+++ b/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
@@ -177,7 +177,7 @@ public class StorageCleanupJob extends AbstractHadoopJob {
String path = status.getPath().getName();
// System.out.println(path);
if (path.startsWith(JobInstance.JOB_WORKING_DIR_PREFIX)) {
- String kylinJobPath = engineConfig.getHdfsWorkingDirectory() + "/" + path;
+ String kylinJobPath = engineConfig.getHdfsWorkingDirectory() + path;
allHdfsPathsNeedToBeDeleted.add(kylinJobPath);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/cc0ede30/job/src/main/java/org/apache/kylin/job/invertedindex/IIJobBuilder.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/invertedindex/IIJobBuilder.java b/job/src/main/java/org/apache/kylin/job/invertedindex/IIJobBuilder.java
index b4f69d6..4bd06c5 100644
--- a/job/src/main/java/org/apache/kylin/job/invertedindex/IIJobBuilder.java
+++ b/job/src/main/java/org/apache/kylin/job/invertedindex/IIJobBuilder.java
@@ -221,7 +221,7 @@ public final class IIJobBuilder {
}
private String getJobWorkingDir(String uuid) {
- return engineConfig.getHdfsWorkingDirectory() + "/" + "kylin-" + uuid;
+ return engineConfig.getHdfsWorkingDirectory() + "kylin-" + uuid;
}
private String getIntermediateTableIdentity(IIJoinedFlatTableDesc intermediateTableDesc) {