Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D5C71200C79 for ; Thu, 13 Apr 2017 12:37:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D4AC0160BBE; Thu, 13 Apr 2017 10:37:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 345BE160BAF for ; Thu, 13 Apr 2017 12:37:08 +0200 (CEST) Received: (qmail 85072 invoked by uid 500); 13 Apr 2017 10:37:07 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 84957 invoked by uid 99); 13 Apr 2017 10:37:07 -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, 13 Apr 2017 10:37:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1A68CE2F41; Thu, 13 Apr 2017 10:37:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.apache.org Date: Thu, 13 Apr 2017 10:37:11 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/22] kylin git commit: KYLIN 2513 SUM measure return type should not overflow archived-at: Thu, 13 Apr 2017 10:37:09 -0000 KYLIN 2513 SUM measure return type should not overflow Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/023fa238 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/023fa238 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/023fa238 Branch: refs/heads/master-hbase0.98 Commit: 023fa2387f9685efc64cc21a0fcc7b2e4457d9e7 Parents: 88e66f3 Author: chenzhx <346839943@qq.com> Authored: Thu Apr 6 15:34:14 2017 +0800 Committer: chenzhx <346839943@qq.com> Committed: Thu Apr 6 15:34:14 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubeMeasures.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/023fa238/webapp/app/js/controllers/cubeMeasures.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js index 856e74f..73a6cd0 100644 --- a/webapp/app/js/controllers/cubeMeasures.js +++ b/webapp/app/js/controllers/cubeMeasures.js @@ -370,10 +370,10 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes if(colType==="smallint"||colType==="int"||colType==="bigint"||colType==="integer"){ $scope.newMeasure.function.returntype= 'bigint'; }else{ - if(colType.indexOf('decimal')!=-1){ - $scope.newMeasure.function.returntype= colType; + if(colType.indexOf('decimal')!=-1||colType==="double"||colType==="float"){ + $scope.newMeasure.function.returntype= 'decimal(19,4)'; }else{ - $scope.newMeasure.function.returntype= 'decimal'; + $scope.newMeasure.function.returntype= 'decimal(14,0)'; } } break;