Repository: incubator-kylin Updated Branches: refs/heads/0.8 7497bb93b -> e5a373a20
KYLIN-926 fix /tmp/cardinality path and minicluster tgz relative 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/e5a373a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/e5a373a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/e5a373a2 Branch: refs/heads/0.8 Commit: e5a373a200c089b78c9498c0276537b2c24e3f87 Parents: 7497bb9 Author: honma <ho...@ebay.com> Authored: Wed Aug 19 10:13:56 2015 +0800 Committer: honma <ho...@ebay.com> Committed: Wed Aug 19 10:13:56 2015 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/engine/mr/common/BatchConstants.java | 3 ++- .../kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java | 2 +- job/src/test/java/org/apache/kylin/job/ExportHBaseData.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5a373a2/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java index 127320c..09397d6 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java @@ -41,8 +41,9 @@ public interface BatchConstants { String CUBE_CAPACITY = "cube.capacity"; String CFG_KYLIN_LOCAL_TEMP_DIR = "/tmp/kylin/"; - String CFG_STATISTICS_LOCAL_DIR = CFG_KYLIN_LOCAL_TEMP_DIR + "cuboidstatistics/"; + String CFG_KYLIN_HDFS_TEMP_DIR = "/tmp/kylin/"; + String CFG_STATISTICS_LOCAL_DIR = CFG_KYLIN_LOCAL_TEMP_DIR + "cuboidstatistics/"; String CFG_STATISTICS_ENABLED = "statistics.enabled"; String CFG_STATISTICS_OUTPUT = "statistics.ouput"; String CFG_STATISTICS_SAMPLING_PERCENT = "statistics.sampling.percent"; http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5a373a2/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java ---------------------------------------------------------------------- diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java index 61aa8eb..89d20cf 100644 --- a/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java +++ b/job/src/main/java/org/apache/kylin/job/hadoop/cardinality/HiveColumnCardinalityJob.java @@ -45,7 +45,7 @@ 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 = "/tmp/cardinality"; + public static final String OUTPUT_PATH = BatchConstants.CFG_KYLIN_HDFS_TEMP_DIR + "cardinality"; public HiveColumnCardinalityJob() { } http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e5a373a2/job/src/test/java/org/apache/kylin/job/ExportHBaseData.java ---------------------------------------------------------------------- diff --git a/job/src/test/java/org/apache/kylin/job/ExportHBaseData.java b/job/src/test/java/org/apache/kylin/job/ExportHBaseData.java index 09e7fa4..4e08871 100644 --- a/job/src/test/java/org/apache/kylin/job/ExportHBaseData.java +++ b/job/src/test/java/org/apache/kylin/job/ExportHBaseData.java @@ -127,7 +127,7 @@ public class ExportHBaseData { } cli.execute("hadoop fs -copyToLocal " + exportHdfsFolder + " " + exportLocalFolderParent); - cli.execute("tar -zcvf " + backupArchive + " " + exportLocalFolder); + cli.execute("tar -zcvf " + backupArchive + " --directory=" + exportLocalFolderParent + " ."); downloadToLocal(); }
