AMBARI-4644. Tez DAG Edge label showing constants. (srimanth)

ambari-web/app/assets/data/jobs/hive-queries.json

@@ -1,92 +1,84 @@
 {
   "entities": [
     {
-      "otherinfo": {},
+      "starttime": 1390516278010,
+      "entitytype": "HIVE_QUERY_ID",
       "primaryfilters": {
         "user": "hiveuser1"
       },
       "events": [
         {
-          "ts": 1390516285963,
+          "timestamp": 1390516285963,
           "eventtype": "QUERY_COMPLETED",
           "eventinfo": {}
         },
         {
-          "ts": 1390516278010,
+          "timestamp": 1390516278010,
           "eventtype": "QUERY_SUBMITTED",
           "eventinfo": {}
         }
       ],
-      "keyts": 1390516278010,
-      "relatedentities": {},
-      "entity": "HIVE-Q3",
-      "entitytype": "HIVE_QUERY_ID"
+      "entity": "HIVE-Q3-0"
     },
     {
-      "otherinfo": {},
+      "starttime": 1390516133110,
+      "entitytype": "HIVE_QUERY_ID",
       "primaryfilters": {
         "user": "hiveuser2"
       },
       "events": [
         {
-          "ts": 1390516133110,
+          "timestamp": 1390516133110,
           "eventtype": "QUERY_COMPLETED",
           "eventinfo": {}
         },
         {
-          "ts": 1390516133110,
+          "timestamp": 1390516133110,
           "eventtype": "QUERY_SUBMITTED",
           "eventinfo": {}
         }
       ],
-      "keyts": 1390516133110,
-      "relatedentities": {},
-      "entity": "HIVE-Q2",
-      "entitytype": "HIVE_QUERY_ID"
+      "entity": "HIVE-Q2-0"
     },
     {
-      "otherinfo": {},
+      "starttime": 1390515264503,
+      "entitytype": "HIVE_QUERY_ID",
       "primaryfilters": {
         "user": "hiveuser1"
       },
       "events": [
         {
-          "ts": 1390515297205,
+          "timestamp": 1390515297205,
           "eventtype": "QUERY_COMPLETED",
           "eventinfo": {}
         },
         {
-          "ts": 1390515264503,
+          "timestamp": 1390515264503,
           "eventtype": "QUERY_SUBMITTED",
           "eventinfo": {}
         }
       ],
-      "keyts": 1390515264503,
-      "relatedentities": {},
-      "entity": "HIVE-Q1",
-      "entitytype": "HIVE_QUERY_ID"
+      "entity": "HIVE-Q1-0"
     },
     {
-      "otherinfo": {},
+      "starttime": 1389809461915,
+      "entitytype": "HIVE_QUERY_ID",
       "primaryfilters": {
         "user": "hiveuser2"
       },
       "events": [
         {
-          "ts": 1390516418183,
+          "timestamp": 1390516418183,
           "eventtype": "QUERY_COMPLETED",
           "eventinfo": {}
         },
         {
-          "ts": 1389809461915,
+          "timestamp": 1389809461915,
           "eventtype": "QUERY_SUBMITTED",
           "eventinfo": {}
         }
       ],
-      "keyts": 1389809461915,
-      "relatedentities": {},
-      "entity": "HIVE-Q4",
-      "entitytype": "HIVE_QUERY_ID"
+      "entity": "HIVE-Q4-0"
     }
   ]
 }

ambari-web/app/assets/data/jobs/hive-query-2.json

@@ -1,9 +1,6 @@
 {
-  "relatedentities": {},
-  "primaryfilters": {
-    "user": "hiveuser2"
-  },
-  "secondaryfilters": {},
+  "starttime": 1390516133110,
+  "entitytype": "HIVE_QUERY_ID",
   "otherinfo": {
     "startTime": 1390516133110,
     "query": {
@@ -218,6 +215,5 @@
     },
     "endTime": 1390516133110
   },
-  "entity": "HIVE-Q2",
-  "entitytype": "HIVE_QUERY_ID"
+  "entity": "HIVE-Q2-0"
 }

ambari-web/app/assets/data/jobs/hive-query-events.json

