You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2019/05/17 10:19:09 UTC
[kylin] 02/02: KYLIN-4001 Allow user-specified time format using
real-time for ui
This is an automated email from the ASF dual-hosted git repository.
magang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 876d420812a09270455bfbb78204010c81cab612
Author: ning.guo <35...@qq.com>
AuthorDate: Fri May 17 12:39:03 2019 +0800
KYLIN-4001 Allow user-specified time format using real-time for ui
---
webapp/app/js/controllers/sourceMeta.js | 8 +++++++-
webapp/app/partials/tables/loadStreamingTableConfig.html | 16 ++++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index 4ee196f..32a5c6b 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -965,6 +965,8 @@ KylinApp
dataTypeArr: tableConfig.dataTypes,
TSColumnArr: [],
TSColumnSelected: '',
+ TSParser: 'org.apache.kylin.stream.source.kafka.LongTimeParser',
+ TSPattern: 'MS',
errMsg: ''
};
$scope.tableData = {
@@ -1020,6 +1022,8 @@ KylinApp
dataTypeArr: tableConfig.dataTypes,
TSColumnArr: [],
TSColumnSelected: '',
+ TSParser: '',
+ TSPattern: '',
errMsg: '',
lambda: false
};
@@ -1251,7 +1255,9 @@ KylinApp
}
// Set ts column
$scope.streamingConfig.parser_info.ts_col_name = $scope.streaming.TSColumnSelected;
- $scope.streamingConfig.parser_info.field_mapping = {}
+ $scope.streamingConfig.parser_info.ts_parser = $scope.streaming.TSParser;
+ $scope.streamingConfig.parser_info.ts_pattern = $scope.streaming.TSPattern;
+ $scope.streamingConfig.parser_info.field_mapping = {};
$scope.tableData.columns.forEach(function(col) {
if (col.comment) {
$scope.streamingConfig.parser_info.field_mapping[col.name] = col.comment.replace(/\|/g, '.') || ''
diff --git a/webapp/app/partials/tables/loadStreamingTableConfig.html b/webapp/app/partials/tables/loadStreamingTableConfig.html
index ed77f50..2dbdcac 100644
--- a/webapp/app/partials/tables/loadStreamingTableConfig.html
+++ b/webapp/app/partials/tables/loadStreamingTableConfig.html
@@ -70,7 +70,19 @@
<div class="form-group required">
<label for="TSColumn" class="col-sm-3 control-label font-color-default">TSColumn</label>
<div class="col-sm-6">
- <select chosen ng-model="streaming.TSColumnSelected" ng-options="TSColumn as TSColumn for TSColumn in streaming.TSColumnArr" data-placeholder="select a column name" style="width: 120px !important;" class="chosen-select" ng-change="updateTSColumn(TSColumn)"></select>
+ <select id="TSColumn" chosen ng-model="streaming.TSColumnSelected" ng-options="TSColumn as TSColumn for TSColumn in streaming.TSColumnArr" data-placeholder="select a column name" style="width: 120px !important;" class="chosen-select" ng-change="updateTSColumn(TSColumn)"></select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="TSParser" class="col-sm-3 control-label font-color-default">TSParser</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="TSParser" ng-model="streaming.TSParser" name="TSParser" placeholder="Input TSParser eg org.apache.kylin.stream.source.kafka.TimedJsonStreamParser" required>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="TSPattern" class="col-sm-3 control-label font-color-default">TSPattern</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="TSPattern" ng-model="streaming.TSPattern" name="TSPattern" placeholder="Input TSPattern eg. yyyy-MM-dd HH:mm:ss">
</div>
</div>
@@ -137,4 +149,4 @@
</div>
</div>
</div>
-</form>
\ No newline at end of file
+</form>