You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/09/06 10:00:06 UTC
[42/50] [abbrv] incubator-kylin git commit: KYLIN-1001 Kylin
generates wrong HDFS path in creating intermediate table
KYLIN-1001 Kylin generates wrong HDFS path in creating intermediate table
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/412a1504
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/412a1504
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/412a1504
Branch: refs/heads/0.7
Commit: 412a150488e0130209d5dfcd637457f955dbdc6b
Parents: cc23122
Author: shaofengshi <sh...@apache.org>
Authored: Sun Sep 6 10:48:32 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Sun Sep 6 14:38:00 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/job/AbstractJobBuilder.java | 2 +-
job/src/main/java/org/apache/kylin/job/JobInstance.java | 2 +-
.../apache/kylin/job/hadoop/cube/StorageCleanupJob.java | 2 +-
.../org/apache/kylin/rest/service/PerformService.java | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/412a1504/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java b/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
index 96b87c5..ffbfe98 100644
--- a/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
+++ b/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
@@ -94,6 +94,6 @@ public abstract class AbstractJobBuilder {
}
protected String getJobWorkingDir(String uuid) {
- return engineConfig.getHdfsWorkingDirectory() + "/" + JOB_WORKING_DIR_PREFIX + uuid;
+ return engineConfig.getHdfsWorkingDirectory() + JOB_WORKING_DIR_PREFIX + uuid;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/412a1504/job/src/main/java/org/apache/kylin/job/JobInstance.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/JobInstance.java b/job/src/main/java/org/apache/kylin/job/JobInstance.java
index 6a07aca..82d4753 100644
--- a/job/src/main/java/org/apache/kylin/job/JobInstance.java
+++ b/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/412a1504/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 fda1275..46f0849 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
@@ -169,7 +169,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/412a1504/server/src/main/java/org/apache/kylin/rest/service/PerformService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/PerformService.java b/server/src/main/java/org/apache/kylin/rest/service/PerformService.java
index 9df9d4a..8d6ed7b 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/PerformService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/PerformService.java
@@ -45,7 +45,7 @@ public class PerformService extends BasicService {
* @return all query user
*/
public List<String[]> getTotalQueryUser() throws IOException {
- String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/performance/metadata/total_query_user.csv";
+ String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "performance/metadata/total_query_user.csv";
List<String[]> res = readHdfsFile(filePath);
logger.info("Total Query User:" + res.get(0)[0]);
return res;
@@ -55,7 +55,7 @@ public class PerformService extends BasicService {
* @return last 30 daily query num
*/
public List<String[]> dailyQueryCount() throws IOException {
- String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/performance/metadata/last_30_daily_query_count.csv";
+ String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "performance/metadata/last_30_daily_query_count.csv";
List<String[]> res = readHdfsFile(filePath);
return res;
}
@@ -64,7 +64,7 @@ public class PerformService extends BasicService {
* @return average query count every day
*/
public List<String[]> avgDayQuery() throws IOException {
- String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/performance/metadata/avg_day_query.csv";
+ String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "performance/metadata/avg_day_query.csv";
List<String[]> res = readHdfsFile(filePath);
logger.info("Avg Day Query:" + res.get(0)[0]);
return res;
@@ -74,7 +74,7 @@ public class PerformService extends BasicService {
*@return average latency every day
*/
public List<String[]> last30DayPercentile() throws IOException {
- String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/performance/metadata/last_30_day_90_percentile_latency.csv";
+ String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "performance/metadata/last_30_day_90_percentile_latency.csv";
List<String[]> res = readHdfsFile(filePath);
return res;
}
@@ -83,7 +83,7 @@ public class PerformService extends BasicService {
*@return average latency for every cube
*/
public List<String[]> eachDayPercentile() throws IOException {
- String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/performance/metadata/each_day_90_95_percentile_latency.csv";
+ String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "performance/metadata/each_day_90_95_percentile_latency.csv";
List<String[]> res = readHdfsFile(filePath);
return res;
}
@@ -92,7 +92,7 @@ public class PerformService extends BasicService {
*@return average latency for every cube
*/
public List<String[]> projectPercentile() throws IOException {
- String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/performance/metadata/project_90_95_percentile_latency.csv";
+ String filePath = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "performance/metadata/project_90_95_percentile_latency.csv";
List<String[]> res = readHdfsFile(filePath);
return res;
}