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 2016/08/08 02:01:28 UTC
kylin git commit: KYLIN-1760 miss a column family
Repository: kylin
Updated Branches:
refs/heads/master 0b09ff464 -> 3aab0201a
KYLIN-1760 miss a column family
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3aab0201
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3aab0201
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3aab0201
Branch: refs/heads/master
Commit: 3aab0201a7454c7dfab4fd443a5e942fad478883
Parents: 0b09ff4
Author: shaofengshi <sh...@apache.org>
Authored: Mon Aug 8 10:01:20 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Aug 8 10:01:20 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/rest/security/MockAclHBaseStorage.java | 3 ++-
.../java/org/apache/kylin/rest/security/RealAclHBaseStorage.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/3aab0201/server-base/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java b/server-base/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
index 6c8081d..d9326f5 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/security/MockAclHBaseStorage.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.rest.service.AclService;
+import org.apache.kylin.rest.service.QueryService;
import org.apache.kylin.rest.service.UserService;
/**
@@ -56,7 +57,7 @@ public class MockAclHBaseStorage implements AclHBaseStorage {
mockedAclTable = new MockHTable(aclTableName, ACL_INFO_FAMILY, ACL_ACES_FAMILY);
return aclTableName;
} else if (clazz == UserService.class) {
- mockedUserTable = new MockHTable(userTableName, USER_AUTHORITY_FAMILY);
+ mockedUserTable = new MockHTable(userTableName, USER_AUTHORITY_FAMILY, QueryService.USER_QUERY_FAMILY);
return userTableName;
} else {
throw new IllegalStateException("prepareHBaseTable for unknown class: " + clazz);
http://git-wip-us.apache.org/repos/asf/kylin/blob/3aab0201/server-base/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java b/server-base/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
index 27d9720..ab18029 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/security/RealAclHBaseStorage.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.rest.service.AclService;
+import org.apache.kylin.rest.service.QueryService;
import org.apache.kylin.rest.service.UserService;
import org.apache.kylin.storage.hbase.HBaseConnection;
@@ -48,7 +49,7 @@ public class RealAclHBaseStorage implements AclHBaseStorage {
return aclTableName;
} else if (clazz == UserService.class) {
userTableName = tableNameBase + USER_TABLE_NAME;
- HBaseConnection.createHTableIfNeeded(hbaseUrl, userTableName, USER_AUTHORITY_FAMILY);
+ HBaseConnection.createHTableIfNeeded(hbaseUrl, userTableName, USER_AUTHORITY_FAMILY, QueryService.USER_QUERY_FAMILY);
return userTableName;
} else {
throw new IllegalStateException("prepareHBaseTable for unknown class: " + clazz);