kylin git commit: KYLIN-1993 use sed instead of envsubst

[lidong]

Repository: kylin
Updated Branches:
  refs/heads/master 2359a75e3 -> c2ff8c513


KYLIN-1993 use sed instead of envsubst


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

Branch: refs/heads/master
Commit: c2ff8c5135e72cafeae09f20e654d247f9335d5c
Parents: 2359a75
Author: lidongsjtu 
Authored: Thu Sep 22 11:01:39 2016 +0800
Committer: lidongsjtu 
Committed: Thu Sep 22 12:54:03 2016 +0800

--
 build/bin/sample.sh| 6 +++---
 .../sample_cube/template/cube_desc/kylin_sales_cube_desc.json  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/c2ff8c51/build/bin/sample.sh
--
diff --git a/build/bin/sample.sh b/build/bin/sample.sh
index c915fb4..92caace 100644
--- a/build/bin/sample.sh
+++ b/build/bin/sample.sh
@@ -48,12 +48,12 @@ if [ -z "$default_engine_type" ]; then
 default_engine_type=2
 default_storage_type=2
 fi
-export default_engine_type
-export default_storage_type
 
 mkdir -p ${KYLIN_HOME}/sample_cube/metadata
 cp -rf ${KYLIN_HOME}/sample_cube/template/* ${KYLIN_HOME}/sample_cube/metadata
-envsubst < 
${KYLIN_HOME}/sample_cube/template/cube_desc/kylin_sales_cube_desc.json > 
${KYLIN_HOME}/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
+
+sed -i "s/%default_storage_type%/${default_storage_type}/g" 
${KYLIN_HOME}/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
+sed -i "s/%default_engine_type%/${default_engine_type}/g" 
${KYLIN_HOME}/sample_cube/metadata/cube_desc/kylin_sales_cube_desc.json
 
 cd ${KYLIN_HOME}
 hbase org.apache.hadoop.util.RunJar ${job_jar} 
org.apache.kylin.common.persistence.ResourceTool upload 
${KYLIN_HOME}/sample_cube/metadata  || { exit 1; }

http://git-wip-us.apache.org/repos/asf/kylin/blob/c2ff8c51/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json
--
diff --git a/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json 
b/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json
index 0953be6..70b1294 100644
--- a/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json
+++ b/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json
@@ -176,8 +176,8 @@
   "status_need_notify" : [ ],
   "auto_merge_time_ranges" : null,
   "retention_range" : 0,
-  "engine_type" : ${default_engine_type},
-  "storage_type" : ${default_storage_type},
+  "engine_type" : %default_engine_type%,
+  "storage_type" : %default_storage_type%,
   "override_kylin_properties" : { },
   "partition_date_start" : 132537600
 }
\ No newline at end of file

kylin git commit: minor changes

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/master 32a9c6706 -> 2359a75e3


minor changes


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

Branch: refs/heads/master
Commit: 2359a75e3ca9d1a9c5f06331ab02edce1385b66d
Parents: 32a9c67
Author: Hongbin Ma 
Authored: Thu Sep 22 10:45:08 2016 +0800
Committer: Hongbin Ma 
Committed: Thu Sep 22 10:45:15 2016 +0800

--
 .../java/org/apache/kylin/metadata/datatype/BooleanSerializer.java | 2 +-
 .../kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java  | 1 +
 .../java/org/apache/kylin/rest/controller/QueryController.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/2359a75e/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
index e843247..acb6de1 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.BooleanUtils;
 
 public class BooleanSerializer extends DataTypeSerializer {
 
-final String[] TRUE_VALUE_SET = { "true", "t", "on", "yes" };
+public final static String[] TRUE_VALUE_SET = { "true", "t", "on", "yes" };
 
 // be thread-safe and avoid repeated obj creation
 private ThreadLocal current = new ThreadLocal();

http://git-wip-us.apache.org/repos/asf/kylin/blob/2359a75e/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
--
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
index 0e40150..2f2691e 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java
@@ -94,6 +94,7 @@ public class SortedIteratorMergerWithLimit extends SortedIt
 PeekingImpl first = heap.poll();
 E current = first.next();
 try {
+//clone is protected on Object, have to use reflection to 
call the overwritten clone method in subclasses
 current = (E) 
current.getClass().getMethod("clone").invoke(current);
 } catch (IllegalAccessException | InvocationTargetException | 
NoSuchMethodException e) {
 throw new RuntimeException(e);

http://git-wip-us.apache.org/repos/asf/kylin/blob/2359a75e/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
--
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
index 5cf6492..62cb0a7 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java
@@ -205,7 +205,7 @@ public class QueryController extends BasicController {
 checkQueryAuth(sqlResponse);
 
 } catch (Throwable e) { // calcite may throw AssertError
-//logger.error("Exception when execute sql", e);
+logger.error("Exception when execute sql", e);
 String errMsg = QueryUtil.makeErrorMsgUserFriendly(e);
 
 sqlResponse = new SQLResponse(null, null, 0, true, errMsg);

kylin git commit: KYLIN-2010 filter encoding options for column in TOP_N measure

[zhongjian]

Repository: kylin
Updated Branches:
  refs/heads/master 69cb49dba -> 32a9c6706


KYLIN-2010 filter encoding options for column in TOP_N measure


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

Branch: refs/heads/master
Commit: 32a9c67068edfa0778ab5e19fc8376813e1bbc90
Parents: 69cb49d
Author: Jason 
Authored: Wed Sep 21 15:25:08 2016 +0800
Committer: Jason 
Committed: Wed Sep 21 15:25:08 2016 +0800

--
 webapp/app/partials/cubeDesigner/measures.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/32a9c670/webapp/app/partials/cubeDesigner/measures.html
--
diff --git a/webapp/app/partials/cubeDesigner/measures.html 
b/webapp/app/partials/cubeDesigner/measures.html
index 56c86be..ec7110f 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -260,7 +260,7 @@
   
+  ng-options="dt.value as dt.name 
for dt in getEncodings(groupby_column.name)">
 
   
   {{groupby_column.encoding}}

kylin git commit: kylin advanced setting edit

[zhongjian]

Repository: kylin
Updated Branches:
  refs/heads/master 45cc68132 -> 69cb49dba


kylin advanced setting edit

Signed-off-by: Jason 


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

Branch: refs/heads/master
Commit: 69cb49dbad6b27e9ca7662fa8dfaf29ad90cc98a
Parents: 45cc681
Author: luguosheng <550175...@qq.com>
Authored: Wed Sep 21 12:21:55 2016 +0800
Committer: Jason 
Committed: Wed Sep 21 14:27:27 2016 +0800

--
 webapp/app/partials/cubeDesigner/advanced_settings.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/69cb49db/webapp/app/partials/cubeDesigner/advanced_settings.html
--
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html 
b/webapp/app/partials/cubeDesigner/advanced_settings.html
index b11fc8e..e8cbf9e 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -45,7 +45,7 @@
   
 
   
-
+
   Includes
 
 
@@ -189,7 +189,7 @@
   ng-show="state.mode=='edit'">New Aggregation Group
   
 
-
+
   Rowkeys  
 
   

kylin git commit: KYLIN-2010 UI filter encoding options for different column type

[zhongjian]

Repository: kylin
Updated Branches:
  refs/heads/master c1fc72386 -> 45cc68132


KYLIN-2010 UI filter encoding options for different column type


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

Branch: refs/heads/master
Commit: 45cc681326bbd701fd8740c6425354f362f1d87e
Parents: c1fc723
Author: Jason 
Authored: Wed Sep 21 14:20:48 2016 +0800
Committer: Jason 
Committed: Wed Sep 21 14:20:48 2016 +0800

--
 webapp/app/js/controllers/cubeEdit.js   | 41 +++-
 webapp/app/js/model/cubeConfig.js   |  6 ++-
 webapp/app/js/model/tableModel.js   |  2 +
 .../cubeDesigner/advanced_settings.html |  3 +-
 4 files changed, 49 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/45cc6813/webapp/app/js/controllers/cubeEdit.js
--
diff --git a/webapp/app/js/controllers/cubeEdit.js 
b/webapp/app/js/controllers/cubeEdit.js
index e2d0ab5..e9bd93e 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -40,11 +40,50 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, 
$routeParams, $locatio
 supportedEncoding:[]
   }
   CubeService.getValidEncodings({}, function (encodings) {
-$scope.store.supportedEncoding = encodings;
+for(var i =0;i