You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2014/11/27 04:34:43 UTC
svn commit: r1642018 - in /hive/branches/spark: itests/src/test/resources/
ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/
ql/src/test/results/clientpositive/spark/
Author: xuefu
Date: Thu Nov 27 03:34:42 2014
New Revision: 1642018
URL: http://svn.apache.org/r1642018
Log:
HIVE-8934: Investigate test failure on bucketmapjoin10.q and bucketmapjoin11.q [Spark Branch] (Chao via Xuefu)
Modified:
hive/branches/spark/itests/src/test/resources/testconfiguration.properties
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
Modified: hive/branches/spark/itests/src/test/resources/testconfiguration.properties
URL: http://svn.apache.org/viewvc/hive/branches/spark/itests/src/test/resources/testconfiguration.properties?rev=1642018&r1=1642017&r2=1642018&view=diff
==============================================================================
--- hive/branches/spark/itests/src/test/resources/testconfiguration.properties (original)
+++ hive/branches/spark/itests/src/test/resources/testconfiguration.properties Thu Nov 27 03:34:42 2014
@@ -524,6 +524,8 @@ spark.query.files=add_part_multiple.q, \
bucketmapjoin7.q, \
bucketmapjoin8.q, \
bucketmapjoin9.q, \
+ bucketmapjoin10.q, \
+ bucketmapjoin11.q, \
bucketmapjoin12.q, \
bucketmapjoin13.q, \
bucketmapjoin_negative.q, \
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java?rev=1642018&r1=1642017&r2=1642018&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinEagerRowContainer.java Thu Nov 27 03:34:42 2014
@@ -115,7 +115,6 @@ public class MapJoinEagerRowContainer
public void read(MapJoinObjectSerDeContext context, ObjectInputStream in, Writable container)
throws IOException, SerDeException {
- clearRows();
long numRows = in.readLong();
for (long rowIndex = 0L; rowIndex < numRows; rowIndex++) {
container.readFields(in);
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java?rev=1642018&r1=1642017&r2=1642018&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java Thu Nov 27 03:34:42 2014
@@ -135,7 +135,10 @@ public class MapJoinTableContainerSerDe
for (int keyIndex = 0; keyIndex < numKeys; keyIndex++) {
MapJoinKeyObject key = new MapJoinKeyObject();
key.read(keyContext, in, keyContainer);
- MapJoinEagerRowContainer values = new MapJoinEagerRowContainer();
+ if (tableContainer.get(key) == null) {
+ tableContainer.put(key, new MapJoinEagerRowContainer());
+ }
+ MapJoinEagerRowContainer values = (MapJoinEagerRowContainer) tableContainer.get(key);
values.read(valueContext, in, valueContainer);
tableContainer.put(key, values);
}
Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out?rev=1642018&r1=1642017&r2=1642018&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out Thu Nov 27 03:34:42 2014 differ
Modified: hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out?rev=1642018&r1=1642017&r2=1642018&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out (original) and hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out Thu Nov 27 03:34:42 2014 differ