@@ -1,68 +0,0 @@
-{
-  "events": [
-    {
-      "events": [
-        {
-          "ts": 1390515297205,
-          "eventtype": "QUERY_COMPLETED",
-          "eventinfo": {}
-        },
-        {
-          "ts": 1390515264503,
-          "eventtype": "QUERY_SUBMITTED",
-          "eventinfo": {}
-        }
-      ],
-      "entity": "HIVE-Q1",
-      "entitytype": "HIVE_QUERY_ID"
-    },
-    {
-      "events": [
-        {
-          "ts": 1390516133110,
-          "eventtype": "QUERY_COMPLETED",
-          "eventinfo": {}
-        },
-        {
-          "ts": 1390516133110,
-          "eventtype": "QUERY_SUBMITTED",
-          "eventinfo": {}
-        }
-      ],
-      "entity": "HIVE-Q2",
-      "entitytype": "HIVE_QUERY_ID"
-    },
-    {
-      "events": [
-        {
-          "ts": 1390516285963,
-          "eventtype": "QUERY_COMPLETED",
-          "eventinfo": {}
-        },
-        {
-          "ts": 1390516278010,
-          "eventtype": "QUERY_SUBMITTED",
-          "eventinfo": {}
-        }
-      ],
-      "entity": "HIVE-Q3",
-      "entitytype": "HIVE_QUERY_ID"
-    },
-    {
-      "events": [
-        {
-          "ts": 1390516418183,
-          "eventtype": "QUERY_COMPLETED",
-          "eventinfo": {}
-        },
-        {
-          "ts": 1389809461915,
-          "eventtype": "QUERY_SUBMITTED",
-          "eventinfo": {}
-        }
-      ],
-      "entity": "HIVE-Q4",
-      "entitytype": "HIVE_QUERY_ID"
-    }
-  ]
-}

ambari-web/app/assets/data/jobs/tezDag-name-to-id.json

@@ -1,13 +1,86 @@
 {
   "entities": [
     {
-      "ts": 1390516133120,
-      "info": {
+      "starttime": 1390516133120,
+      "entitytype": "TEZ_DAG_ID",
+      "primaryfilters": {
         "dagName": "HIVE-Q2:1"
       },
-      "entity": "dag_1390516007863_0001_1",
-      "eventtype": "DAG_SUBMITTED"
+      "otherinfo": {
+        "dagPlan": {
+          "dagName": "HIVE-Q2:1",
+          "edges": [
+            {
+              "edgeId": "1167505869",
+              "inputVertexName": "Map 3",
+              "outputVertexName": "Map 2",
+              "dataMovementType": "BROADCAST",
+              "dataSourceType": "PERSISTED",
+              "schedulingType": "SEQUENTIAL",
+              "edgeSourceClass": "org.apache.tez.runtime.library.output.OnFileUnorderedKVOutput",
+              "edgeDestinationClass": "org.apache.tez.runtime.library.input.ShuffledUnorderedKVInput"
+            },
+            {
+              "edgeId": "360567249",
+              "inputVertexName": "Map 1",
+              "outputVertexName": "Map 2",
+              "dataMovementType": "BROADCAST",
+              "dataSourceType": "PERSISTED",
+              "schedulingType": "SEQUENTIAL",
+              "edgeSourceClass": "org.apache.tez.runtime.library.output.OnFileUnorderedKVOutput",
+              "edgeDestinationClass": "org.apache.tez.runtime.library.input.ShuffledUnorderedKVInput"
+            }
+          ],
+          "vertices": [
+            {
+              "vertexName": "Map 1",
+              "processorClass": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
+              "outEdgeIds": "360567249",
+              "additionalInputs": {
+                "name": "z",
+                "class": "org.apache.tez.mapreduce.input.MRInputLegacy",
+                "initializer": "org.apache.tez.mapreduce.common.MRInputAMSplitGenerator"
+              }
+            },
+            {
+              "vertexName": "Map 2",
+              "processorClass": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
+              "inEdgeIds": [
+                "1167505869",
+                "360567249"
+              ],
+              "additionalInputs": {
+                "name": "y",
+                "class": "org.apache.tez.mapreduce.input.MRInputLegacy",
+                "initializer": "org.apache.tez.mapreduce.common.MRInputAMSplitGenerator"
+              },
+              "additionalOutputs": {
+                "name": "out_Map 2",
+                "class": "org.apache.tez.mapreduce.output.MROutput"
+              }
+            },
+            {
+              "vertexName": "Map 3",
+              "processorClass": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
+              "outEdgeIds": "1167505869",
+              "additionalInputs": {
+                "name": "x",
+                "class": "org.apache.tez.mapreduce.input.MRInputLegacy",
+                "initializer": "org.apache.tez.mapreduce.common.MRInputAMSplitGenerator"
+              }
+            }
+          ]
+        }
+      },
+      "events": [
+        {
+          "timestamp": 1390516133120,
+          "eventtype": "DAG_SUBMITTED",
+          "eventinfo": {}
+        }
+      ],
+      "entity": "dag_1390516007863_0001_1-0",
+      "relatedentities": {}
     }
-  ],
-  "entitytype": "TEZ_DAG_ID"
+  ]
 }

