Author: hashutosh
Date: Wed Nov 27 16:20:43 2013
New Revision: 1546089
URL: http://svn.apache.org/r1546089
Log:
HIVE-5886 : [Refactor] Remove unused class JobCloseFeedback (Ashutosh Chauhan
via Thejas Nair)
Removed:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JobCloseFeedBack.java
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java?rev=1546089&r1=1546088&r2=1546089&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
Wed Nov 27 16:20:43 2013
@@ -878,7 +878,7 @@ public class FileSinkOperator extends Te
}
@Override
- public void jobCloseOp(Configuration hconf, boolean success,
JobCloseFeedBack feedBack)
+ public void jobCloseOp(Configuration hconf, boolean success)
throws HiveException {
try {
if ((conf != null) && isNativeTable) {
@@ -893,7 +893,7 @@ public class FileSinkOperator extends Te
} catch (IOException e) {
throw new HiveException(e);
}
- super.jobCloseOp(hconf, success, feedBack);
+ super.jobCloseOp(hconf, success);
}
@Override
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java?rev=1546089&r1=1546088&r2=1546089&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java Wed
Nov 27 16:20:43 2013
@@ -144,7 +144,7 @@ public class JoinOperator extends Common
}
@Override
- public void jobCloseOp(Configuration hconf, boolean success,
JobCloseFeedBack feedBack)
+ public void jobCloseOp(Configuration hconf, boolean success)
throws HiveException {
int numAliases = conf.getExprs().size();
if (conf.getHandleSkewJoin()) {
@@ -181,7 +181,7 @@ public class JoinOperator extends Common
throw new HiveException(e);
}
}
- super.jobCloseOp(hconf, success, feedBack);
+ super.jobCloseOp(hconf, success);
}
private void moveUpFiles(String specPath, Configuration hconf, Log log)
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java?rev=1546089&r1=1546088&r2=1546089&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java Wed Nov
27 16:20:43 2013
@@ -571,7 +571,7 @@ public abstract class Operator<T extends
private boolean jobCloseDone = false;
// Operator specific logic goes here
- public void jobCloseOp(Configuration conf, boolean success, JobCloseFeedBack
feedBack)
+ public void jobCloseOp(Configuration conf, boolean success)
throws HiveException {
}
@@ -584,19 +584,19 @@ public abstract class Operator<T extends
* @param success
* whether the job was completed successfully or not
*/
- public void jobClose(Configuration conf, boolean success, JobCloseFeedBack
feedBack)
+ public void jobClose(Configuration conf, boolean success)
throws HiveException {
// JobClose has already been performed on this operator
if (jobCloseDone) {
return;
}
- jobCloseOp(conf, success, feedBack);
+ jobCloseOp(conf, success);
jobCloseDone = true;
if (childOperators != null) {
for (Operator<? extends OperatorDesc> op : childOperators) {
- op.jobClose(conf, success, feedBack);
+ op.jobClose(conf, success);
}
}
}
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java?rev=1546089&r1=1546088&r2=1546089&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
Wed Nov 27 16:20:43 2013
@@ -50,7 +50,6 @@ import org.apache.hadoop.hive.ql.ErrorMs
import org.apache.hadoop.hive.ql.QueryPlan;
import org.apache.hadoop.hive.ql.exec.FetchOperator;
import org.apache.hadoop.hive.ql.exec.HiveTotalOrderPartitioner;
-import org.apache.hadoop.hive.ql.exec.JobCloseFeedBack;
import org.apache.hadoop.hive.ql.exec.Operator;
import org.apache.hadoop.hive.ql.exec.OperatorUtils;
import org.apache.hadoop.hive.ql.exec.PartitionKeySampler;
@@ -466,14 +465,13 @@ public class ExecDriver extends Task<Map
// get the list of Dynamic partition paths
try {
if (rj != null) {
- JobCloseFeedBack feedBack = new JobCloseFeedBack();
if (mWork.getAliasToWork() != null) {
for (Operator<? extends OperatorDesc> op :
mWork.getAliasToWork().values()) {
- op.jobClose(job, success, feedBack);
+ op.jobClose(job, success);
}
}
if (rWork != null) {
- rWork.getReducer().jobClose(job, success, feedBack);
+ rWork.getReducer().jobClose(job, success);
}
}
} catch (Exception e) {