Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 21FAC1720C for ; Thu, 29 Oct 2015 07:19:31 +0000 (UTC) Received: (qmail 93836 invoked by uid 500); 29 Oct 2015 07:19:31 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 93806 invoked by uid 500); 29 Oct 2015 07:19:31 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 93797 invoked by uid 99); 29 Oct 2015 07:19:31 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Oct 2015 07:19:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 97C0B180A43 for ; Thu, 29 Oct 2015 07:19:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 3GKcQqmoo__k for ; Thu, 29 Oct 2015 07:19:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id E4B0F21342 for ; Thu, 29 Oct 2015 07:19:29 +0000 (UTC) Received: (qmail 93741 invoked by uid 99); 29 Oct 2015 07:19:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Oct 2015 07:19:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8AA0E0BC6; Thu, 29 Oct 2015 07:19:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhongjian@apache.org To: commits@kylin.incubator.apache.org Date: Thu, 29 Oct 2015 07:19:29 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Oct 29 15:02:39 2015 +0800 Committer: jiazhong 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":