Merge commit 'ce6e3ede2f670bf037a55234630b85098265075a'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/81ed3011 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/81ed3011 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/81ed3011 Branch: refs/heads/KYLIN-2606 Commit: 81ed30110186e2c13511a3fc50f6098645412aab Parents: 2471d5e ce6e3ed Author: Hongbin Ma <mahong...@apache.org> Authored: Tue May 23 19:31:36 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue May 23 19:31:36 2017 +0800 ---------------------------------------------------------------------- build/bin/load-hive-conf.sh | 2 +- .../impl/threadpool/DistributedScheduler.java | 1 + .../apache/kylin/metadata/MetadataManager.java | 2 ++ .../kylin/metadata/model/DataModelDesc.java | 1 + .../security/KylinAuthenticationProvider.java | 20 +++++++------------- .../apache/kylin/rest/service/CacheService.java | 1 - .../kylin/rest/service/ModelServiceTest.java | 2 +- .../hbase/util/ZookeeperDistributedLock.java | 2 -- webapp/app/js/controllers/page.js | 16 +++++++++++++--- 9 files changed, 26 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/build/bin/load-hive-conf.sh ---------------------------------------------------------------------- diff --cc build/bin/load-hive-conf.sh index c7317c6,a42cd0c..0937719 --- a/build/bin/load-hive-conf.sh +++ b/build/bin/load-hive-conf.sh @@@ -12,4 -12,4 +12,4 @@@ rm -rf ${hive_conf_prop export ENABLE_CHECK_ENV=false ${dir}/kylin.sh org.apache.kylin.tool.HiveConfigCLI ${hive_conf_dir} ${hive_conf_prop} [[ 0 == $? ]] || quit "Can not parse xml file: ${hive_conf_dir}, please check it." --hive_conf_properties=`cat ${hive_conf_prop}` ++hive_conf_properties=`cat ${hive_conf_prop}` http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java ---------------------------------------------------------------------- diff --cc core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java index 00fafaf,b3ca14a..39d7830 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java @@@ -603,9 -600,7 +603,10 @@@ public class MetadataManager ResourceStore store = getStore(); try { DataModelDesc dataModelDesc = store.getResource(path, DataModelDesc.class, MODELDESC_SERIALIZER); - dataModelDesc.init(config, this.getAllTablesMap(), this.ccInfoMap); ++ + if (dataModelDesc.getStatus() == null) + dataModelDesc.init(config, this.getAllTablesMap(), this.ccInfoMap); + dataModelDescMap.putLocal(dataModelDesc.getName(), dataModelDesc); return dataModelDesc; } catch (Exception e) { @@@ -653,8 -648,7 +654,9 @@@ } private DataModelDesc saveDataModelDesc(DataModelDesc dataModelDesc) throws IOException { - dataModelDesc.init(config, this.getAllTablesMap(), this.ccInfoMap); ++ + if (dataModelDesc.getStatus() == null) + dataModelDesc.init(config, this.getAllTablesMap(), this.ccInfoMap); String path = dataModelDesc.getResourcePath(); getStore().putResource(path, dataModelDesc, MODELDESC_SERIALIZER); http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java ---------------------------------------------------------------------- diff --cc core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java index c3554f2,2174b7a..a689979 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java @@@ -415,10 -385,9 +415,11 @@@ public class DataModelDesc extends Root TableDesc tableDesc = tables.get(join.getTable()); String alias = join.getAlias(); - if (alias == null) + if (alias == null) { alias = tableDesc.getName(); + join.setAlias(alias); + } + TableRef ref = new TableRef(this, alias, tableDesc); join.setTableRef(ref); http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/server-base/src/main/java/org/apache/kylin/rest/security/KylinAuthenticationProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java ---------------------------------------------------------------------- diff --cc server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java index d26a224,fc82bfe..96b34ed --- a/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java @@@ -41,7 -40,7 +41,6 @@@ import net.sf.ehcache.CacheManager public class CacheService extends BasicService { private static final Logger logger = LoggerFactory.getLogger(CacheService.class); - - private static QueryDataSource queryDataSource = new QueryDataSource(); @Autowired http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java ---------------------------------------------------------------------- diff --cc server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java index 7e749a9,550aeb8..2012a05 --- a/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java +++ b/server/src/test/java/org/apache/kylin/rest/service/ModelServiceTest.java @@@ -77,7 -75,7 +77,7 @@@ public class ModelServiceTest extends S field.set(deserialize.getComputedColumnDescs().get(0), "change on comment is okay"); DataModelDesc dataModelDesc = modelService.updateModelAndDesc(deserialize); } -- ++ @Test public void testFailureModelUpdateDueToComputedColumnConflict() throws IOException, JobException, NoSuchFieldException, IllegalAccessException { expectedEx.expect(IllegalStateException.class); http://git-wip-us.apache.org/repos/asf/kylin/blob/81ed3011/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java ---------------------------------------------------------------------- diff --cc storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java index 84a6fd0,db65491..63ffda0 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperDistributedLock.java @@@ -283,7 -283,7 +283,6 @@@ public class ZookeeperDistributedLock i private String norm(String lockPath) { if (!lockPath.startsWith(zkPathBase)) lockPath = zkPathBase + (lockPath.startsWith("/") ? "" : "/") + lockPath; - - return fixSlash(lockPath); } @@@ -292,7 -292,7 +291,6 @@@ path = "/" + path; if (path.endsWith("/")) path = path.substring(0, path.length() - 1); - - for (int n = Integer.MAX_VALUE; n > path.length();) { n = path.length(); path = path.replace("//", "/");
