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/12/14 07:47:40 UTC
kylin git commit: KYLIN-1041 Streaming UI, remove deprecated code
Repository: kylin
Updated Branches:
refs/heads/2.0-rc c064fdf0f -> 0ba1e065c
KYLIN-1041 Streaming UI, remove deprecated code
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0ba1e065
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0ba1e065
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0ba1e065
Branch: refs/heads/2.0-rc
Commit: 0ba1e065c496487d008203eea4244f7f9d8d3bb1
Parents: c064fdf
Author: jian <ji...@apache.org>
Authored: Mon Dec 14 14:46:47 2015 +0800
Committer: jian <ji...@apache.org>
Committed: Mon Dec 14 14:47:30 2015 +0800
----------------------------------------------------------------------
.../localmeta/kafka/kafka_test.json | 1 -
.../kafka/test_streaming_table_cube.json | 1 -
.../kafka/test_streaming_table_ii.json | 1 -
.../localmeta/streaming/kafka_test.json | 1 -
webapp/app/js/model/streamingModel.js | 1 -
.../cubeDesigner/kafkaAdvancedConfig.html | 165 -------------------
.../partials/cubeDesigner/streamingConfig.html | 20 ---
7 files changed, 190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/examples/test_case_data/localmeta/kafka/kafka_test.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kafka/kafka_test.json b/examples/test_case_data/localmeta/kafka/kafka_test.json
index 5445417..272abd9 100644
--- a/examples/test_case_data/localmeta/kafka/kafka_test.json
+++ b/examples/test_case_data/localmeta/kafka/kafka_test.json
@@ -3,7 +3,6 @@
"name": "kafka_test",
"topic": "kafka_stream_test",
"timeout": 60000,
- "maxReadCount": 1000,
"bufferSize": 65536,
"last_modified": 0,
"clusters": [
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/examples/test_case_data/localmeta/kafka/test_streaming_table_cube.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kafka/test_streaming_table_cube.json b/examples/test_case_data/localmeta/kafka/test_streaming_table_cube.json
index 5fae898..24e5afe 100644
--- a/examples/test_case_data/localmeta/kafka/test_streaming_table_cube.json
+++ b/examples/test_case_data/localmeta/kafka/test_streaming_table_cube.json
@@ -3,7 +3,6 @@
"name": "test_streaming_table_cube",
"topic": "test_streaming_table_topic_xyz",
"timeout": 60000,
- "maxReadCount": 1000,
"bufferSize": 65536,
"parserName": "org.apache.kylin.source.kafka.TimedJsonStreamParser",
"partition": 1,
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/examples/test_case_data/localmeta/kafka/test_streaming_table_ii.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kafka/test_streaming_table_ii.json b/examples/test_case_data/localmeta/kafka/test_streaming_table_ii.json
index 9e36201..f678349 100644
--- a/examples/test_case_data/localmeta/kafka/test_streaming_table_ii.json
+++ b/examples/test_case_data/localmeta/kafka/test_streaming_table_ii.json
@@ -3,7 +3,6 @@
"name": "test_streaming_table_ii",
"topic": "test_streaming_table_topic_xyz",
"timeout": 60000,
- "maxReadCount": 1000,
"bufferSize": 65536,
"parserName": "org.apache.kylin.source.kafka.JsonStreamParser",
"partition": 1,
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/examples/test_case_data/localmeta/streaming/kafka_test.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/streaming/kafka_test.json b/examples/test_case_data/localmeta/streaming/kafka_test.json
index 5445417..272abd9 100644
--- a/examples/test_case_data/localmeta/streaming/kafka_test.json
+++ b/examples/test_case_data/localmeta/streaming/kafka_test.json
@@ -3,7 +3,6 @@
"name": "kafka_test",
"topic": "kafka_stream_test",
"timeout": 60000,
- "maxReadCount": 1000,
"bufferSize": 65536,
"last_modified": 0,
"clusters": [
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/webapp/app/js/model/streamingModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/streamingModel.js b/webapp/app/js/model/streamingModel.js
index fa2d20c..31ebb8f 100644
--- a/webapp/app/js/model/streamingModel.js
+++ b/webapp/app/js/model/streamingModel.js
@@ -34,7 +34,6 @@ KylinApp.service('StreamingModel', function () {
"name": "",
"topic": "",
"timeout": "60000",
- "maxReadCount": "1000",
"bufferSize": "65536",
"parserName": "org.apache.kylin.streaming.TimedJsonStreamParser",
"margin": "300000",
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/webapp/app/partials/cubeDesigner/kafkaAdvancedConfig.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/kafkaAdvancedConfig.html b/webapp/app/partials/cubeDesigner/kafkaAdvancedConfig.html
deleted file mode 100644
index c0b2b39..0000000
--- a/webapp/app/partials/cubeDesigner/kafkaAdvancedConfig.html
+++ /dev/null
@@ -1,165 +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="kafkaConfigCtrl">
- <ng-form name="forms.kafka_ad_config_form" novalidate>
- <accordion>
-
- <accordion-group is-open="state.isStreamingAdOpen" ng-init="state.isStreamingAdOpen=true">
- <accordion-heading>
- Advanced Setting
- <i class="pull-right glyphicon"
- ng-class="{'glyphicon-chevron-down': state.isStreamingAdOpen, 'glyphicon-chevron-right': !state.isStreamingAdOpen}"></i>
- </accordion-heading>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Timeout</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.kafka_ad_config_form.timeout.$invalid && (forms.kafka_ad_config_form.timeout.$dirty||forms.kafka_ad_config_form.timeout.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.timeout" type="text"
- placeholder="Input kafkaConfig timeout"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.kafka_ad_config_form.timeout.$error.required && (forms.kafka_ad_config_form.timeout.$dirty||forms.kafka_ad_config_form.$sbumitted)">
- Kafka timeout is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.timeout}}</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Max Read Count</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.kafka_ad_config_form.maxReadCount.$invalid && (forms.kafka_ad_config_form.maxReadCount.$dirty||forms.kafka_ad_config_form.maxReadCount.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.maxReadCount" type="text"
- placeholder="Input kafkaConfig maxReadCount"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.kafka_ad_config_form.maxReadCount.$error.required && (forms.kafka_ad_config_form.maxReadCount.$dirty||forms.kafka_ad_config_form.$sbumitted)">
- Kafka maxReadCount is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.maxReadCount}}</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Buffer Size</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.kafka_ad_config_form.bufferSize.$invalid && (forms.kafka_ad_config_form.bufferSize.$dirty||forms.kafka_ad_config_form.bufferSize.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.bufferSize" type="text"
- placeholder="Input kafkaConfig bufferSize"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.kafka_ad_config_form.bufferSize.$error.required && (forms.kafka_ad_config_form.bufferSize.$dirty||forms.kafka_ad_config_form.$sbumitted)">
- Kafka bufferSize is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.bufferSize}}</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Margin</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.kafka_ad_config_form.margin.$invalid && (forms.kafka_ad_config_form.margin.$dirty||forms.kafka_ad_config_form.margin.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.margin" type="text"
- placeholder="Input kafkaConfig margin"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.kafka_ad_config_form.margin.$error.required && (forms.kafka_ad_config_form.margin.$dirty||forms.kafka_ad_config_form.$sbumitted)">
- Kafka margin is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.margin}}</span>
- </div>
- </div>
- </div>
- </accordion-group>
- </accordion>
-
- <hr/>
- <accordion>
-
- <accordion-group is-open="state.isParserHeaderOpen">
- <accordion-heading>
- Parser Setting
- <i class="pull-right glyphicon"
- ng-class="{'glyphicon-chevron-down': state.isParserHeaderOpen, 'glyphicon-chevron-right': !state.isParserHeaderOpen}"></i>
- </accordion-heading>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Parser Name</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.kafka_ad_config_form.parserName.$invalid && (forms.kafka_ad_config_form.parserName.$dirty||forms.kafka_ad_config_form.parserName.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.parserName" type="text"
- placeholder="Input kafkaConfig parserName"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.kafka_ad_config_form.parserName.$error.required && (forms.kafka_ad_config_form.parserName.$dirty||forms.kafka_ad_config_form.$sbumitted)">
- Kafka parserName is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.parserName}}</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Parser Properties</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.kafka_ad_config_form.parserProperties.$invalid && (forms.kafka_ad_config_form.parserProperties.$dirty||forms.kafka_ad_config_form.parserProperties.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.parserProperties" type="text"
- placeholder="configA=1;configB=2"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.kafka_ad_config_form.parserProperties.$error.required && (forms.kafka_ad_config_form.parserProperties.$dirty||forms.kafka_ad_config_form.$sbumitted)">
- Parser Properties is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.parserProperties}}</span>
- </div>
- </div>
- </div>
- </accordion-group>
- </accordion>
-
- </ng-form>
-</div>
http://git-wip-us.apache.org/repos/asf/kylin/blob/0ba1e065/webapp/app/partials/cubeDesigner/streamingConfig.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/streamingConfig.html b/webapp/app/partials/cubeDesigner/streamingConfig.html
index f8ab61d..6e88553 100644
--- a/webapp/app/partials/cubeDesigner/streamingConfig.html
+++ b/webapp/app/partials/cubeDesigner/streamingConfig.html
@@ -166,26 +166,6 @@
<div class="form-group" ng-class="{'required':state.mode=='edit'}">
<div class="row">
<label class="col-xs-12 col-sm-3 control-label no-padding-right">
- <b>Max Read Count</b>
- </label>
-
- <div class="col-xs-12 col-sm-6"
- ng-class="{'has-error':forms.cube_streaming_form.maxReadCount.$invalid && (forms.cube_streaming_form.maxReadCount.$dirty||forms.cube_streaming_form.maxReadCount.$sbumitted)}">
- <input ng-if="state.mode=='edit'" name="name" required ng-model="kafkaMeta.maxReadCount" type="text"
- placeholder="Input kafkaConfig maxReadCount"
- class="form-control"/>
- <small class="help-block"
- ng-show="forms.cube_streaming_form.maxReadCount.$error.required && (forms.cube_streaming_form.maxReadCount.$dirty||forms.cube_streaming_form.$sbumitted)">
- Kafka maxReadCount is required.
- </small>
- <span ng-if="state.mode=='view'">{{kafkaMeta.maxReadCount}}</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-class="{'required':state.mode=='edit'}">
- <div class="row">
- <label class="col-xs-12 col-sm-3 control-label no-padding-right">
<b>Buffer Size</b>
</label>