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/01/07 08:25:56 UTC
kylin git commit: KYLIN-811 update streaming derived dimenson column
type
Repository: kylin
Updated Branches:
refs/heads/2.0-rc b94c6f081 -> 54ed74669
KYLIN-811 update streaming derived dimenson column type
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/54ed7466
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/54ed7466
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/54ed7466
Branch: refs/heads/2.0-rc
Commit: 54ed746692f2bf675cdad2267b11ce296bedd9fd
Parents: b94c6f0
Author: jian <zh...@apache.org>
Authored: Thu Jan 7 15:25:17 2016 +0800
Committer: jian <zh...@apache.org>
Committed: Thu Jan 7 15:25:49 2016 +0800
----------------------------------------------------------------------
webapp/app/index.html | 1 -
webapp/app/js/controllers/sourceMeta.js | 4 ++--
webapp/app/js/model/cubeConfig.js | 10 +++++++++-
3 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/54ed7466/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index 6e5d463..f02c0a7 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -161,7 +161,6 @@
<script src="js/controllers/job.js"></script>
<script src="js/controllers/cube.js"></script>
<script src="js/controllers/cubes.js"></script>
-<script src="js/controllers/streaming.js"></script>
<script src="js/controllers/projects.js"></script>
<script src="js/controllers/cubeEdit.js"></script>
<script src="js/controllers/cubeSchema.js"></script>
http://git-wip-us.apache.org/repos/asf/kylin/blob/54ed7466/webapp/app/js/controllers/sourceMeta.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index bf45403..6620060 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -249,9 +249,9 @@ KylinApp
for(var i = 0;i<timeMeasure.length;i++){
var defaultCheck = 'Y';
columnList.push({
- 'name': timeMeasure[i],
+ 'name': timeMeasure[i].name,
'checked': defaultCheck,
- 'type': 'timestamp',
+ 'type': timeMeasure[i].type,
'fromSource':'N'
});
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/54ed7466/webapp/app/js/model/cubeConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index 3122785..e06defe 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -70,7 +70,15 @@ KylinApp.constant('cubeConfig', {
{attr: 'owner', name: 'Owner'},
{attr: 'create_time', name: 'Create Time'}
],
- streamingAutoGenerateMeasure:['year_start','quarter_start','month_start','week_start','day_start','hour_start','minute_start'],
+ streamingAutoGenerateMeasure:[
+ {name:"year_start",type:"date"},
+ {name:"quarter_start",type:"date"},
+ {name:"month_start",type:"date"},
+ {name:"week_start",type:"date"},
+ {name:"day_start",type:"date"},
+ {name:"hour_start",type:"timestamp"},
+ {name:"minute_start",type:"timestamp"}
+ ],
partitionDateFormatOpt:[
'yyyy-MM-dd',
'yyyyMMdd'