You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2015/04/23 04:34:42 UTC
[33/44] hive git commit: HIVE-9993 : Retrying task could use cached
bad operators [Spark Branch] (Jimmy Xiang via Szehon)
HIVE-9993 : Retrying task could use cached bad operators [Spark Branch] (Jimmy Xiang via Szehon)
git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1667392 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/198bb4b2
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/198bb4b2
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/198bb4b2
Branch: refs/heads/master
Commit: 198bb4b2a4ffc1dfc8e64bcc6bbba4460c43759f
Parents: 2c43270
Author: Szehon Ho <sz...@apache.org>
Authored: Tue Mar 17 20:24:56 2015 +0000
Committer: Szehon Ho <sz...@cloudera.com>
Committed: Wed Apr 22 19:33:52 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hive/ql/exec/spark/SparkMapRecordHandler.java | 1 +
.../apache/hadoop/hive/ql/exec/spark/SparkReduceRecordHandler.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/198bb4b2/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkMapRecordHandler.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkMapRecordHandler.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkMapRecordHandler.java
index c7c8146..d6e2853 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkMapRecordHandler.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkMapRecordHandler.java
@@ -137,6 +137,7 @@ public class SparkMapRecordHandler extends SparkRecordHandler {
}
} catch (Throwable e) {
abort = true;
+ Utilities.setMapWork(jc, null);
if (e instanceof OutOfMemoryError) {
// Don't create a new object if we are already out of memory
throw (OutOfMemoryError) e;
http://git-wip-us.apache.org/repos/asf/hive/blob/198bb4b2/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkReduceRecordHandler.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkReduceRecordHandler.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkReduceRecordHandler.java
index d4c1973..23d6a5d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkReduceRecordHandler.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkReduceRecordHandler.java
@@ -283,6 +283,7 @@ public class SparkReduceRecordHandler extends SparkRecordHandler {
} catch (Throwable e) {
abort = true;
+ Utilities.setReduceWork(jc, null);
if (e instanceof OutOfMemoryError) {
// Don't create a new object if we are already out of memory
throw (OutOfMemoryError) e;