You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/10/29 08:19:29 UTC
[1/2] incubator-kylin git commit: KYLIN-1108 always return BIGINT
type for COUNT expression
Repository: incubator-kylin
Updated Branches:
refs/heads/2.x-staging cb94c8127 -> e8df2bc23
KYLIN-1108 always return BIGINT type for COUNT expression
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9203ff10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9203ff10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9203ff10
Branch: refs/heads/2.x-staging
Commit: 9203ff1050bccad194713f75a2b3f189372649cb
Parents: cb94c81
Author: jiazhong <ji...@ebay.com>
Authored: Thu Oct 29 15:02:39 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Thu Oct 29 15:17:07 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeMeasures.js | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9203ff10/webapp/app/js/controllers/cubeMeasures.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js
index cdcd3cf..1560d23 100644
--- a/webapp/app/js/controllers/cubeMeasures.js
+++ b/webapp/app/js/controllers/cubeMeasures.js
@@ -44,6 +44,11 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes
//map right return type for param
$scope.measureReturnTypeUpdate = function(){
+
+ if($scope.newMeasure.function.expression == 'COUNT'){
+ $scope.newMeasure.function.parameter.type= 'constant';
+ }
+
if($scope.newMeasure.function.parameter.type=="constant"&&$scope.newMeasure.function.expression!=="COUNT_DISTINCT"){
switch($scope.newMeasure.function.expression){
case "SUM":
[2/2] incubator-kylin git commit: KYLIN-1036 remove unused png file
Posted by zh...@apache.org.
KYLIN-1036 remove unused png file
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/e8df2bc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/e8df2bc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/e8df2bc2
Branch: refs/heads/2.x-staging
Commit: e8df2bc23e138f9cfe7167962a71d5e035dfe2ff
Parents: 9203ff1
Author: jiazhong <ji...@ebay.com>
Authored: Thu Oct 29 15:19:02 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Thu Oct 29 15:19:02 2015 +0800
----------------------------------------------------------------------
webapp/app/image/cube1.png | Bin 24538 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/e8df2bc2/webapp/app/image/cube1.png
----------------------------------------------------------------------
diff --git a/webapp/app/image/cube1.png b/webapp/app/image/cube1.png
deleted file mode 100644
index 1950764..0000000
Binary files a/webapp/app/image/cube1.png and /dev/null differ