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 2017/03/08 09:57:31 UTC
kylin git commit: KYLIN-2477 bug fix
Repository: kylin
Updated Branches:
refs/heads/KYLIN-2477 [created] 2dfffde26
KYLIN-2477 bug fix
Signed-off-by: Hongbin Ma <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2dfffde2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2dfffde2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2dfffde2
Branch: refs/heads/KYLIN-2477
Commit: 2dfffde267c91312fa9ff7644ecba46e3570e005
Parents: 01abb00
Author: xiefan46 <95...@qq.com>
Authored: Wed Mar 8 17:52:10 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Wed Mar 8 17:56:54 2017 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/common/KylinConfigBase.java | 2 +-
.../kylin/common/persistence/LocalFileResourceStoreTest.java | 2 +-
.../apache/kylin/common/persistence/ResourceStoreTest.java | 8 ++++----
.../apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java | 2 +-
.../apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java | 7 +++----
5 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/2dfffde2/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 917879d..02b2d4b 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
@@ -971,7 +971,7 @@ abstract public class KylinConfigBase implements Serializable {
public String getResourceStoreImpl() {
String metadataUrl = KylinConfig.getInstanceFromEnv().getMetadataUrl();
int cut = metadataUrl.indexOf('@');
- String key = cut < 0 ? "" : metadataUrl.substring(0, cut);
+ String key = cut < 0 ? "" : metadataUrl.substring(cut + 1);
return getResourceStoreImpls().get(key);
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/2dfffde2/core-common/src/test/java/org/apache/kylin/common/persistence/LocalFileResourceStoreTest.java
----------------------------------------------------------------------
diff --git a/core-common/src/test/java/org/apache/kylin/common/persistence/LocalFileResourceStoreTest.java b/core-common/src/test/java/org/apache/kylin/common/persistence/LocalFileResourceStoreTest.java
index db22d96..17b608d 100644
--- a/core-common/src/test/java/org/apache/kylin/common/persistence/LocalFileResourceStoreTest.java
+++ b/core-common/src/test/java/org/apache/kylin/common/persistence/LocalFileResourceStoreTest.java
@@ -38,7 +38,7 @@ public class LocalFileResourceStoreTest extends LocalFileMetadataTestCase {
@Test
public void testFileStore() throws Exception {
- ResourceStoreTest.testAStore("org.apache.kylin.common.persistence.FileResourceStore", "", KylinConfig.getInstanceFromEnv());
+ ResourceStoreTest.testAStore("", KylinConfig.getInstanceFromEnv());
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/2dfffde2/core-common/src/test/java/org/apache/kylin/common/persistence/ResourceStoreTest.java
----------------------------------------------------------------------
diff --git a/core-common/src/test/java/org/apache/kylin/common/persistence/ResourceStoreTest.java b/core-common/src/test/java/org/apache/kylin/common/persistence/ResourceStoreTest.java
index 10714a5..76ab029 100644
--- a/core-common/src/test/java/org/apache/kylin/common/persistence/ResourceStoreTest.java
+++ b/core-common/src/test/java/org/apache/kylin/common/persistence/ResourceStoreTest.java
@@ -46,15 +46,15 @@ public class ResourceStoreTest {
private static final int TEST_RESOURCE_COUNT = 100;
- public static void testAStore(String storeName, String url, KylinConfig kylinConfig) throws Exception {
+ public static void testAStore(String url, KylinConfig kylinConfig) throws Exception {
String oldUrl = replaceMetadataUrl(kylinConfig, url);
- testAStore(getStoreByName(storeName, kylinConfig));
+ testAStore(getStoreByName(kylinConfig.getResourceStoreImpl(), kylinConfig));
replaceMetadataUrl(kylinConfig, oldUrl);
}
- public static void testPerformance(String storeName, String url, KylinConfig kylinConfig) throws Exception {
+ public static void testPerformance(String url, KylinConfig kylinConfig) throws Exception {
String oldUrl = replaceMetadataUrl(kylinConfig, url);
- testPerformance(getStoreByName(storeName, kylinConfig));
+ testPerformance(getStoreByName(kylinConfig.getResourceStoreImpl(), kylinConfig));
replaceMetadataUrl(kylinConfig, oldUrl);
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/2dfffde2/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
----------------------------------------------------------------------
diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
index 4e35118..74322bb 100644
--- a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java
@@ -51,7 +51,7 @@ public class ITHBaseResourceStoreTest extends HBaseMetadataTestCase {
@Test
public void testHBaseStore() throws Exception {
String storeName = "org.apache.kylin.storage.hbase.HBaseResourceStore";
- ResourceStoreTest.testAStore(storeName, ResourceStoreTest.mockUrl("hbase", kylinConfig), kylinConfig);
+ ResourceStoreTest.testAStore(ResourceStoreTest.mockUrl("hbase", kylinConfig), kylinConfig);
}
@Test
http://git-wip-us.apache.org/repos/asf/kylin/blob/2dfffde2/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java
----------------------------------------------------------------------
diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java
index 0a95f1c..0e21287 100644
--- a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java
@@ -79,8 +79,7 @@ public class ITHDFSResourceStoreTest extends HBaseMetadataTestCase {
}
private void doTestWithPath(String path) throws Exception {
- String storeName = "org.apache.kylin.storage.hdfs.HDFSResourceStore";
- ResourceStoreTest.testAStore(storeName, ResourceStoreTest.mockUrl("hdfs", kylinConfig), kylinConfig);
+ ResourceStoreTest.testAStore(ResourceStoreTest.mockUrl("hdfs", kylinConfig), kylinConfig);
assertTrue(fs.exists(new Path(path)));
}
@@ -90,10 +89,10 @@ public class ITHDFSResourceStoreTest extends HBaseMetadataTestCase {
//test hdfs performance
String hdfsStoreName = "org.apache.kylin.storage.hdfs.HDFSResourceStore";
- ResourceStoreTest.testPerformance(hdfsStoreName, ResourceStoreTest.mockUrl("hdfs", kylinConfig), kylinConfig);
+ ResourceStoreTest.testPerformance(ResourceStoreTest.mockUrl("hdfs", kylinConfig), kylinConfig);
//test hbase
String hbaseStoreName = "org.apache.kylin.storage.hbase.HBaseResourceStore.HBaseResourceStore";
- ResourceStoreTest.testPerformance(hbaseStoreName, ResourceStoreTest.mockUrl("hbase", kylinConfig), kylinConfig);
+ ResourceStoreTest.testPerformance(ResourceStoreTest.mockUrl("hbase", kylinConfig), kylinConfig);
}
}