kylin git commit: KYLIN-1818 add kafka dependency in kylin-it

[shaofengshi]

Repository: kylin
Updated Branches:
  refs/heads/master dd1fea3f5 -> 4ffe818e2


KYLIN-1818 add kafka dependency in kylin-it

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4ffe818e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4ffe818e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4ffe818e

Branch: refs/heads/master
Commit: 4ffe818e2a0e0b933a7691dea4fbc416c2a5e368
Parents: dd1fea3
Author: shaofengshi 
Authored: Fri Jun 24 13:26:36 2016 +0800
Committer: shaofengshi 
Committed: Fri Jun 24 13:26:54 2016 +0800

--
 kylin-it/pom.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/4ffe818e/kylin-it/pom.xml
--
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 12a11ba..eeb74fe 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -259,6 +259,12 @@
 
 
 
+
+org.apache.kafka
+kafka_2.10
+${kafka.version}
+provided
+
 
 
 

kylin git commit: fix RealizationRegistry related tests

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/master 842f590af -> dd1fea3f5


fix RealizationRegistry related tests


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/dd1fea3f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/dd1fea3f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/dd1fea3f

Branch: refs/heads/master
Commit: dd1fea3f5dadfa0b2ce74d6bfcef925174b19998
Parents: 842f590
Author: Li Yang 
Authored: Fri Jun 24 09:46:25 2016 +0800
Committer: Li Yang 
Committed: Fri Jun 24 10:55:42 2016 +0800

--
 .../metadata/realization/RealizationRegistry.java | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/dd1fea3f/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java
