commit message update forcely, update KYLIN-2010 to KYLIN2106 On Tue, Oct 25, 2016 at 8:20 PM, <[email protected]> wrote:
> Repository: kylin > Updated Branches: > refs/heads/master 8ea56c27f -> 92c823bb6 (forced update) > > > KYLIN-2106 integer encoding bug fix > > > Project: http://git-wip-us.apache.org/repos/asf/kylin/repo > Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/85717fe3 > Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/85717fe3 > Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/85717fe3 > > Branch: refs/heads/master > Commit: 85717fe33712fe1b0f6d78e371aa9194ce5f1d4a > Parents: eb39437 > Author: Jason <[email protected]> > Authored: Tue Oct 25 18:39:51 2016 +0800 > Committer: Jason <[email protected]> > Committed: Tue Oct 25 20:19:55 2016 +0800 > > ---------------------------------------------------------------------- > webapp/app/js/controllers/cubeAdvanceSetting.js | 12 ++++++++++-- > webapp/app/js/controllers/cubeMeasures.js | 16 ++++++++++++---- > 2 files changed, 22 insertions(+), 6 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/kylin/blob/85717fe3/ > webapp/app/js/controllers/cubeAdvanceSetting.js > ---------------------------------------------------------------------- > diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js > b/webapp/app/js/controllers/cubeAdvanceSetting.js > index be90f65..0ba321c 100644 > --- a/webapp/app/js/controllers/cubeAdvanceSetting.js > +++ b/webapp/app/js/controllers/cubeAdvanceSetting.js > @@ -27,18 +27,24 @@ KylinApp.controller('CubeAdvanceSettingCtrl', > function ($scope, $modal,cubeConfi > angular.forEach($scope.cubeMetaFrame.rowkey.rowkey_ > columns,function(item){ > //var _isDictionaries = item.encoding === "dict"?"true":"false"; > var _isFixedLength = item.encoding.substring(0,12) === > "fixed_length"?"true":"false";//fixed_length:12 > - var _isIntLength = item.encoding.substring(0,3) === > "int"?"true":"false";//fixed_length:12 > + var _isIntegerLength = item.encoding.substring(0,7) === > "integer"?"true":"false"; > + var _isIntLength = item.encoding.substring(0,3) === > "int"?"true":"false"; > var _encoding = item.encoding; > var _valueLength ; > if(_isFixedLength !=="false"){ > _valueLength = item.encoding.substring(13,item.encoding.length); > _encoding = "fixed_length"; > } > - if(_isIntLength!="false"){ > + if(_isIntLength!="false" && _isIntegerLength=="false" ){ > _valueLength = item.encoding.substring(4,item.encoding.length); > _encoding = "int"; > } > > + if(_isIntegerLength!="false" ){ > + _valueLength = item.encoding.substring(8,item.encoding.length); > + _encoding = "integer"; > + } > + > var rowkeyObj = { > column:item.column, > encoding:_encoding, > @@ -66,6 +72,8 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function > ($scope, $modal,cubeConfi > } > else if(item.encoding=="int" && item.valueLength){ > encoding = "int:"+item.valueLength; > + }else if(item.encoding=="integer" && item.valueLength){ > + encoding = "integer:"+item.valueLength; > }else{ > encoding = item.encoding; > } > > http://git-wip-us.apache.org/repos/asf/kylin/blob/85717fe3/ > webapp/app/js/controllers/cubeMeasures.js > ---------------------------------------------------------------------- > diff --git a/webapp/app/js/controllers/cubeMeasures.js > b/webapp/app/js/controllers/cubeMeasures.js > index 006c6c2..dcf26b7 100644 > --- a/webapp/app/js/controllers/cubeMeasures.js > +++ b/webapp/app/js/controllers/cubeMeasures.js > @@ -54,17 +54,24 @@ KylinApp.controller('CubeMeasuresCtrl', function > ($scope, $modal,MetaModel,cubes > var _name=configuration.slice(14); > var item=$scope.newMeasure.function.configuration[configuration]; > var _isFixedLength = item.substring(0,12) === > "fixed_length"?"true":"false";//fixed_length:12 > - var _isIntLength = item.substring(0,3) === > "int"?"true":"false";//fixed_length:12 > + var _isIntegerLength = item.substring(0,7) === > "integer"?"true":"false"; > + var _isIntLength = item.substring(0,3) === "int"?"true":"false"; > var _encoding = item; > var _valueLength = 0 ; > if(_isFixedLength !=="false"){ > _valueLength = item.substring(13,item.length); > _encoding = "fixed_length"; > } > - if(_isIntLength!="false"){ > + if(_isIntLength!="false" && _isIntegerLength=="false" ){ > _valueLength = item.substring(4,item.length); > _encoding = "int"; > } > + > + if(_isIntegerLength!="false" ){ > + _valueLength = item.substring(8,item.length); > + _encoding = "integer"; > + } > + > $scope.GroupBy = { > name:_name, > encoding:_encoding, > @@ -172,8 +179,9 @@ KylinApp.controller('CubeMeasuresCtrl', function > ($scope, $modal,MetaModel,cubes > if(item.encoding!=="dict" && item.encoding!=="date"&& > item.encoding!=="time"){ > if(item.encoding=="fixed_length" && item.valueLength){ > encoding = "fixed_length:"+item.valueLength; > - } > - else if(item.encoding=="int" && item.valueLength){ > + }else if(item.encoding=="integer" && item.valueLength){ > + encoding = "integer:"+item.valueLength; > + }else if(item.encoding=="int" && item.valueLength){ > encoding = "int:"+item.valueLength; > }else{ > encoding = item.encoding; > >
