You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/19 14:39:26 UTC
incubator-kylin git commit: KYLIN-1115 unit test with minicluster
doesn't work
Repository: incubator-kylin
Updated Branches:
refs/heads/1.x-staging ae6f23c50 -> 01ea9bc91
KYLIN-1115 unit test with minicluster doesn't work
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/01ea9bc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/01ea9bc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/01ea9bc9
Branch: refs/heads/1.x-staging
Commit: 01ea9bc9137449fc567d558fff64fb66f8cc284b
Parents: ae6f23c
Author: shaofengshi <sh...@apache.org>
Authored: Thu Nov 19 21:38:38 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 19 21:38:38 2015 +0800
----------------------------------------------------------------------
.../kylin/common/persistence/HBaseResourceStore.java | 11 +++--------
.../apache/kylin/common/persistence/ResourceStore.java | 2 +-
2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/01ea9bc9/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java b/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
index 35a62b5..23dd831 100644
--- a/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
+++ b/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -88,17 +89,11 @@ public class HBaseResourceStore extends ResourceStore {
int cut = metadataUrl.indexOf('@');
tableNameBase = cut < 0 ? DEFAULT_TABLE_NAME : metadataUrl.substring(0, cut);
hbaseUrl = cut < 0 ? metadataUrl : metadataUrl.substring(cut + 1);
+ if (!(StringUtils.isEmpty(hbaseUrl) || "hbase".equals(hbaseUrl)))
+ throw new IllegalArgumentException("to use hbase storage, pls set 'kylin.metadata.url=kylin_metadata@hbase' in kylin.properties");
createHTableIfNeeded(getAllInOneTableName());
- // tableNameMap = new LinkedHashMap<String, String>();
- // for (Entry<String, String> entry : TABLE_SUFFIX_MAP.entrySet()) {
- // String pathPrefix = entry.getKey();
- // String tableName = tableNameBase + entry.getValue();
- // tableNameMap.put(pathPrefix, tableName);
- // createHTableIfNeeded(tableName);
- // }
-
}
private void createHTableIfNeeded(String tableName) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/01ea9bc9/common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java b/common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
index 5375597..505c72a 100644
--- a/common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
+++ b/common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
@@ -61,8 +61,8 @@ abstract public class ResourceStore {
public static final ArrayList<Class<? extends ResourceStore>> knownImpl = new ArrayList<Class<? extends ResourceStore>>();
static {
- knownImpl.add(HBaseResourceStore.class);
knownImpl.add(FileResourceStore.class);
+ knownImpl.add(HBaseResourceStore.class);
}
public static ResourceStore getStore(KylinConfig kylinConfig) {