index b447531..e6b1a86 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/RealizationRegistry.java
@@ -20,7 +20,6 @@ package org.apache.kylin.metadata.realization;
 
 import java.io.IOException;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -30,7 +29,6 @@ import org.apache.kylin.common.util.ClassUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 /**
@@ -84,7 +82,6 @@ public class RealizationRegistry {
 
 // use reflection to load providers
 String[] providerNames = config.getRealizationProviders();
-List es = Lists.newArrayList();
 for (String clsName : providerNames) {
 try {
 Class cls = 
ClassUtil.forName(clsName, IRealizationProvider.class);
@@ -92,17 +89,16 @@ public class RealizationRegistry {
 providers.put(p.getRealizationType(), p);
 
 } catch (Exception | NoClassDefFoundError e) {
-es.add(e);
-}
-
-if (es.size() > 0) {
-for (Throwable exceptionOrError : es) {
-logger.error("Create new store instance failed ", 
exceptionOrError);
-}
-throw new IllegalArgumentException("Failed to find metadata 
store by url: " + config.getMetadataUrl());
+if (e instanceof ClassNotFoundException || e instanceof 
NoClassDefFoundError)
+logger.warn("Failed to create realization provider " + e);
+else
+logger.error("Failed to create realization provider", e);
 }
 }
 
+if (providers.isEmpty())
+throw new IllegalArgumentException("Failed to find realization 
provider by url: " + config.getMetadataUrl());
+
 logger.info("RealizationRegistry is " + providers);
 }
 

kylin git commit: minor: disable printing stacktrace when create a KylinConfig instance

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/master c7439a0a4 -> 842f590af


minor: disable printing stacktrace when create a KylinConfig instance


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/842f590a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/842f590a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/842f590a

Branch: refs/heads/master
Commit: 842f590af8af2c95d08e7409ea719ef62b18807e
Parents: c7439a0
Author: Hongbin Ma 
Authored: Fri Jun 24 09:52:21 2016 +0800
Committer: Hongbin Ma 
Committed: Fri Jun 24 09:52:26 2016 +0800

--
 .../org/apache/kylin/common/KylinConfig.java| 31 +++-
 1 file changed, 17 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/842f590a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
--
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 9eebde7..8719541 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -371,19 +371,22 @@ public class KylinConfig extends KylinConfigBase {
 }
 
 private static void dumpStackTrace() {
-Thread t = Thread.currentThread();
-int maxStackTraceDepth = 20;
-int current = 0;
-
-StackTraceElement[] stackTrace = t.getStackTrace();
-StringBuilder buf = new StringBuilder("This is not a exception, just 
for diagnose purpose:");
-buf.append("\n");
-for (StackTraceElement e : stackTrace) {
-if (++current > maxStackTraceDepth) {
-break;
-}
-buf.append("\t").append("at ").append(e.toString()).append("\n");
-}
-logger.info(buf.toString());
+
+//uncomment below to start debugging
+
+//Thread t = Thread.currentThread();
+//int maxStackTraceDepth = 20;
+//int current = 0;
+//
+//StackTraceElement[] stackTrace = t.getStackTrace();
+//StringBuilder buf = new StringBuilder("This is not a exception, just 
for diagnose purpose:");
+//buf.append("\n");
+//for (StackTraceElement e : stackTrace) {
+//if (++current > maxStackTraceDepth) {
+//break;
+//}
+//buf.append("\t").append("at ").append(e.toString()).append("\n");
+//}
+//logger.info(buf.toString());
 }
 }

kylin git commit: refactor & cleanup UserService

[liyang]

Repository: kylin
Updated Branches:
  refs/heads/master 4fd74fc6a -> c7439a0a4


refactor & cleanup UserService


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c7439a0a
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c7439a0a
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c7439a0a

Branch: refs/heads/master
Commit: c7439a0a4281d1633437f268fdb5d44fbcd6cde1
Parents: 4fd74fc
Author: Yang Li 
Authored: Fri Jun 24 08:10:39 2016 +0800
Committer: Yang Li 
Committed: Fri Jun 24 08:10:39 2016 +0800

--
 .../kylin/rest/controller/UserController.java   |  2 +-
 .../apache/kylin/rest/security/UserManager.java | 29 -
 .../apache/kylin/rest/service/UserService.java  | 33 +++-
 .../kylin/rest/service/UserServiceTest.java |  2 +-
 4 files changed, 20 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/c7439a0a/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
--
diff --git 
a/server/src/main/java/org/apache/kylin/rest/controller/UserController.java 
b/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
index a7bc782..54af010 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/UserController.java
@@ -76,7 +76,7 @@ public class UserController {
 
 @RequestMapping(value = "/authentication/authorities", method = 
RequestMethod.GET, produces = "application/json")
 public List getAuthorities() {
-return userService.getUserAuthorities();
+return userService.listUserAuthorities();
 }
 
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/c7439a0a/server/src/main/java/org/apache/kylin/rest/security/UserManager.java
--
diff --git 
a/server/src/main/java/org/apache/kylin/rest/security/UserManager.java 
b/server/src/main/java/org/apache/kylin/rest/security/UserManager.java
deleted file mode 100644
index bbdbc2b..000
--- a/server/src/main/java/org/apache/kylin/rest/security/UserManager.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-package org.apache.kylin.rest.security;
-
-import java.util.List;
-
-import org.springframework.security.provisioning.UserDetailsManager;
-
-public interface UserManager extends UserDetailsManager {
-
-public List getUserAuthorities();
-
-}

http://git-wip-us.apache.org/repos/asf/kylin/blob/c7439a0a/server/src/main/java/org/apache/kylin/rest/service/UserService.java
--
diff --git 
a/server/src/main/java/org/apache/kylin/rest/service/UserService.java 
b/server/src/main/java/org/apache/kylin/rest/service/UserService.java
index a3b4293..d38a726 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/UserService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/UserService.java
@@ -38,13 +38,13 @@ import org.apache.hadoop.hbase.client.Scan;
 import org.apache.kylin.common.util.Bytes;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.rest.security.AclHBaseStorage;
-import org.apache.kylin.rest.security.UserManager;
 import org.apache.kylin.rest.util.Serializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -52,11 +52,9 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import 

kylin git commit: refactor about default gtstore

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/master 62ae3cb16 -> 4fd74fc6a


refactor about default gtstore


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4fd74fc6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4fd74fc6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4fd74fc6

Branch: refs/heads/master
Commit: 4fd74fc6a7d7c9bcccab38b57da76f2b983cf5ef
Parents: 62ae3cb
Author: Hongbin Ma 
Authored: Thu Jun 23 16:37:09 2016 +0800
Committer: Hongbin Ma 
Committed: Thu Jun 23 16:37:09 2016 +0800

--
 .../apache/kylin/gridtable/ScannerWorker.java   |  11 +-
 .../storage/gtrecord/CubeSegmentScanner.java| 100 +
 .../storage/gtrecord/CubeTupleConverter.java| 270 +
 .../gtrecord/GTCubeStorageQueryBase.java| 377 +++
 .../gtrecord/SequentialCubeTupleIterator.java   | 210 +++
 .../hbase/cube/v2/CubeSegmentScanner.java   | 100 -
 .../storage/hbase/cube/v2/CubeStorageQuery.java | 349 +
 .../hbase/cube/v2/CubeTupleConverter.java   | 270 -
 .../cube/v2/SequentialCubeTupleIterator.java| 210 ---
 9 files changed, 968 insertions(+), 929 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/4fd74fc6/core-cube/src/main/java/org/apache/kylin/gridtable/ScannerWorker.java
--
diff --git 
a/core-cube/src/main/java/org/apache/kylin/gridtable/ScannerWorker.java 
b/core-cube/src/main/java/org/apache/kylin/gridtable/ScannerWorker.java
index 1ac3b02..586a584 100644
--- a/core-cube/src/main/java/org/apache/kylin/gridtable/ScannerWorker.java
+++ b/core-cube/src/main/java/org/apache/kylin/gridtable/ScannerWorker.java
@@ -24,8 +24,6 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
 
-import org.apache.kylin.common.KylinConfig;
-import org.apache.kylin.common.debug.BackdoorToggles;
 import org.apache.kylin.cube.CubeSegment;
 import org.apache.kylin.cube.cuboid.Cuboid;
 import org.slf4j.Logger;
@@ -36,7 +34,7 @@ public class ScannerWorker {
 private static final Logger logger = 
LoggerFactory.getLogger(ScannerWorker.class);
 private IGTScanner internal = null;
 
-public ScannerWorker(CubeSegment cubeSeg, Cuboid cuboid, GTScanRequest 
scanRequest) {
+public ScannerWorker(CubeSegment cubeSeg, Cuboid cuboid, GTScanRequest 
scanRequest, String gtStorage) {
 if (scanRequest == null) {
 logger.info("Segment {} will be skipped", cubeSeg);
 internal = new EmptyGTScanner(0);
@@ -46,12 +44,7 @@ public class ScannerWorker {
 final GTInfo info = scanRequest.getInfo();
 
 try {
-IGTStorage rpc;
-if 
("scan".equalsIgnoreCase(BackdoorToggles.getHbaseCubeQueryProtocol())) {
-rpc = (IGTStorage) 
Class.forName("org.apache.kylin.storage.hbase.cube.v2.CubeHBaseScanRPC").getConstructor(CubeSegment.class,
 Cuboid.class, GTInfo.class).newInstance(cubeSeg, cuboid, info); // for local 
debug
-} else {
-rpc = (IGTStorage) 
Class.forName(KylinConfig.getInstanceFromEnv().getDefaultIGTStorage()).getConstructor(CubeSegment.class,
 Cuboid.class, GTInfo.class).newInstance(cubeSeg, cuboid, info); // default 
behavior
-}
+IGTStorage rpc = (IGTStorage) 
Class.forName(gtStorage).getConstructor(CubeSegment.class, Cuboid.class, 
GTInfo.class).newInstance(cubeSeg, cuboid, info); // default behavior
 internal = rpc.getGTScanner(scanRequest);
 } catch (IOException | InstantiationException | 
InvocationTargetException | IllegalAccessException | ClassNotFoundException | 
NoSuchMethodException e) {
 throw new RuntimeException("error", e);

http://git-wip-us.apache.org/repos/asf/kylin/blob/4fd74fc6/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
--
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
new file mode 100644
index 000..c12159d
--- /dev/null
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.