Repository: kylin Updated Branches: refs/heads/2846 [created] a185a2342
Add a config of hbase namespace for cube storage Signed-off-by: shaofengshi <shaofeng...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c10013a5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c10013a5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c10013a5 Branch: refs/heads/2846 Commit: c10013a5f8fa18274294368cdc6df0dad0597da3 Parents: d0ff774 Author: Liu Shaohui <liushao...@xiaomi.com> Authored: Tue Sep 5 15:50:29 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Oct 21 22:30:14 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++++ core-common/src/main/resources/kylin-defaults.properties | 3 +++ core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 2 ++ .../java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java | 2 +- .../java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c10013a5/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java index f3cf6c0..945c234 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java @@ -780,6 +780,10 @@ abstract public class KylinConfigBase implements Serializable { return getOptional("kylin.storage.hbase.table-name-prefix", "KYLIN_"); } + public String getHBaseStorageNameSpace() { + return getOptional("kylin.storage.hbase.namespace", "default"); + } + public String getHBaseClusterFs() { return getOptional("kylin.storage.hbase.cluster-fs", ""); } http://git-wip-us.apache.org/repos/asf/kylin/blob/c10013a5/core-common/src/main/resources/kylin-defaults.properties ---------------------------------------------------------------------- diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties index e3632ae..1602087 100644 --- a/core-common/src/main/resources/kylin-defaults.properties +++ b/core-common/src/main/resources/kylin-defaults.properties @@ -77,6 +77,9 @@ kylin.storage.url=hbase # The prefix of hbase table kylin.storage.hbase.table-name-prefix=KYLIN_ +# The namespace for hbase storage +kylin.storage.hbase.namespace=default + # Compression codec for htable, valid value [none, snappy, lzo, gzip, lz4] kylin.storage.hbase.compression-codec=none http://git-wip-us.apache.org/repos/asf/kylin/blob/c10013a5/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java index 3bb9f21..967f71f 100755 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java @@ -675,10 +675,12 @@ public class CubeManager implements IRealizationProvider { @VisibleForTesting /*private*/ String generateStorageLocation() { String namePrefix = config.getHBaseTableNamePrefix(); + String namespace = config.getHBaseStorageNameSpace(); String tableName = ""; Random ran = new Random(); do { StringBuffer sb = new StringBuffer(); + sb.append(namespace).append(":"); sb.append(namePrefix); for (int i = 0; i < HBASE_TABLE_LENGTH; i++) { sb.append(ALPHA_NUM.charAt(ran.nextInt(ALPHA_NUM.length()))); http://git-wip-us.apache.org/repos/asf/kylin/blob/c10013a5/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java index 30616c5..d1caccb 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java @@ -47,7 +47,7 @@ public class BulkLoadJob extends AbstractHadoopJob { options.addOption(OPTION_CUBE_NAME); parseOptions(options, args); - String tableName = getOptionValue(OPTION_HTABLE_NAME).toUpperCase(); + String tableName = getOptionValue(OPTION_HTABLE_NAME); // e.g // /tmp/kylin-3f150b00-3332-41ca-9d3d-652f67f044d7/test_kylin_cube_with_slr_ready_2_segments/hfile/ // end with "/" http://git-wip-us.apache.org/repos/asf/kylin/blob/c10013a5/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java index 7dc67e5..8de772f 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java @@ -67,7 +67,7 @@ public class CubeHFileJob extends AbstractHadoopJob { Path partitionFilePath = new Path(getOptionValue(OPTION_PARTITION_FILE_PATH)); Path output = new Path(getOptionValue(OPTION_OUTPUT_PATH)); - String cubeName = getOptionValue(OPTION_CUBE_NAME).toUpperCase(); + String cubeName = getOptionValue(OPTION_CUBE_NAME); CubeManager cubeMgr = CubeManager.getInstance(KylinConfig.getInstanceFromEnv());
