Author: gunther
Date: Wed Nov 20 22:45:43 2013
New Revision: 1543978
URL: http://svn.apache.org/r1543978
Log:
HIVE-5862: While running some queries on large data using tez, we OOM. (Vikram
Dixit K via Gunther Hagleitner)
Modified:
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
Modified:
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
URL:
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java?rev=1543978&r1=1543977&r2=1543978&view=diff
==============================================================================
---
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
(original)
+++
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
Wed Nov 20 22:45:43 2013
@@ -162,4 +162,11 @@ public abstract class AbstractMapJoinOpe
protected boolean hasAnyNulls(MapJoinKey key) {
return key.hasAnyNulls(nullsafes);
}
+
+ @Override
+ public void closeOp(boolean abort) throws HiveException {
+ super.closeOp(abort);
+ emptyList = null;
+ joinKeys = null;
+ }
}
Modified:
hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
URL:
http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java?rev=1543978&r1=1543977&r2=1543978&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
(original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
Wed Nov 20 22:45:43 2013
@@ -605,6 +605,8 @@ public abstract class Operator<T extends
// call the operator specific close routine
closeOp(abort);
+ reporter = null;
+
if (counterNameToEnum != null) {
incrCounter(numInputRowsCntr, inputRows);
incrCounter(numOutputRowsCntr, outputRows);