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:01:43 UTC
[1/2] incubator-kylin git commit: KYLIN-1036 remove unused png file
Repository: incubator-kylin
Updated Branches:
refs/heads/1.x-staging 1e2f15348 -> c3c80b23c
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/724653cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/724653cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/724653cd
Branch: refs/heads/1.x-staging
Commit: 724653cd4cdb877c68740953a527df9b87d045a5
Parents: 1e2f153
Author: jiazhong <ji...@ebay.com>
Authored: Thu Oct 29 14:58:06 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Thu Oct 29 14:59:00 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/724653cd/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
[2/2] incubator-kylin git commit: KYLIN-1108 always return BIGINT
type for COUNT expression
Posted by zh...@apache.org.
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/c3c80b23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c3c80b23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c3c80b23
Branch: refs/heads/1.x-staging
Commit: c3c80b23c26c42c1c9144a03d47b6c85e57fad53
Parents: 724653c
Author: jiazhong <ji...@ebay.com>
Authored: Thu Oct 29 15:01:29 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Thu Oct 29 15:01:29 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeSchema.js | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c3c80b23/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index 4c23f74..bbcc1fb 100755
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -118,6 +118,11 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
//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":