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/11/21 03:40:54 UTC

kylin git commit: KYLIN-2218 modify cardinality hdfs dir

Repository: kylin
Updated Branches:
  refs/heads/master 09ac74c8c -> a179f5e83


KYLIN-2218 modify cardinality hdfs dir

Signed-off-by: Li Yang <li...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a179f5e8
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a179f5e8
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a179f5e8

Branch: refs/heads/master
Commit: a179f5e830716947c81dae7540081dd8b38695c8
Parents: 09ac74c
Author: Cheng Wang <ch...@kyligence.io>
Authored: Mon Nov 21 10:51:55 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Mon Nov 21 11:40:45 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/rest/service/CubeService.java | 4 ++--
 .../kylin/source/hive/cardinality/HiveColumnCardinalityJob.java  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/a179f5e8/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
index 5252f59..f0371d1 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
@@ -96,7 +96,7 @@ public class CubeService extends BasicService {
 
     @Autowired
     private JobService jobService;
-    
+
     @PostFilter(Constant.ACCESS_POST_FILTER_READ)
     public List<CubeInstance> listAllCubes(final String cubeName, final String projectName, final String modelName) {
         List<CubeInstance> cubeInstances = null;
@@ -470,7 +470,7 @@ public class CubeService extends BasicService {
         job.setName("Hive Column Cardinality calculation for table '" + tableName + "'");
         job.setSubmitter(submitter);
 
-        String outPath = HiveColumnCardinalityJob.OUTPUT_PATH + "/" + tableName;
+        String outPath = getConfig().getHdfsWorkingDirectory() + "cardinality/" + job.getId() + "/" + tableName;
         String param = "-table " + tableName + " -output " + outPath;
 
         MapReduceExecutable step1 = new MapReduceExecutable();

http://git-wip-us.apache.org/repos/asf/kylin/blob/a179f5e8/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java
----------------------------------------------------------------------
diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java
index 82c72ad..3c88024 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java
@@ -49,8 +49,6 @@ public class HiveColumnCardinalityJob extends AbstractHadoopJob {
     @SuppressWarnings("static-access")
     protected static final Option OPTION_TABLE = OptionBuilder.withArgName("table name").hasArg().isRequired(true).withDescription("The hive table name").create("table");
 
-    public static final String OUTPUT_PATH = BatchConstants.CFG_KYLIN_HDFS_TEMP_DIR + "cardinality";
-
     public HiveColumnCardinalityJob() {
     }