ambari-web/app/assets/data/jobs/tezDag.json

@@ -1,172 +1,12 @@
 {
+  "starttime": 1390516133120,
+  "entitytype": "TEZ_DAG_ID",
+  "entity": "dag_1390516007863_0001_1-0",
   "relatedentities": {
     "TEZ_VERTEX_ID": [
-      "vertex_1390516007863_0001_1_00",
-      "vertex_1390516007863_0001_1_01",
-      "vertex_1390516007863_0001_1_02"
+      "vertex_1390516007863_0001_1_00-0",
+      "vertex_1390516007863_0001_1_01-0",
+      "vertex_1390516007863_0001_1_02-0"
     ]
-  },
-  "primaryfilters": {},
-  "secondaryfilters": {},
-  "otherinfo": {
-    "startTime": 1390516133217,
-    "status": "SUCCEEDED",
-    "timeTaken": 9408,
-    "dagPlan": {
-      "dagName": "HIVE-Q2:1",
-      "edges": [
-        {
-          "edgeId": "1167505869",
-          "inputVertexName": "Map 3",
-          "outputVertexName": "Map 2",
-          "dataMovementType": "BROADCAST",
-          "dataSourceType": "PERSISTED",
-          "schedulingType": "SEQUENTIAL",
-          "edgeSourceClass": "org.apache.tez.runtime.library.output.OnFileUnorderedKVOutput",
-          "edgeDestinationClass": "org.apache.tez.runtime.library.input.ShuffledUnorderedKVInput"
-        },
-        {
-          "edgeId": "360567249",
-          "inputVertexName": "Map 1",
-          "outputVertexName": "Map 2",
-          "dataMovementType": "BROADCAST",
-          "dataSourceType": "PERSISTED",
-          "schedulingType": "SEQUENTIAL",
-          "edgeSourceClass": "org.apache.tez.runtime.library.output.OnFileUnorderedKVOutput",
-          "edgeDestinationClass": "org.apache.tez.runtime.library.input.ShuffledUnorderedKVInput"
-        }
-      ],
-      "vertices": [
-        {
-          "vertexName": "Map 1",
-          "processorClass": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
-          "outEdgeIds": "360567249",
-          "additionalInputs": {
-            "name": "z",
-            "class": "org.apache.tez.mapreduce.input.MRInputLegacy",
-            "initializer": "org.apache.tez.mapreduce.common.MRInputAMSplitGenerator"
-          }
-        },
-        {
-          "vertexName": "Map 2",
-          "processorClass": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
-          "inEdgeIds": [
-            "1167505869",
-            "360567249"
-          ],
-          "additionalInputs": {
-            "name": "y",
-            "class": "org.apache.tez.mapreduce.input.MRInputLegacy",
-            "initializer": "org.apache.tez.mapreduce.common.MRInputAMSplitGenerator"
-          },
-          "additionalOutputs": {
-            "name": "out_Map 2",
-            "class": "org.apache.tez.mapreduce.output.MROutput"
-          }
-        },
-        {
-          "vertexName": "Map 3",
-          "processorClass": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
-          "outEdgeIds": "1167505869",
-          "additionalInputs": {
-            "name": "x",
-            "class": "org.apache.tez.mapreduce.input.MRInputLegacy",
-            "initializer": "org.apache.tez.mapreduce.common.MRInputAMSplitGenerator"
-          }
-        }
-      ]
-    },
-    "endTime": 1390516142625,
-    "counters": {
-      "counterGroups": [
-        {
-          "counterGroupName": "org.apache.tez.common.counters.DAGCounter",
-          "counterGroupDisplayName": "org.apache.tez.common.counters.DAGCounter",
-          "counters": [
-            {
-              "counterName": "TOTAL_LAUNCHED_TASKS",
-              "counterDisplayName": "TOTAL_LAUNCHED_TASKS",
-              "counterValue": 3
-            },
-            {
-              "counterName": "DATA_LOCAL_TASKS",
-              "counterDisplayName": "DATA_LOCAL_TASKS",
-              "counterValue": 3
-            }
-          ]
-        },
-        {
-          "counterGroupName": "org.apache.tez.common.counters.TaskCounter",
-          "counterGroupDisplayName": "org.apache.tez.common.counters.TaskCounter",
-          "counters": [
-            {
-              "counterName": "MAP_INPUT_RECORDS",
-              "counterDisplayName": "MAP_INPUT_RECORDS",
-              "counterValue": 1025
-            },
-            {
-              "counterName": "MAP_OUTPUT_RECORDS",
-              "counterDisplayName": "MAP_OUTPUT_RECORDS",
-              "counterValue": 0
-            }
-          ]
-        },
-        {
-          "counterGroupName": "HIVE",
-          "counterGroupDisplayName": "HIVE",
-          "counters": {
-            "counterName": "CREATED_FILES",
-            "counterDisplayName": "CREATED_FILES",
-            "counterValue": 1
-          }
-        },
-        {
-          "counterGroupName": "default.dest_j1/",
-          "counterGroupDisplayName": "default.dest_j1/",
-          "counters": [
-            {
-              "counterName": "numRows",
-              "counterDisplayName": "numRows",
-              "counterValue": 85
-            },
-            {
-              "counterName": "rawDataSize",
-              "counterDisplayName": "rawDataSize",
-              "counterValue": 1600
-            }
-          ]
-        },
-        {
-          "counterGroupName": "org.apache.hadoop.hive.ql.exec.MapOperator$Counter",
-          "counterGroupDisplayName": "org.apache.hadoop.hive.ql.exec.MapOperator$Counter",
-          "counters": {
-            "counterName": "DESERIALIZE_ERRORS",
-            "counterDisplayName": "DESERIALIZE_ERRORS",
-            "counterValue": 0
-          }
-        },
-        {
-          "counterGroupName": "org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter",
-          "counterGroupDisplayName": "File Input Format Counters ",
-          "counters": {
-            "counterName": "BYTES_READ",
-            "counterDisplayName": "Bytes Read",
-            "counterValue": 0
-          }
-        },
-        {
-          "counterGroupName": "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter",
-          "counterGroupDisplayName": "File Output Format Counters ",
-          "counters": {
-            "counterName": "BYTES_WRITTEN",
-            "counterDisplayName": "Bytes Written",
-            "counterValue": 0
-          }
-        }
-      ]
-    },
-    "diagnostics": ""
-  },
-  "entity": "dag_1390516007863_0001_1",
-  "entitytype": "TEZ_DAG_ID"
+  }
 }

