[kylin] Git Push Summary

2017-02-06 Thread billyliu 
Repository: kylin
Updated Branches:
  refs/heads/dep-clean [deleted] b88e5586b

[2/2] kylin git commit: KYLIN-2428 refine JDBC shade

2017-02-06 Thread billyliu 
KYLIN-2428 refine JDBC shade


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

Branch: refs/heads/KYLIN-2428
Commit: 96a4159274f6896a0cdd7cafd1d093f1416be825
Parents: 07fc6e6
Author: Billy Liu 
Authored: Mon Feb 6 23:31:17 2017 +0800
Committer: Billy Liu 
Committed: Mon Feb 6 23:31:17 2017 +0800

--
 atopcalcite/pom.xml |  1 +
 jdbc/pom.xml| 14 ++
 pom.xml |  5 +
 3 files changed, 16 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/96a41592/atopcalcite/pom.xml
--
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 1b327fe..c65c0d1 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -43,6 +43,7 @@
 
 
 
+
 
 org.apache.calcite.avatica
 avatica

http://git-wip-us.apache.org/repos/asf/kylin/blob/96a41592/jdbc/pom.xml
--
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 34bdc8a..02890a6 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -43,7 +43,7 @@
 
 
 org.apache.calcite.avatica
-avatica
+avatica-core
 
 
 junit
@@ -69,9 +69,7 @@
 
 
 
-com.google.protobuf:*
-commons-logging:*
-org.slf4j:jul-to-slf4j
+
org.slf4j:jcl-over-slf4j:*
 
 
 
@@ -85,9 +83,17 @@
 
${shadeBase}.com.fasterxml.jackson
 
 
+com.google.protobuf
+
${shadeBase}.com.google.protobuf
+
+
 org.apache.http
 
${shadeBase}.org.apache.http
 
+
+org.apache.commons
+
${shadeBase}.org.apache.commons
+
 
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/96a41592/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3d6c98e..b109783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -524,6 +524,11 @@
 
 
 org.apache.calcite.avatica
+avatica-core
+${avatica.version}
+
+
+org.apache.calcite.avatica
 avatica
 ${avatica.version}

kylin git commit: minor,update reload and unload table style

2017-02-06 Thread zhongjian 
Repository: kylin
Updated Branches:
  refs/heads/master 1f444681d -> 7a6dd1ca3


minor,update reload and unload table style

Signed-off-by: zhongjian 


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

Branch: refs/heads/master
Commit: 7a6dd1ca3a35bb2a0223b7df0762f922c341d0af
Parents: 1f44468
Author: chenzhx <346839...@qq.com>
Authored: Mon Feb 6 18:19:49 2017 +0800
Committer: zhongjian 
Committed: Mon Feb 6 18:54:47 2017 +0800

--
 webapp/app/css/AdminLTE.css | 26 --
 webapp/app/js/controllers/sourceMeta.js | 96 +++-
 .../js/directives/kylin_abn_tree_directive.js   |  6 +-
 .../app/partials/tables/source_table_tree.html  |  4 -
 webapp/app/partials/tables/table_detail.html|  3 +-
 5 files changed, 57 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/7a6dd1ca/webapp/app/css/AdminLTE.css
--
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
index c7740d1..34e94e5 100644
--- a/webapp/app/css/AdminLTE.css
+++ b/webapp/app/css/AdminLTE.css
@@ -4801,29 +4801,3 @@ Gradient Background colors
   }
 }
 
-.abn-tree .abn-tree-row .tree-table-btn{
-width: 4%;
-float: right;
-border-radius: 5px;
-margin-right: 5px;
-padding: 3px 16px 2px 5px;
-color: #ff;
-position:static;
-}
-.abn-tree .abn-tree-row .tree-table-btn .tooltip{
-overflow:visible;
-}
-.abn-tree .abn-tree-row .btn-info:hover{
-   background-color:#269abc;
-}
-.abn-tree > .abn-tree-row.active > .btn-info{
-background-color:#269abc;
-border-left-color:#269abc;
-}
-.abn-tree .abn-tree-row .btn-success:hover{
-background-color:#008d4c;
-}
-.abn-tree > .abn-tree-row.active > .btn-success{
-background-color:#008d4c;
-border-left-color:#008d4c;
-}

