You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by pr...@apache.org on 2015/05/14 07:48:51 UTC

tez git commit: TEZ-2446. Tez UI: Add tezVersion details when downloading timeline data for offline use (pramachandran)

Repository: tez
Updated Branches:
  refs/heads/master e10aef4e1 -> d090fc906


TEZ-2446. Tez UI: Add tezVersion details when downloading timeline data for offline use (pramachandran)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/d090fc90
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/d090fc90
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/d090fc90

Branch: refs/heads/master
Commit: d090fc9061c1b0e39d34e2683d59fb9bd3f8e6f8
Parents: e10aef4
Author: Prakash Ramachandran <pr...@hortonworks.com>
Authored: Thu May 14 11:18:02 2015 +0530
Committer: Prakash Ramachandran <pr...@hortonworks.com>
Committed: Thu May 14 11:18:02 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 tez-ui/src/main/webapp/app/scripts/helpers/misc.js | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/d090fc90/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c55cb9f..06837c6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,7 @@ INCOMPATIBLE CHANGES
     Default max limit increased. Should not affect existing users.
 
 ALL CHANGES:
+  TEZ-2446. Tez UI: Add tezVersion details when downloading timeline data for offline use
   TEZ-2432. Syntax error in DOAP file release section
   TEZ-2445. Disable the object cleanup in local mode in LogicalIOProcessorRuntimeTask.
   TEZ-2057. tez-dag/pom.xml contains versions for dependencies.

http://git-wip-us.apache.org/repos/asf/tez/blob/d090fc90/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
index 81a7693..da38129 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
@@ -326,6 +326,15 @@ App.Helpers.misc = {
     return vertexId;
   },
 
+  /* Gets the application id from dagid
+   * @param dagId {String}
+   * @return application id for the dagid {String}
+   */
+  getAppIdFromDagId: function(dagId) {
+    var dagIdRegex = /dag_(\d+)_(\d+)_\d/;
+    return dagId.replace(dagIdRegex, 'application_$1_$2');
+  },
+
   /**
    * Remove the specific record from store
    * @param store {DS.Store}
@@ -345,6 +354,11 @@ App.Helpers.misc = {
         baseurl = '%@/%@'.fmt(App.env.timelineBaseUrl, App.Configs.restNamespace.timeline),
         itemsToDownload = [
           {
+            url: getUrl('TEZ_APPLICATION', 'tez_' + this.getAppIdFromDagId(dagID)),
+            context: { name: 'application', type: 'TEZ_APPLICATION' },
+            onItemFetched: processSingleItem
+          },
+          {
             url: getUrl('TEZ_DAG_ID', dagID),
             context: { name: 'dag', type: 'TEZ_DAG_ID' },
             onItemFetched: processSingleItem
@@ -378,7 +392,7 @@ App.Helpers.misc = {
 
     function getUrl(type, dagID, fromID) {
       var url;
-      if (type == 'TEZ_DAG_ID') {
+      if (type == 'TEZ_DAG_ID' || type == 'TEZ_APPLICATION') {
         url = '%@/%@/%@'.fmt(baseurl, type, dagID);
       } else {
         url = '%@/%@?primaryFilter=TEZ_DAG_ID:%@&limit=%@'.fmt(baseurl, type, dagID, batchSize + 1);