diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java index 4f6df27..f0404e7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java @@ -702,7 +702,16 @@ private String getNameWithProgress(String s, int complete, int total) { float percent = total == 0 ? 0.0f : (float) complete / (float) total; // lets use the remaining space in column 1 as progress bar int spaceRemaining = COLUMN_1_WIDTH - s.length() - 1; - String result = s + " "; + String trimmedVName = s; + + // if the vertex name is longer than column 1 width, trim it down + // "Tez Merge File Work" will become "Tez Merge File.." + if (s != null && s.length() > COLUMN_1_WIDTH) { + trimmedVName = s.substring(0, COLUMN_1_WIDTH - 1); + trimmedVName = trimmedVName + ".."; + } + + String result = trimmedVName + " "; int toFill = (int) (spaceRemaining * percent); for (int i = 0; i < toFill; i++) { result += "."; diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java index 2c11fb3..9a74e1e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java @@ -1283,7 +1283,7 @@ public static void createMRWorkForMergingFiles (FileSinkOperator fsInput, dpCtx != null && dpCtx.getNumDPCols() > 0); if (conf.getVar(ConfVars.HIVE_EXECUTION_ENGINE).equals("tez")) { work = new TezWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID)); - cplan.setName("Tez Merge File Work"); + cplan.setName("File Merge"); ((TezWork) work).add(cplan); } else { work = cplan; @@ -1292,7 +1292,7 @@ public static void createMRWorkForMergingFiles (FileSinkOperator fsInput, cplan = createMRWorkForMergingFiles(conf, tsMerge, fsInputDesc); if (conf.getVar(ConfVars.HIVE_EXECUTION_ENGINE).equals("tez")) { work = new TezWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID)); - cplan.setName("Tez Merge File Work"); + cplan.setName("File Merge"); ((TezWork)work).add(cplan); } else { work = new MapredWork(); diff --git ql/src/test/results/clientpositive/tez/orc_merge1.q.out ql/src/test/results/clientpositive/tez/orc_merge1.q.out index 461db60..3fffb4e 100644 --- ql/src/test/results/clientpositive/tez/orc_merge1.q.out +++ ql/src/test/results/clientpositive/tez/orc_merge1.q.out @@ -197,7 +197,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Map Operator Tree: TableScan File Output Operator @@ -212,7 +212,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Map Operator Tree: TableScan File Output Operator @@ -326,7 +326,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator @@ -337,7 +337,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator diff --git ql/src/test/results/clientpositive/tez/orc_merge5.q.out ql/src/test/results/clientpositive/tez/orc_merge5.q.out index e3e56f8..c2d841e 100644 --- ql/src/test/results/clientpositive/tez/orc_merge5.q.out +++ ql/src/test/results/clientpositive/tez/orc_merge5.q.out @@ -190,7 +190,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator @@ -201,7 +201,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator diff --git ql/src/test/results/clientpositive/tez/orc_merge6.q.out ql/src/test/results/clientpositive/tez/orc_merge6.q.out index 0552076..73bb4a7 100644 --- ql/src/test/results/clientpositive/tez/orc_merge6.q.out +++ ql/src/test/results/clientpositive/tez/orc_merge6.q.out @@ -240,7 +240,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator @@ -251,7 +251,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator diff --git ql/src/test/results/clientpositive/tez/orc_merge7.q.out ql/src/test/results/clientpositive/tez/orc_merge7.q.out index 4f0678b..c972288 100644 --- ql/src/test/results/clientpositive/tez/orc_merge7.q.out +++ ql/src/test/results/clientpositive/tez/orc_merge7.q.out @@ -271,7 +271,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator @@ -282,7 +282,7 @@ STAGE PLANS: Tez #### A masked pattern was here #### Vertices: - Tez Merge File Work + File Merge Merge File Operator Map Operator Tree: ORC File Merge Operator