You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2014/12/14 06:27:19 UTC
svn commit: r1645400 - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/exec/tez/
java/org/apache/hadoop/hive/ql/optimizer/ test/results/clientpositive/tez/
Author: prasanthj
Date: Sun Dec 14 05:27:18 2014
New Revision: 1645400
URL: http://svn.apache.org/r1645400
Log:
HIVE-9090: Rename 'Tez File Merge Work' to smaller name (Prasanth Jayachandran reviewed by Vikram Dixit)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java?rev=1645400&r1=1645399&r2=1645400&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java Sun Dec 14 05:27:18 2014
@@ -702,7 +702,16 @@ public class TezJobMonitor {
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 += ".";
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=1645400&r1=1645399&r2=1645400&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java Sun Dec 14 05:27:18 2014
@@ -1283,7 +1283,7 @@ public final class GenMapRedUtils {
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 final class GenMapRedUtils {
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();
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out?rev=1645400&r1=1645399&r2=1645400&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge1.q.out Sun Dec 14 05:27:18 2014
@@ -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
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out?rev=1645400&r1=1645399&r2=1645400&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out Sun Dec 14 05:27:18 2014
@@ -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
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out?rev=1645400&r1=1645399&r2=1645400&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out Sun Dec 14 05:27:18 2014
@@ -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
Modified: hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out?rev=1645400&r1=1645399&r2=1645400&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out Sun Dec 14 05:27:18 2014
@@ -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