ambari-web/app/assets/data/jobs/tezDagVertex.json

@@ -1,20 +1,17 @@
 {
-  "relatedentities": {
-    "TEZ_TASK_ID": [
-      "task_1390516007863_0001_1_00_000000"
-    ]
-  },
-  "primaryfilters": {},
-  "secondaryfilters": {},
+  "starttime": 1390516141963,
+  "entitytype": "TEZ_VERTEX_ID",
   "otherinfo": {
     "startTime": 1390516133853,
-    "initTime": 1390516133853,
-    "numTasks": 1,
     "status": "SUCCEEDED",
+    "numTasks": 1,
+    "initTime": 1390516133853,
     "vertexName": "Map 1",
     "timeTaken": 8110,
     "processorClassName": "org.apache.hadoop.hive.ql.exec.tez.MapTezProcessor",
     "endTime": 1390516141963,
+    "initRequestedTime": 1390516133331,
+    "diagnostics": "",
     "counters": {
       "counterGroups": [
         {
@@ -55,10 +52,7 @@
         }
       ]
     },
-    "diagnostics": "",
-    "initRequestedTime": 1390516133331,
     "startRequestedTime": 1390516133415
   },
-  "entity": "vertex_1390516007863_0001_1_00",
-  "entitytype": "TEZ_VERTEX_ID"
+  "entity": "vertex_1390516007863_0001_1_00-0"
 }

ambari-web/app/messages.js

@@ -1872,6 +1872,8 @@ Em.I18n.translations = {
   'jobs.hive.tez.metric.recordsRead':'Records Read',
   'jobs.hive.tez.metric.recordsWrite':'Records Written',
   'jobs.hive.tez.metric.tezTasks':'Tez Tasks',
+  'jobs.hive.tez.edge.broadcast':'Broadcast',
+  'jobs.hive.tez.edge.scatter_gather':'Shuffle',
 
   'number.validate.empty': 'cannot be empty',
   'number.validate.notValidNumber': 'not a valid number',

ambari-web/app/views/main/jobs/hive_job_details_tez_dag_view.js

@@ -385,7 +385,8 @@ App.MainHiveJobDetailsTezDagView = Em.View.extend({
       }
       return classes;
     }).attr("d", diagonal).append("title").text(function(l) {
-      return l.edgeType;
+      var lower = l.edgeType ? l.edgeType.toLowerCase() : '';
+      return Em.I18n.t("jobs.hive.tez.edge."+lower);
     });
     // Create Nodes
     var node = svgLayer.selectAll(".node").data(dagVisualModel.nodes).enter().append("g").attr("class", "node");