You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/04/11 09:13:17 UTC
[6/9] kylin git commit: KYLIN 2534 column family select mistake
KYLIN 2534 column family select mistake
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/75630b8d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/75630b8d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/75630b8d
Branch: refs/heads/master
Commit: 75630b8d90a900550a55f4a931eedee4b9eb3d21
Parents: 023fa23
Author: chenzhx <34...@qq.com>
Authored: Thu Apr 6 15:42:52 2017 +0800
Committer: chenzhx <34...@qq.com>
Committed: Thu Apr 6 15:42:52 2017 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeAdvanceSetting.js | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/75630b8d/webapp/app/js/controllers/cubeAdvanceSetting.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index 5e7de33..d3e2922 100644
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -339,18 +339,19 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
var allMeasureNames = $scope.getAllMeasureNames();
var tmpColumnFamily = $scope.cubeMetaFrame.hbase_mapping.column_family;
- angular.forEach($scope.cubeMetaFrame.hbase_mapping.column_family, function (colFamily,index1) {
- angular.forEach(colFamily.columns[0].measure_refs, function (measureName, index2) {
- var allIndex = allMeasureNames.indexOf(measureName);
+ for(var j=0;j<$scope.cubeMetaFrame.hbase_mapping.column_family.length; j++) {
+ for (var i=0;i<$scope.cubeMetaFrame.hbase_mapping.column_family[j].columns[0].measure_refs.length; i++){
+ var allIndex = allMeasureNames.indexOf($scope.cubeMetaFrame.hbase_mapping.column_family[j].columns[0].measure_refs[i]);
if (allIndex == -1) {
- tmpColumnFamily[index1].columns[0].measure_refs.splice(index2, 1);
+ tmpColumnFamily[j].columns[0].measure_refs.splice(i, 1);
+ i--
}
-
- if (tmpColumnFamily[index1].columns[0].measure_refs == 0) {
- tmpColumnFamily.splice(index1, 1);
- }
- });
- });
+ }
+ if (tmpColumnFamily[j].columns[0].measure_refs.length == 0) {
+ tmpColumnFamily.splice(j, 1);
+ j--
+ }
+ }
$scope.cubeMetaFrame.hbase_mapping.column_family = tmpColumnFamily;
};