hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From li...@apache.org
Subject svn commit: r1665227 - in /hive/branches/spark: ./ ql/src/java/org/apache/hadoop/hive/ql/exec/SkewJoinHandler.java
Date Mon, 09 Mar 2015 13:14:03 GMT
Author: lirui
Date: Mon Mar  9 13:14:03 2015
New Revision: 1665227

URL: http://svn.apache.org/r1665227
Log:
HIVE-9855: Runtime skew join doesn't work when skewed data only exists in big table (Rui reviewed
by Xuefu) merged from trunk

Modified:
    hive/branches/spark/   (props changed)
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/SkewJoinHandler.java

Propchange: hive/branches/spark/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  9 13:14:03 2015
@@ -3,4 +3,4 @@
 /hive/branches/cbo:1605012-1627125
 /hive/branches/tez:1494760-1622766
 /hive/branches/vectorization:1466908-1527856
-/hive/trunk:1608589-1662766
+/hive/trunk:1608589-1662766,1664202

Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/SkewJoinHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/SkewJoinHandler.java?rev=1665227&r1=1665226&r2=1665227&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/SkewJoinHandler.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/SkewJoinHandler.java Mon
Mar  9 13:14:03 2015
@@ -317,14 +317,11 @@ public class SkewJoinHandler {
     Path outPath = getOperatorOutputPath(specPath);
     Path finalPath = getOperatorFinalPath(specPath);
     FileSystem fs = outPath.getFileSystem(hconf);
-    try {
-      if (!fs.rename(outPath, finalPath)) {
-        throw new IOException("Unable to rename output to: " + finalPath);
-      }
-    } catch (FileNotFoundException e) {
-      if (!ignoreNonExisting) {
-        throw e;
-      }
+    if (ignoreNonExisting && !fs.exists(outPath)) {
+      return;
+    }
+    if (!fs.rename(outPath, finalPath)) {
+      throw new IOException("Unable to rename output to: " + finalPath);
     }
   }
 



Mime
View raw message