You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/10/29 02:41:33 UTC
svn commit: r1635022 - in /hive/branches/branch-0.14:
itests/src/test/resources/testconfiguration.properties pom.xml
ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java
ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
Author: gunther
Date: Wed Oct 29 01:41:33 2014
New Revision: 1635022
URL: http://svn.apache.org/r1635022
Log:
HIVE-8614: Upgrade hive to use tez version 0.5.2-SNAPSHOT (Vikram Dixit K via Gunther Hagleitner)
Modified:
hive/branches/branch-0.14/itests/src/test/resources/testconfiguration.properties
hive/branches/branch-0.14/pom.xml
hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java
hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
Modified: hive/branches/branch-0.14/itests/src/test/resources/testconfiguration.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/itests/src/test/resources/testconfiguration.properties?rev=1635022&r1=1635021&r2=1635022&view=diff
==============================================================================
--- hive/branches/branch-0.14/itests/src/test/resources/testconfiguration.properties (original)
+++ hive/branches/branch-0.14/itests/src/test/resources/testconfiguration.properties Wed Oct 29 01:41:33 2014
@@ -223,6 +223,7 @@ minitez.query.files.shared=alter_merge_2
auto_sortmerge_join_2.q,\
auto_sortmerge_join_3.q,\
auto_sortmerge_join_4.q,\
+ auto_sortmerge_join_5.q,\
auto_sortmerge_join_7.q,\
auto_sortmerge_join_8.q,\
auto_sortmerge_join_9.q
Modified: hive/branches/branch-0.14/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/pom.xml?rev=1635022&r1=1635021&r2=1635022&view=diff
==============================================================================
--- hive/branches/branch-0.14/pom.xml (original)
+++ hive/branches/branch-0.14/pom.xml Wed Oct 29 01:41:33 2014
@@ -151,7 +151,7 @@
<stax.version>1.0.1</stax.version>
<slf4j.version>1.7.5</slf4j.version>
<ST4.version>4.0.4</ST4.version>
- <tez.version>0.5.1</tez.version>
+ <tez.version>0.5.2-SNAPSHOT</tez.version>
<super-csv.version>2.2.0</super-csv.version>
<tempus-fugit.version>1.1</tempus-fugit.version>
<snappy.version>0.2</snappy.version>
Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java?rev=1635022&r1=1635021&r2=1635022&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java Wed Oct 29 01:41:33 2014
@@ -306,9 +306,7 @@ public class CommonMergeJoinOperator ext
public void closeOp(boolean abort) throws HiveException {
joinFinalLeftData();
- if (!((joinKeysObjectInspectors != null) && (joinKeysObjectInspectors[alias] != null))) {
- super.closeOp(abort);
- }
+ super.closeOp(abort);
// clean up
for (int pos = 0; pos < order.length; pos++) {
Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out?rev=1635022&r1=1635021&r2=1635022&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out Wed Oct 29 01:41:33 2014 differ