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/02/16 00:52:55 UTC
[07/17] kylin git commit: KYLIN 2445 UI: select cube engine in
Advanced setting page
KYLIN 2445 UI: select cube engine in Advanced setting page
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/29bff866
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/29bff866
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/29bff866
Branch: refs/heads/master-hbase0.98
Commit: 29bff866405f385f99f57013ad186818f32ae8d1
Parents: c302115
Author: chenzhx <34...@qq.com>
Authored: Tue Feb 14 17:41:10 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Feb 14 17:56:22 2017 +0800
----------------------------------------------------------------------
webapp/app/js/model/cubeConfig.js | 4 +++
.../cubeDesigner/advanced_settings.html | 31 ++++++++++++++++----
.../modelDesigner/conditions_settings.html | 21 -------------
3 files changed, 30 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/29bff866/webapp/app/js/model/cubeConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index 35af1fc..dc5ff7a 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -23,6 +23,10 @@ KylinApp.constant('cubeConfig', {
measureExpressions: ['SUM', 'MIN', 'MAX', 'COUNT', 'COUNT_DISTINCT',"TOP_N", 'RAW','EXTENDED_COLUMN','PERCENTILE'],
dimensionDataTypes: ["string", "tinyint", "int", "bigint", "date"],
cubePartitionTypes: ['APPEND'],
+ engineType:[
+ {name:'MapReduce',value: 2},
+ {name:'Spark(Beta)',value: 4}
+ ],
joinTypes: [
{name: 'Left', value: 'left'},
{name: 'Inner', value: 'inner'}
http://git-wip-us.apache.org/repos/asf/kylin/blob/29bff866/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 f26722b..ffa7589 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -268,7 +268,24 @@
</div>
</div>
</div>
- <div class="form-group large-popover" style="overflow:auto">
+ <!--Cube Engine-->
+ <div class="form-group large-popover" style="margin-bottom:30px;">
+ <h3 style="margin-left:42px;margin-bottom:30px;">Cube Engine <i kylinpopover placement="right" title="Cube Engine" template="CubeEngineTip.html" class="fa fa-info-circle"></i></h3>
+ <div class="row" style="margin-left:42px">
+ <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Engine Type :</b></label>
+ <div class="col-xs-12 col-sm-6">
+ <select style="width: 100%" chosen
+ ng-model="cubeMetaFrame.engine_type"
+ ng-if="state.mode=='edit'" ng-disabled="instance.segments.length>0"
+ ng-options="et.value as et.name for et in cubeConfig.engineType">
+ <option value="">--Select Engine Type--</option>
+ </select>
+ <span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==2">MapReduce</span>
+ <span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==4">Spark(Beta)</span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group large-popover">
<h3 style="margin-left:42px">Advanced Dictionaries <i kylinpopover placement="right" title="Advanced Dictionaries" template="AdvancedDictionariesTip.html" class="fa fa-info-circle"></i></h3>
<div style="margin-left:42px">
<div class="box-body">
@@ -388,9 +405,8 @@
<button class="btn btn-link" ng-click="clearNewDictionaries()">Cancel</button>
</div>
</div>
-
<!--Edit ColumnFamily-->
- <div class="form-group large-popover" style="overflow:auto">
+ <div class="form-group large-popover" >
<h3 style="margin-left:42px">Advanced ColumnFamily <i kylinpopover placement="right" title="Advanced ColumnFamily" template="AdvancedColumnFamilyTip.html" class="fa fa-info-circle"></i></h3>
<div style="margin-left:42px">
<div class="box-body">
@@ -436,9 +452,7 @@
<td class="col-xs-10">
<ui-select
- ng-if="state.mode=='edit'"
style="width: 100%"
- autofocus="true"
close-on-select="false"
on-select="refreshColumnFamily(cubeMetaFrame.hbase_mapping.column_family, rowIndex, colFamily)"
on-remove="refreshColumnFamily(cubeMetaFrame.hbase_mapping.column_family, rowIndex, colFamily)"
@@ -509,3 +523,10 @@
you could assign these measures to more column family.</h4>
</div>
</script>
+<script type="text/ng-template" id="CubeEngineTip.html" >
+ <div>
+ <h4>
+ Select cube engine for building cube.
+ </h4>
+ </div>
+</script>
http://git-wip-us.apache.org/repos/asf/kylin/blob/29bff866/webapp/app/partials/modelDesigner/conditions_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html
index a39c8b3..6775bcb 100644
--- a/webapp/app/partials/modelDesigner/conditions_settings.html
+++ b/webapp/app/partials/modelDesigner/conditions_settings.html
@@ -79,27 +79,6 @@
</div>
</div>
</div>
-<!-- <!–Partition Time Column–>
- <div class="form-group" ng-if="partitionColumn.hasSeparateTimeColumn == true">
- <div class="row middle-popover">
- <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Time Column</b> <i kylinpopover placement="right" title="Partition Time Column" template="partitionTimeTip.html" class="fa fa-info-circle"></i></label>
- <div class="col-xs-12 col-sm-6">
-
- <select style="width: 100%" chosen data-placeholder="e.g. DEFAULT.TEST_KYLIN_FACT.CAL_DT"
- ng-model="modelsManager.selectedModel.partition_desc.partition_time_column"
- ng-if="state.mode=='edit'"
- data-placement=""
- ng-options="modelsManager.selectedModel.fact_table+'.'+columns.name as modelsManager.selectedModel.fact_table+'.'+columns.name for columns in getPartitonTimeColumns(modelsManager.selectedModel.fact_table)" >
- <option value="">--Select Partition Column--</option>
- </select>
- <!–<small class="text-info" ng-show="state.mode=='edit'">(Column Type should be TIME Type)</small>–>
-
- <span ng-if="state.mode=='view'">
- {{!!(modelsManager.selectedModel.partition_desc.partition_time_column)?modelsManager.selectedModel.partition_desc.partition_time_column: ''}}</span>
- </div>
- </div>
- </div>-->
-
<!--Partition Time Column-->
<div class="form-group" ng-if="partitionColumn.hasSeparateTimeColumn == true">
<div class="row middle-popover">