Repository: tez Updated Branches: refs/heads/master 13a88e4bc -> 403a85d76
TEZ-3598. Tez UI: Text formatting changes (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/403a85d7 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/403a85d7 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/403a85d7 Branch: refs/heads/master Commit: 403a85d76d21b822c65dcc364cd735264402dfa8 Parents: 13a88e4 Author: Sreenath Somarajapuram <[email protected]> Authored: Thu Feb 2 16:05:48 2017 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Thu Feb 2 16:05:48 2017 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui/src/main/webapp/app/controllers/home/queries.js | 12 ------------ tez-ui/src/main/webapp/app/serializers/hive-query.js | 8 ++++++++ tez-ui/src/main/webapp/package.json | 2 +- .../webapp/tests/unit/serializers/hive-query-test.js | 8 ++++++++ 5 files changed, 18 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/403a85d7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e734289..5d04ecb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -185,6 +185,7 @@ ALL CHANGES: TEZ-3592. Tez UI: Search issues TEZ-3593. Tez UI: Issues in timeline page TEZ-3594. Tez UI: Graphical view tooltip issues + TEZ-3598. Tez UI: Text formatting changes Release 0.8.5: Unreleased http://git-wip-us.apache.org/repos/asf/tez/blob/403a85d7/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 2eb251e..4b7b9ce 100644 --- a/tez-ui/src/main/webapp/app/controllers/home/queries.js +++ b/tez-ui/src/main/webapp/app/controllers/home/queries.js @@ -123,22 +123,10 @@ export default TableController.extend({ id: 'tablesRead', headerTitle: 'Tables Read', contentPath: 'tablesRead', - getCellContent: function (row) { - var tablesRead = row.get("tablesRead"); - if(tablesRead && tablesRead.length) { - return tablesRead.join(","); - } - } },{ id: 'tablesWritten', headerTitle: 'Tables Written', contentPath: 'tablesWritten', - getCellContent: function (row) { - var tablesWritten = row.get("tablesWritten"); - if(tablesWritten && tablesWritten.length) { - return tablesWritten.join(","); - } - } },{ id: 'clientAddress', headerTitle: 'Client Address', http://git-wip-us.apache.org/repos/asf/tez/blob/403a85d7/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 e00f9ef..dd5c1b8 100644 --- a/tez-ui/src/main/webapp/app/serializers/hive-query.js +++ b/tez-ui/src/main/webapp/app/serializers/hive-query.js @@ -106,6 +106,14 @@ export default TimelineSerializer.extend({ }catch(e){} } + data.primaryfilters = data.primaryfilters || {}; + if(!Ember.get(data, "primaryfilters.tablesread.length")) { + data.primaryfilters.tablesread = new Error("None"); + } + if(!Ember.get(data, "primaryfilters.tableswritten.length")) { + data.primaryfilters.tableswritten = new Error("None"); + } + return this._super(modelClass, resourceHash); }, http://git-wip-us.apache.org/repos/asf/tez/blob/403a85d7/tez-ui/src/main/webapp/package.json ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/package.json b/tez-ui/src/main/webapp/package.json index 2be3368..149c81a 100644 --- a/tez-ui/src/main/webapp/package.json +++ b/tez-ui/src/main/webapp/package.json @@ -57,7 +57,7 @@ "phantomjs-prebuilt": "2.1.13" }, "dependencies": { - "em-helpers": "0.6.0", + "em-helpers": "0.8.0", "em-table": "0.4.0", "em-tgraph": "0.0.10" } http://git-wip-us.apache.org/repos/asf/tez/blob/403a85d7/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 cb61d0d..4544c72 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 @@ -93,5 +93,13 @@ test('extractAttributes test', function(assert) { }); assert.deepEqual(testData.otherinfo.QUERY, testQuery); + //CLIENT_IP_ADDRESS set assert.equal(testHiveAddress, testData.otherinfo.CLIENT_IP_ADDRESS); + + // Tables read & tables written + assert.ok(testData.primaryfilters); + assert.ok(testData.primaryfilters.tablesread instanceof Error); + assert.ok(testData.primaryfilters.tableswritten instanceof Error); + assert.equal(testData.primaryfilters.tablesread.message, "None"); + assert.equal(testData.primaryfilters.tableswritten.message, "None"); });
