Author: szehon
Date: Sat Nov 22 01:40:25 2014
New Revision: 1641023
URL: http://svn.apache.org/r1641023
Log:
HIVE-8942 : Investigate test failure on skewjoin.q [Spark Branch] (Chao Sun via
Szehon)
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkReduceSinkMapJoinProc.java
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkReduceSinkMapJoinProc.java
URL:
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkReduceSinkMapJoinProc.java?rev=1641023&r1=1641022&r2=1641023&view=diff
==============================================================================
---
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkReduceSinkMapJoinProc.java
(original)
+++
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkReduceSinkMapJoinProc.java
Sat Nov 22 01:40:25 2014
@@ -276,6 +276,10 @@ public class SparkReduceSinkMapJoinProc
MapJoinDesc mjDesc = mapJoinOp.getConf();
HiveConf conf = context.conf;
+ // Unlike in MR, we may call this method multiple times, for each
+ // small table HTS. But, since it's idempotent, it should be OK.
+ mjDesc.resetOrder();
+
float hashtableMemoryUsage;
if (hasGroupBy(mapJoinOp, context)) {
hashtableMemoryUsage = conf.getFloatVar(
