You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2010/02/17 04:48:53 UTC
svn commit: r910813 - in /hadoop/hive/trunk: CHANGES.txt
ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java
Author: zshao
Date: Wed Feb 17 03:48:53 2010
New Revision: 910813
URL: http://svn.apache.org/viewvc?rev=910813&view=rev
Log:
HIVE-1174. Fix Job counter error if hive.merge.mapfiles equals true. (Yongqiang He via zshao)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=910813&r1=910812&r2=910813&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Feb 17 03:48:53 2010
@@ -182,6 +182,9 @@
deterministic
(Zheng Shao via Ning Zhang)
+ HIVE-1174. Fix Job counter error if "hive.merge.mapfiles" equals true.
+ (Yongqiang He via zshao)
+
Release 0.5.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java?rev=910813&r1=910812&r2=910813&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ConditionalTask.java Wed Feb 17 03:48:53 2010
@@ -85,7 +85,9 @@
console.printInfo(ExecDriver.getJobEndMsg(""
+ Utilities.randGen.nextInt())
+ ", job is filtered out (removed at runtime).");
- driverContext.incCurJobNo(1);
+ if(tsk.isMapRedTask()) {
+ driverContext.incCurJobNo(1);
+ }
if (tsk.getChildTasks() != null) {
for (Task<? extends Serializable> child : tsk.getChildTasks()) {
child.parentTasks.remove(tsk);