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 2015/05/29 05:12:15 UTC
incubator-kylin git commit: KYLIN-794 after support timestamp ,
rm unecessary file and add more friendly tip for partition column
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8.0 4631e40a7 -> 0632016e1
KYLIN-794 after support timestamp ,rm unecessary file and add more friendly tip for partition column
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/0632016e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/0632016e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/0632016e
Branch: refs/heads/0.8.0
Commit: 0632016e1958e54d085510b1635af6a0c63d4697
Parents: 4631e40
Author: jiazhong <ji...@ebay.com>
Authored: Fri May 29 11:11:27 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Fri May 29 11:11:54 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeEdit.js | 7 --
.../app/partials/cubeDesigner/incremental.html | 95 --------------------
.../modelDesigner/conditions_settings.html | 2 +-
3 files changed, 1 insertion(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0632016e/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index e7416ce..cf8ab95 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -65,13 +65,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
return avaColObject;
};
- $scope.getPartitonColumns = function(tableName){
- var columns = _.filter($scope.getColumnsByTable(tableName),function(column){
- return column.datatype==="date"||column.datatype==="string";
- });
- return columns;
- };
-
$scope.getColumnType = function (_column,table){
var columns = $scope.getColumnsByTable(table);
var type;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0632016e/webapp/app/partials/cubeDesigner/incremental.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/incremental.html b/webapp/app/partials/cubeDesigner/incremental.html
deleted file mode 100755
index 2d48ee5..0000000
--- a/webapp/app/partials/cubeDesigner/incremental.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
--->
-
-<div ng-controller="CubeRefreshCtrl">
-<div class="row">
- <div class="col-xs-8">
-
- <!--Cube Partition Type-->
- <div class="form-group" ng-hide="true">
- <div class="row">
- <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Type</b></label>
- <div class="col-xs-12 col-sm-6">
- <select class="form-control"
- ng-if="state.mode=='edit'"
- chosen ng-model="metaModel.model.partition_desc.partition_type"
- ng-options="ddt as ddt for ddt in cubeConfig.cubePartitionTypes">
- <option value=""></option>
- </select>
- <span ng-if="state.mode=='view'">{{metaModel.model.partition_desc.partition_type}}</span>
- </div>
- </div>
- </div>
-
- <!--Partition Column-->
- <div class="form-group">
- <div class="row">
- <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Partition Date Column</b></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-required="metaModel.model.partition_desc.partition_date_start"
- ng-model="metaModel.model.partition_desc.partition_date_column"
- ng-if="state.mode=='edit'"
- data-placement=""
- ng-options="metaModel.model.fact_table+'.'+columns.name as metaModel.model.fact_table+'.'+columns.name for columns in getPartitonColumns(metaModel.model.fact_table)" >
- <option value="">--Select Partition Column--</option>
- </select>
- <p class="text-red" ng-if="state.mode=='edit'">(data format in column should be 'YYYY-MM-DD')</p>
- <span ng-if="state.mode=='view'">
- {{!!(metaModel.model.partition_desc.partition_date_column)?metaModel.model.partition_desc.partition_date_column: ''}}</span>
- </div>
- </div>
- </div>
-
- <!--Data Range Start-->
- <div class="form-group">
- <div class="row">
- <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Start Date</b></label>
- <div class="col-xs-12 col-sm-6">
- <!--edit model will convert in MetaModel.converDateToGMT-->
- <input type="text" class="form-control" datepicker-popup="yyyy-MM-dd"
- ng-model="metaModel.model.partition_desc.partition_date_start" ng-if="state.mode=='edit'"
- placeholder="Click to choose start date..." is-open="opened" />
- <!--vier model will convert use filter-->
- <span ng-if="state.mode=='view'&&metaModel.model.partition_desc.partition_date_column">{{(metaModel.model.partition_desc.partition_date_start)|reverseToGMT0 }}</span>
- </div>
- </div>
- </div>
- </div>
-
- <div class="col-xs-4">
- <div class="box box-solid">
- <div class="box-header">
- <h4 class="box-title">Tips</h4>
- </div>
- <div class="box-body">
- <div class="row">
- <div class="col-xs-12">
- <ol class="text-info">
- <li>Not required,leave as default if this cube always need full build</li>
- <li>Partition column will select 'date' or 'string' type column from fact table</li>
- <li>If column selected,please indicate start date to just pull certain data from source</li>
- </ol>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/0632016e/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 b27bae3..7a0d463 100644
--- a/webapp/app/partials/modelDesigner/conditions_settings.html
+++ b/webapp/app/partials/modelDesigner/conditions_settings.html
@@ -49,7 +49,7 @@
ng-options="modelsManager.selectedModel.fact_table+'.'+columns.name as modelsManager.selectedModel.fact_table+'.'+columns.name for columns in getPartitonColumns(modelsManager.selectedModel.fact_table)" >
<option value="">--Select Partition Column--</option>
</select>
- <small class="help-block text-red" ng-show="state.mode=='edit'">(data format in column should be 'YYYY-MM-DD')</small>
+ <small class="help-block text-red" ng-show="state.mode=='edit'">(Column Type should be DATE or TIMESTAMP Type)</small>
<span ng-if="state.mode=='view'">
{{!!(modelsManager.selectedModel.partition_desc.partition_date_column)?modelsManager.selectedModel.partition_desc.partition_date_column: ''}}</span>