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 2016/04/15 09:32:44 UTC
kylin git commit: KYLIN-1586 UI add cube region size
Repository: kylin
Updated Branches:
refs/heads/yang-m1 6c0d8b936 -> 6a638535e
KYLIN-1586 UI add cube region size
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6a638535
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6a638535
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6a638535
Branch: refs/heads/yang-m1
Commit: 6a638535e6cb4527fc9ba3d088cb6498632556e7
Parents: 6c0d8b9
Author: Jason <ji...@163.com>
Authored: Fri Apr 15 15:32:12 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Fri Apr 15 15:32:12 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/cube/model/CubeDesc.java | 5 +++++
webapp/app/js/controllers/cubeSchema.js | 4 ++++
webapp/app/js/model/cubeDescModel.js | 3 ++-
.../cubeDesigner/advanced_settings.html | 20 ++++++++++++++++++++
4 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/6a638535/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index 9323990..cc5807d 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -417,6 +417,10 @@ public class CubeDesc extends RootPersistentEntity {
return regionSize;
}
+ public void setRegionSize(float regionSize){
+ this.regionSize = regionSize;
+ }
+
@Override
public boolean equals(Object o) {
@@ -1041,6 +1045,7 @@ public class CubeDesc extends RootPersistentEntity {
newCubeDesc.setAggregationGroups(cubeDesc.getAggregationGroups());
newCubeDesc.setOverrideKylinProps(cubeDesc.getOverrideKylinProps());
newCubeDesc.setConfig((KylinConfigExt) cubeDesc.getConfig());
+ newCubeDesc.setRegionSize(cubeDesc.getRegionSize());
newCubeDesc.updateRandomUuid();
return newCubeDesc;
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/6a638535/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index d4f1e1c..618e14e 100755
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -274,6 +274,10 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService, UserServic
}
})
+ if($scope.cubeMetaFrame.region_size<0.01 || $scope.cubeMetaFrame.region_size>100){
+ errors.push("Please input a region size between 0.01 and 100 (G).");
+ }
+
var errorInfo = "";
angular.forEach(errors,function(item){
errorInfo+="\n"+item;
http://git-wip-us.apache.org/repos/asf/kylin/blob/6a638535/webapp/app/js/model/cubeDescModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeDescModel.js b/webapp/app/js/model/cubeDescModel.js
index 4c69945..a73ccf3 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -55,7 +55,8 @@ KylinApp.service('CubeDescModel', function () {
"retention_range": "0",
"auto_merge_time_ranges": [604800000, 2419200000],
"engine_type": 2,
- "storage_type":2
+ "storage_type":2,
+ "region_size":1
};
return cubeMeta;
http://git-wip-us.apache.org/repos/asf/kylin/blob/6a638535/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index bdc1e3e..0499b60 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -19,6 +19,8 @@
<div ng-controller="CubeAdvanceSettingCtrl">
<ng-form name="forms.cube_setting_form">
<div>
+
+
<div class="form-group">
<h4 style="margin-left:42px">Aggregation Groups</h4>
<table style="margin-left:42px; width:92%"
@@ -267,6 +269,24 @@
ng-click="addNewRowkeyColumn()" ng-show="state.mode=='edit'">New Rowkey Column<i class="fa fa-plus"></i>
</button>
</div>
+
+ <div class="form-group">
+ <h4 style="margin-left:42px;border-bottom:1px solid #ddd;padding-bottom:10px;">Region</h4>
+ <ng-form class="form-horizontal">
+ <div class="form-group form-group-lg">
+ <label class="col-sm-2 control-label" for="regionsize">Region Size</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9" ng-style='{"padding-top":(state.mode=="edit"?0:7)+"px"}'>
+ <input type="text" id="regionsize" class="form-control ng-scope ng-pristine ng-valid"
+ placeholder="input a number between 0.01 and 100 as region size" ng-model="cubeMetaFrame.region_size"
+ ng-if="state.mode=='edit'">
+ <small class="help-block text-red" ng-show="state.mode=='edit'">region size should between 0.01 and 100 (G)</small>
+ <span ng-if="state.mode=='view'&&cubeMetaFrame.region_size">{{cubeMetaFrame.region_size}} (G)</span>
+ </div>
+ </div>
+ </ng-form>
+ </div>
+
</div>
</ng-form>
</div>