http://git-wip-us.apache.org/repos/asf/kylin/blob/7a6dd1ca/webapp/app/js/controllers/sourceMeta.js
--
diff --git a/webapp/app/js/controllers/sourceMeta.js 
b/webapp/app/js/controllers/sourceMeta.js
index 5421673..e2fdd66 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -132,9 +132,10 @@ KylinApp
   });
 };
 
-$scope.reloadTable = function (tableName,projectName){
+$scope.reloadTable = function (tableName){
+  var delay = $q.defer();
   loadingRequest.show();
-  TableService.loadHiveTable({tableName: tableName, action: projectName}, 
{calculate: $scope.isCalculate}, function (result) {
+  TableService.loadHiveTable({tableName: tableName, action: 
$scope.projectModel.selectedProject}, {calculate: $scope.isCalculate}, function 
(result) {
 var loadTableInfo = "";
 angular.forEach(result['result.loaded'], function (table) {
   loadTableInfo += "\n" + table;
@@ -153,7 +154,7 @@ KylinApp
   SweetAlert.swal('Partial loaded!', 'The following table(s) have been 
successfully loaded: ' + loadTableInfo + "\n\n Failed to load following 
table(s):" + unloadedTableInfo, 'warning');
 }
 loadingRequest.hide();
-$scope.aceSrcTbLoaded(true);
+delay.resolve("");
   }, function (e) {
 if (e.data && e.data.exception) {
   var message = e.data.exception;
@@ -164,49 +165,58 @@ KylinApp
 }
 loadingRequest.hide();
   })
+   return delay.promise;
 }
 
 
 
-$scope.removeList = function (tableName,projectName) {
-  if (tableName.trim() === "") {
-SweetAlert.swal('', 'Please input table(s) you want to unload.', 
'info');
-return;
-  }
-  if (!projectName) {
-SweetAlert.swal('', 'Please choose your project first!.', 'info');
-return;
-  }
-  loadingRequest.show();
-  TableService.unLoadHiveTable({tableName: tableName, action: 
projectName}, {}, function (result) {
-var removedTableInfo = "";
-angular.forEach(result['result.unload.success'], function (table) {
-  removedTableInfo += "\n" + table;
-})
-var unRemovedTableInfo = "";
-angular.forEach(result['result.unload.fail'], function (table) {
-  unRemovedTableInfo += "\n" + table;
-})
-if (result['result.unload.fail'].length != 0 && 
result['result.unload.success'].length == 0) {
-  SweetAlert.swal('Failed!', 'Failed to unload following table(s): ' + 
unRemovedTableInfo, 'error');
-}
-if (result['result.unload.success'].length != 0 && 
result['result.unload.fail'].length == 0) {
-

svn commit: r1781874 - in /kylin/site: development/howto_package.html feed.xml

2017-02-06 Thread lidong 
Author: lidong
Date: Mon Feb  6 10:53:44 2017
New Revision: 1781874

URL: http://svn.apache.org/viewvc?rev=1781874=rev
Log:
docs about how to build binary package

Modified:
kylin/site/development/howto_package.html
kylin/site/feed.xml

Modified: kylin/site/development/howto_package.html
URL: 
http://svn.apache.org/viewvc/kylin/site/development/howto_package.html?rev=1781874=1781873=1781874=diff
==
--- kylin/site/development/howto_package.html (original)
+++ kylin/site/development/howto_package.html Mon Feb  6 10:53:44 2017
@@ -551,17 +551,47 @@
How to Build Binary Package

Generate Binary Package
+This document talks about how to build binary package from source code.
 
-git 
clone https://github.com/apache/kylin kylin
-cd kylin
-./build/script/package.sh
+Download source code
+You can download Apache Kylin source code from github repository.
+
+git clone 
https://github.com/apache/kylin kylin
+
+
+
+Build Binary Package
 
 In order to generate binary package, maven and 
npm are pre-requisites.
 
-If you’re behind a proxy server, both npm and bower need be told with the 
proxy info before running ./script/package.sh:
+(Optional) If you’re behind a proxy server, both npm and 
bower need be told with the proxy info before running ./script/package.sh:
+
+export 
http_proxy=http://your-proxy-host:port
+npm config set proxy http://your-proxy-host:port
+
+
+
+Build Package for HBase 1.x
+cd kylin
+build/script/package.sh
+
+
+
+Build Package for CDH 5.7
+cd kylin
+build/script/package.sh -P cdh 5.7
+
+
+
+Build Package for HBase 0.98.x
+
+Source code for HBase 0.98.x is in another branch named master-hbase0.98, 
and you need to switch to this branch before build the package.
 
-export http_proxy=http://your-proxy-host:port
-npm config set proxy 
http://your-proxy-host:port
+cd kylin
+git checkout master-hbase0.98
+build/script/package.sh
+
+
 



Modified: kylin/site/feed.xml
URL: 
http://svn.apache.org/viewvc/kylin/site/feed.xml?rev=1781874=1781873=1781874=diff
==
--- kylin/site/feed.xml (original)
+++ kylin/site/feed.xml Mon Feb  6 10:53:44 2017
@@ -19,8 +19,8 @@
 Apache Kylin Home
 http://kylin.apache.org/
 http://kylin.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Thu, 02 Feb 2017 17:07:35 -0800
-Thu, 02 Feb 2017 17:07:35 -0800
+Mon, 06 Feb 2017 02:53:05 -0800
+Mon, 06 Feb 2017 02:53:05 -0800
 Jekyll v2.5.3

kylin git commit: docs about how to build binary package

2017-02-06 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/document a314c2252 -> 110843520


docs about how to build binary package


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

Branch: refs/heads/document
Commit: 110843520c6ac07a44b8ae52296b09ea2ca73908
Parents: a314c22
Author: lidongsjtu 
Authored: Mon Feb 6 18:50:28 2017 +0800
Committer: lidongsjtu 
Committed: Mon Feb 6 18:50:28 2017 +0800

--
 website/_dev/howto_package.md | 41 +++---
 1 file changed, 34 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/11084352/website/_dev/howto_package.md
--
diff --git a/website/_dev/howto_package.md b/website/_dev/howto_package.md
index f0f044f..8d66dbe 100644
--- a/website/_dev/howto_package.md
+++ b/website/_dev/howto_package.md
@@ -6,17 +6,44 @@ permalink: /development/howto_package.html
 ---
 
 ### Generate Binary Package
-{% highlight bash %}
+This document talks about how to build binary package from source code.
+
+ Download source code
+You can download Apache Kylin source code from github repository.
+
+```
 git clone https://github.com/apache/kylin kylin
-cd kylin
-./build/script/package.sh
-{% endhighlight %}
+```
+
+ Build Binary Package
 
 In order to generate binary package, **maven** and **npm** are pre-requisites.
 
-If you're behind a proxy server, both npm and bower need be told with the 
proxy info before running ./script/package.sh:
+**(Optional)** If you're behind a proxy server, both npm and bower need be 
told with the proxy info before running ./script/package.sh:
 
-{% highlight bash %}
+```
 export http_proxy=http://your-proxy-host:port
 npm config set proxy http://your-proxy-host:port
-{% endhighlight %}
\ No newline at end of file
+```
+
+# Build Package for HBase 1.x
+```
+cd kylin
+build/script/package.sh
+```
+
+# Build Package for CDH 5.7
+```
+cd kylin
+build/script/package.sh -P cdh 5.7
+```
+
+# Build Package for HBase 0.98.x
+
+Source code for HBase 0.98.x is in another branch named master-hbase0.98, and 
you need to switch to this branch before build the package.
+
+```
+cd kylin
+git checkout master-hbase0.98
+build/script/package.sh
+```
\ No newline at end of file

[2/2] kylin git commit: update kyro-shaded as provided

2017-02-06 Thread billyliu 
update kyro-shaded as provided


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

Branch: refs/heads/dep-clean
Commit: b88e5586b34117d45d42ba46d61b8bdee4760e3e
Parents: 94b60d2
Author: Billy Liu 
Authored: Mon Feb 6 18:40:13 2017 +0800
Committer: Billy Liu 
Committed: Mon Feb 6 18:40:13 2017 +0800

--
 core-cube/pom.xml | 8 
 pom.xml   | 5 +
 server/pom.xml| 4 
 3 files changed, 13 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/core-cube/pom.xml
--
diff --git a/core-cube/pom.xml b/core-cube/pom.xml
index 5bcc112..fe80783 100644
--- a/core-cube/pom.xml
+++ b/core-cube/pom.xml
@@ -48,10 +48,6 @@
 commons-collections
 commons-collections
 
-
-com.esotericsoftware
-kryo-shaded
-
 
 
 
@@ -70,6 +66,10 @@
 com.google.code.findbugs
 jsr305
 
+
+com.esotericsoftware
+kryo-shaded
+
 
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6d8e552..c717fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,26 +550,31 @@
 org.apache.spark
 spark-core_2.10
 ${spark.version}
+provided
 
 
 org.apache.spark
 spark-sql_2.10
 ${spark.version}
+provided
 
 
 org.apache.spark
 spark-hive_2.10
 ${spark.version}
+provided
 
 
 com.esotericsoftware
 kryo-shaded
 ${kryo.version}
+provided
 
 
 org.reflections
 reflections
 ${reflections.version}
+provided
 
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/b88e5586/server/pom.xml
--
diff --git a/server/pom.xml b/server/pom.xml
index 454ed6b..3c96e60 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -233,6 +233,10 @@
 jetty-all
 org.eclipse.jetty.aggregate
 
+
+calcite-core
+org.apache.calcite
+

[1/2] kylin git commit: minor update

2017-02-06 Thread billyliu 
Repository: kylin
Updated Branches:
  refs/heads/dep-clean b75223197 -> b88e5586b


minor update


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

Branch: refs/heads/dep-clean
Commit: 94b60d27ef4a823e1b6c6dcffc9d4aa620e1da63
Parents: b752231
Author: Billy Liu 
Authored: Mon Feb 6 14:35:19 2017 +0800
Committer: Billy Liu 
Committed: Mon Feb 6 14:35:19 2017 +0800

--
 jdbc/pom.xml |  2 +-
 source-kafka/pom.xml | 14 ++
 2 files changed, 3 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/94b60d27/jdbc/pom.xml
--
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index e22a180..34bdc8a 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -70,8 +70,8 @@
 
 
 com.google.protobuf:*
-commons-codec:*
 commons-logging:*
+org.slf4j:jul-to-slf4j
 
 
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/94b60d27/source-kafka/pom.xml
--
diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml
index b8fdf46..da5e033 100644
--- a/source-kafka/pom.xml
+++ b/source-kafka/pom.xml
@@ -35,17 +35,11 @@
 
 
 org.apache.kylin
-kylin-engine-mr
-
-
-
-org.apache.kylin
 kylin-core-common
 
-
 
-org.apache.commons
-commons-lang3
+org.apache.kylin
+kylin-engine-mr
 
 
 
@@ -78,9 +72,5 @@
 test-jar
 test
 
-
-
-
 
-
 
\ No newline at end of file

kylin git commit: KYLIN-2406 fix model match rules when having hanging OLAPTablescan

2017-02-06 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/master ef0fc8687 -> 1f444681d


KYLIN-2406 fix model match rules when having hanging OLAPTablescan

Signed-off-by: lidongsjtu 


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

Branch: refs/heads/master
Commit: 1f444681d30ed5f31997c2182cce0f388fef0347
Parents: ef0fc86
Author: etherge 
Authored: Sat Feb 4 11:31:58 2017 +0800
Committer: lidongsjtu 
Committed: Mon Feb 6 17:06:55 2017 +0800

--
 .../main/java/org/apache/kylin/query/routing/ModelChooser.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/1f444681/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
--
diff --git 
a/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java 
b/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
index f979f7b..507b371 100644
--- a/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
+++ b/query/src/main/java/org/apache/kylin/query/routing/ModelChooser.java
@@ -106,6 +106,9 @@ public class ModelChooser {
 // one lookup table
 String modelAlias = 
model.findFirstTable(firstTable.getTableIdentity()).getAlias();
 matchUp = ImmutableMap.of(firstTable.getAlias(), modelAlias);
+} else if (ctx.joins.size() != ctx.allTableScans.size() - 1) {
+// has hanging tables
+throw new NoRealizationFoundException("Please adjust the 
sequence of join tables and put subquery or temporary table after lookup 
tables. " + toErrorMsg(ctx));
 } else {
 // normal big joins
 if (ctx.joinsTree == null) {