Repository: kylin Updated Branches: refs/heads/2846 f374d6caa -> e96588db1
KYLIN-2846 update unit test Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e96588db Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e96588db Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e96588db Branch: refs/heads/2846 Commit: e96588db10cd4e403fc8ddeb334060106cdbd541 Parents: f374d6c Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Oct 21 23:25:41 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Oct 21 23:25:41 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/cube/CubeManager.java | 4 +++- .../test/java/org/apache/kylin/cube/CubeManagerTest.java | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e96588db/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 967f71f..602dbde 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 @@ -680,7 +680,9 @@ public class CubeManager implements IRealizationProvider { Random ran = new Random(); do { StringBuffer sb = new StringBuffer(); - sb.append(namespace).append(":"); + if ((namespace.equals("default") || namespace.equals("")) == false) { + 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/e96588db/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java ---------------------------------------------------------------------- diff --git a/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java b/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java index d8d48f7..3f68bab 100644 --- a/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java +++ b/core-cube/src/test/java/org/apache/kylin/cube/CubeManagerTest.java @@ -314,8 +314,18 @@ public class CubeManagerTest extends LocalFileMetadataTestCase { } finally { System.clearProperty("kylin.storage.hbase.table-name-prefix"); } + + System.setProperty("kylin.storage.hbase.namespace", "MYSPACE"); + try { + CubeManager mgr = CubeManager.getInstance(getTestConfig()); + String tablename = mgr.generateStorageLocation(); + assertTrue(tablename.startsWith("MYSPACE:")); + } finally { + System.clearProperty("kylin.storage.hbase.namespace"); + } } + public CubeDescManager getCubeDescManager() { return CubeDescManager.getInstance(getTestConfig()); }
