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 2015/03/14 01:01:33 UTC

[20/50] incubator-kylin git commit: support 'string' and 'date' type column as options for partition column

support 'string' and 'date' type column as options 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/f983e6cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/f983e6cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/f983e6cc

Branch: refs/heads/streaming
Commit: f983e6cc0ced65349833eac7053b34411c651a88
Parents: c6adb69
Author: jiazhong <ji...@ebay.com>
Authored: Mon Mar 9 17:09:14 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Mar 9 17:09:14 2015 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cubeEdit.js             | 2 +-
 webapp/app/partials/cubeDesigner/incremental.html | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f983e6cc/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index d1fb103..356a5b5 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -38,7 +38,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
 
     $scope.getPartitonColumns = function(tableName){
         var columns = _.filter($scope.getColumnsByTable(tableName),function(column){
-            return column.datatype==="date";
+            return column.datatype==="date"||column.datatype==="string";
         });
         return columns;
     };

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/f983e6cc/webapp/app/partials/cubeDesigner/incremental.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/incremental.html b/webapp/app/partials/cubeDesigner/incremental.html
index 6b21dc3..2d48ee5 100755
--- a/webapp/app/partials/cubeDesigner/incremental.html
+++ b/webapp/app/partials/cubeDesigner/incremental.html
@@ -50,7 +50,7 @@
                             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'">(Partition column will select 'date' type column from fact table)</p>
+                    <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>
@@ -83,6 +83,7 @@
                     <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>