Repository: tez Updated Branches: refs/heads/master d415197c6 -> b3a3af3f4
TEZ-3602. Tez UI: Query Name field is not required (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b3a3af3f Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b3a3af3f Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b3a3af3f Branch: refs/heads/master Commit: b3a3af3f476e7c93d46158a3d82285596be5462d Parents: d415197 Author: Sreenath Somarajapuram <[email protected]> Authored: Mon Feb 6 14:49:00 2017 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Mon Feb 6 14:49:00 2017 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui/src/main/webapp/app/adapters/timeline.js | 1 - .../src/main/webapp/app/components/queries-page-search.js | 2 -- tez-ui/src/main/webapp/app/controllers/home/queries.js | 10 ++-------- tez-ui/src/main/webapp/app/models/hive-query.js | 2 -- tez-ui/src/main/webapp/app/routes/home/queries.js | 2 -- tez-ui/src/main/webapp/app/serializers/hive-query.js | 2 -- tez-ui/src/main/webapp/app/templates/query/index.hbs | 4 ---- .../src/main/webapp/tests/unit/adapters/timeline-test.js | 2 +- .../webapp/tests/unit/controllers/home/queries-test.js | 7 +------ .../main/webapp/tests/unit/routes/home/queries-test.js | 3 +-- .../main/webapp/tests/unit/serializers/hive-query-test.js | 2 +- 12 files changed, 7 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c4a1d72..16e239f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -189,6 +189,7 @@ ALL CHANGES: TEZ-3593. Tez UI: Issues in timeline page TEZ-3594. Tez UI: Graphical view tooltip issues TEZ-3598. Tez UI: Text formatting changes + TEZ-3602. Tez UI: Query Name field is not required Release 0.8.5: Unreleased http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/adapters/timeline.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/adapters/timeline.js b/tez-ui/src/main/webapp/app/adapters/timeline.js index 0029329..41cbd1c 100644 --- a/tez-ui/src/main/webapp/app/adapters/timeline.js +++ b/tez-ui/src/main/webapp/app/adapters/timeline.js @@ -42,7 +42,6 @@ export default AbstractAdapter.extend({ executionMode: "executionmode", callerId: "callerId", - queryName: "queryname", tablesRead: "tablesread", tablesWritten: "tableswritten", operationID: "operationid", http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/components/queries-page-search.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/components/queries-page-search.js b/tez-ui/src/main/webapp/app/components/queries-page-search.js index 0daf988..f5f2711 100644 --- a/tez-ui/src/main/webapp/app/components/queries-page-search.js +++ b/tez-ui/src/main/webapp/app/components/queries-page-search.js @@ -21,7 +21,6 @@ import Ember from 'ember'; export default Ember.Component.extend({ classNames: ['queries-page-search'], - queryName: Ember.computed.oneWay("tableDefinition.queryName"), queryID: Ember.computed.oneWay("tableDefinition.queryID"), dagID: Ember.computed.oneWay("tableDefinition.dagID"), appID: Ember.computed.oneWay("tableDefinition.appID"), @@ -35,7 +34,6 @@ export default Ember.Component.extend({ sendSearch: function () { this.get('parentView').sendAction('search', { - queryName: this.get("queryName"), queryID: this.get("queryID"), dagID: this.get("dagID"), appID: this.get("appID"), http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/controllers/home/queries.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/controllers/home/queries.js b/tez-ui/src/main/webapp/app/controllers/home/queries.js index 4b7b9ce..648f98e 100644 --- a/tez-ui/src/main/webapp/app/controllers/home/queries.js +++ b/tez-ui/src/main/webapp/app/controllers/home/queries.js @@ -24,9 +24,8 @@ import TableDefinition from 'em-table/utils/table-definition'; export default TableController.extend({ - queryParams: ["queryName", "queryID", "dagID", "appID", "user", "requestUser", + queryParams: ["queryID", "dagID", "appID", "user", "requestUser", "tablesRead", "tablesWritten", "operationID", "queue"], - queryName: "", queryID: "", dagID: "", appID: "", @@ -54,14 +53,13 @@ export default TableController.extend({ _definition: TableDefinition.create(), // Using computed, as observer won't fire if the property is not used - definition: Ember.computed("queryID", "queryName", "dagID", "appID", "user", "requestUser", + definition: Ember.computed("queryID", "dagID", "appID", "user", "requestUser", "executionMode", "tablesRead", "tablesWritten", "operationID", "queue", "pageNum", "moreAvailable", "loadingMore", function () { var definition = this.get("_definition"); definition.setProperties({ - queryName: this.get("queryName"), queryID: this.get("queryID"), dagID: this.get("dagID"), appID: this.get("appID"), @@ -173,10 +171,6 @@ export default TableController.extend({ headerTitle: 'Hive Server 2 Address', contentPath: 'hiveAddress' },{ - id: 'queryName', - headerTitle: 'Query Name', - contentPath: 'queryName' - },{ id: 'instanceType', headerTitle: 'Client Type', contentPath: 'instanceType' http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/models/hive-query.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/models/hive-query.js b/tez-ui/src/main/webapp/app/models/hive-query.js index a640050..2f2f129 100644 --- a/tez-ui/src/main/webapp/app/models/hive-query.js +++ b/tez-ui/src/main/webapp/app/models/hive-query.js @@ -35,8 +35,6 @@ export default AbstractModel.extend({ } }, - queryName: DS.attr('string'), - queryText: DS.attr("string"), dag: DS.attr('object'), http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/routes/home/queries.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/routes/home/queries.js b/tez-ui/src/main/webapp/app/routes/home/queries.js index 50d9f54..7d09a2e 100644 --- a/tez-ui/src/main/webapp/app/routes/home/queries.js +++ b/tez-ui/src/main/webapp/app/routes/home/queries.js @@ -26,7 +26,6 @@ export default ServerSideOpsRoute.extend({ title: "Hive Queries", queryParams: { - queryName: REFRESH, queryID: REFRESH, dagID: REFRESH, appID: REFRESH, @@ -42,7 +41,6 @@ export default ServerSideOpsRoute.extend({ }, loaderQueryParams: { - queryName: "queryName", id: "queryID", dagID: "dagID", appID: "appID", http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/serializers/hive-query.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/serializers/hive-query.js b/tez-ui/src/main/webapp/app/serializers/hive-query.js index dd5c1b8..f4dd964 100644 --- a/tez-ui/src/main/webapp/app/serializers/hive-query.js +++ b/tez-ui/src/main/webapp/app/serializers/hive-query.js @@ -49,8 +49,6 @@ function getStatus(source) { export default TimelineSerializer.extend({ maps: { - queryName: 'primaryfilters.queryname.0', - queryText: 'otherinfo.QUERY.queryText', sessionID: 'otherinfo.INVOKER_INFO', http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/app/templates/query/index.hbs ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/templates/query/index.hbs b/tez-ui/src/main/webapp/app/templates/query/index.hbs index 1cf2e36..ddb5d72 100644 --- a/tez-ui/src/main/webapp/app/templates/query/index.hbs +++ b/tez-ui/src/main/webapp/app/templates/query/index.hbs @@ -70,10 +70,6 @@ <td>{{txt model.sessionID}}</td> </tr> <tr> - <td>Query Name</td> - <td>{{txt model.queryName}}</td> - </tr> - <tr> <td>Thread Name</td> <td>{{txt model.threadName}}</td> </tr> http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/tests/unit/adapters/timeline-test.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/tests/unit/adapters/timeline-test.js b/tez-ui/src/main/webapp/tests/unit/adapters/timeline-test.js index d189b5d..c7eab39 100644 --- a/tez-ui/src/main/webapp/tests/unit/adapters/timeline-test.js +++ b/tez-ui/src/main/webapp/tests/unit/adapters/timeline-test.js @@ -37,7 +37,7 @@ test('Basic creation test', function(assert) { test('filters test', function(assert) { let filters = this.subject().filters; - assert.equal(Object.keys(filters).length, 6 + 7 + 5); + assert.equal(Object.keys(filters).length, 6 + 7 + 4); }); test('stringifyFilters test', function(assert) { http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/tests/unit/controllers/home/queries-test.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/tests/unit/controllers/home/queries-test.js b/tez-ui/src/main/webapp/tests/unit/controllers/home/queries-test.js index 753015d..cf36c7a 100644 --- a/tez-ui/src/main/webapp/tests/unit/controllers/home/queries-test.js +++ b/tez-ui/src/main/webapp/tests/unit/controllers/home/queries-test.js @@ -33,7 +33,7 @@ test('Basic creation test', function(assert) { assert.ok(controller); assert.ok(controller.queryParams); - assert.equal(controller.queryParams.length, 10 + 5); + assert.equal(controller.queryParams.length, 9 + 5); assert.ok(controller.breadcrumbs); assert.ok(controller.headerComponentNames); @@ -59,7 +59,6 @@ test('definition test', function(assert) { }), definition = controller.get("definition"), - testQueryName = "QueryName", testQueryID = "QueryID", testDagID = "DagID", testAppID = "AppID", @@ -74,7 +73,6 @@ test('definition test', function(assert) { testMoreAvailable = true, testLoadingMore = true; - assert.equal(definition.get("queryName"), ""); assert.equal(definition.get("queryID"), ""); assert.equal(definition.get("dagID"), ""); assert.equal(definition.get("appID"), ""); @@ -91,9 +89,6 @@ test('definition test', function(assert) { assert.equal(definition.get("loadingMore"), false); Ember.run(function () { - controller.set("queryName", testQueryName); - assert.equal(controller.get("definition.queryName"), testQueryName); - controller.set("queryID", testQueryID); assert.equal(controller.get("definition.queryID"), testQueryID); http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/tests/unit/routes/home/queries-test.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/tests/unit/routes/home/queries-test.js b/tez-ui/src/main/webapp/tests/unit/routes/home/queries-test.js index 2e39928..5d5df52 100644 --- a/tez-ui/src/main/webapp/tests/unit/routes/home/queries-test.js +++ b/tez-ui/src/main/webapp/tests/unit/routes/home/queries-test.js @@ -43,7 +43,6 @@ test('it exists', function(assert) { test('refresh test', function(assert) { let route = this.subject(); - assert.equal(route.get("queryParams.queryName.refreshModel"), true); assert.equal(route.get("queryParams.queryID.refreshModel"), true); assert.equal(route.get("queryParams.dagID.refreshModel"), true); assert.equal(route.get("queryParams.appID.refreshModel"), true); @@ -60,7 +59,7 @@ test('refresh test', function(assert) { test('loaderQueryParams test', function(assert) { let route = this.subject(); - assert.equal(Object.keys(route.get("loaderQueryParams")).length, 11 + 1); + assert.equal(Object.keys(route.get("loaderQueryParams")).length, 10 + 1); }); test('load - query test', function(assert) { http://git-wip-us.apache.org/repos/asf/tez/blob/b3a3af3f/tez-ui/src/main/webapp/tests/unit/serializers/hive-query-test.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/tests/unit/serializers/hive-query-test.js b/tez-ui/src/main/webapp/tests/unit/serializers/hive-query-test.js index 4544c72..fc0272b 100644 --- a/tez-ui/src/main/webapp/tests/unit/serializers/hive-query-test.js +++ b/tez-ui/src/main/webapp/tests/unit/serializers/hive-query-test.js @@ -26,7 +26,7 @@ moduleFor('serializer:hive-query', 'Unit | Serializer | hive query', { test('Basic creation test', function(assert) { let serializer = this.subject(); - assert.equal(Object.keys(serializer.get("maps")).length, 6 + 21); + assert.equal(Object.keys(serializer.get("maps")).length, 6 + 20); assert.ok(serializer.get("extractAttributes")); });
