You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zh...@apache.org on 2017/03/28 19:48:03 UTC
[22/50] [abbrv] tez git commit: TEZ-3640. Tez UI: Add associated llap
application id to queries page (sree)
TEZ-3640. Tez UI: Add associated llap application id to queries page (sree)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/ee4a9a90
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ee4a9a90
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ee4a9a90
Branch: refs/heads/TEZ-1190
Commit: ee4a9a90856a229f5aaebf2027838660f1efae38
Parents: 57119a5
Author: Sreenath Somarajapuram <sr...@apache.org>
Authored: Tue Feb 28 14:55:06 2017 +0530
Committer: Sreenath Somarajapuram <sr...@apache.org>
Committed: Tue Feb 28 14:55:06 2017 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
tez-ui/src/main/webapp/app/controllers/home/queries.js | 5 +++++
tez-ui/src/main/webapp/app/models/hive-query.js | 1 +
tez-ui/src/main/webapp/app/serializers/hive-query.js | 1 +
tez-ui/src/main/webapp/app/templates/query/index.hbs | 6 ++++++
.../main/webapp/tests/unit/controllers/home/queries-test.js | 2 +-
tez-ui/src/main/webapp/tests/unit/models/hive-query-test.js | 1 +
.../src/main/webapp/tests/unit/serializers/hive-query-test.js | 2 +-
8 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8bb3749..3806e27 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -206,6 +206,7 @@ ALL CHANGES:
TEZ-3626. Tez UI: First Task Start Time & Last Task Finish Time values are showing up incorrectly
TEZ-3630. Tez UI: Use DAG status for controlling auto-refresh polling
TEZ-3639. Tez UI: Footer pagination is improper in landing page
+ TEZ-3640. Tez UI: Add associated llap application id to queries page
Release 0.8.5: Unreleased
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/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 57b3964..9c0b564 100644
--- a/tez-ui/src/main/webapp/app/controllers/home/queries.js
+++ b/tez-ui/src/main/webapp/app/controllers/home/queries.js
@@ -131,6 +131,11 @@ export default TableController.extend({
headerTitle: 'Tables Written',
contentPath: 'tablesWritten',
},{
+ id: 'llapAppID',
+ headerTitle: 'LLAP App ID',
+ contentPath: 'llapAppID',
+ minWidth: "250px",
+ },{
id: 'clientAddress',
headerTitle: 'Client Address',
contentPath: 'clientAddress',
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/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 2f2f129..38b4785 100644
--- a/tez-ui/src/main/webapp/app/models/hive-query.js
+++ b/tez-ui/src/main/webapp/app/models/hive-query.js
@@ -41,6 +41,7 @@ export default AbstractModel.extend({
sessionID: DS.attr('string'),
operationID: DS.attr('string'),
+ llapAppID: DS.attr('string'),
instanceType: DS.attr('string'),
executionMode: DS.attr('string'), // Would be ideally TEZ
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/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 f4dd964..787bfea 100644
--- a/tez-ui/src/main/webapp/app/serializers/hive-query.js
+++ b/tez-ui/src/main/webapp/app/serializers/hive-query.js
@@ -53,6 +53,7 @@ export default TimelineSerializer.extend({
sessionID: 'otherinfo.INVOKER_INFO',
operationID: 'primaryfilters.operationid.0',
+ llapAppID: 'otherinfo.LLAP_APP_ID',
instanceType: 'otherinfo.HIVE_INSTANCE_TYPE',
executionMode: 'primaryfilters.executionmode.0',
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/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 ddb5d72..b90c627 100644
--- a/tez-ui/src/main/webapp/app/templates/query/index.hbs
+++ b/tez-ui/src/main/webapp/app/templates/query/index.hbs
@@ -69,6 +69,12 @@
<td>Session ID</td>
<td>{{txt model.sessionID}}</td>
</tr>
+ {{#if model.llapAppID}}
+ <tr>
+ <td>LLAP App ID</td>
+ <td>{{txt model.llapAppID}}</td>
+ </tr>
+ {{/if}}
<tr>
<td>Thread Name</td>
<td>{{txt model.threadName}}</td>
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/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 22461d2..34b05d0 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
@@ -42,7 +42,7 @@ test('Basic creation test', function(assert) {
assert.ok(controller.definition);
assert.ok(controller.columns);
- assert.equal(controller.columns.length, 16);
+ assert.equal(controller.columns.length, 17);
assert.ok(controller.getCounterColumns);
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/tez-ui/src/main/webapp/tests/unit/models/hive-query-test.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/tests/unit/models/hive-query-test.js b/tez-ui/src/main/webapp/tests/unit/models/hive-query-test.js
index e44592c..42803fd 100644
--- a/tez-ui/src/main/webapp/tests/unit/models/hive-query-test.js
+++ b/tez-ui/src/main/webapp/tests/unit/models/hive-query-test.js
@@ -36,6 +36,7 @@ test('Basic creation test', function(assert) {
assert.ok(model.version);
+ assert.ok(model.llapAppID);
assert.ok(model.sessionID);
assert.ok(model.threadName);
http://git-wip-us.apache.org/repos/asf/tez/blob/ee4a9a90/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 fc0272b..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
@@ -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 + 20);
+ assert.equal(Object.keys(serializer.get("maps")).length, 6 + 21);
assert.ok(serializer.get("extractAttributes"));
});