Author: rhbutani
Date: Mon Mar 10 17:56:16 2014
New Revision: 1576021
URL: http://svn.apache.org/r1576021
Log:
HIVE-6551 : group by after join with skew join optimization references invalid
task sometimes (Navis via Ashutosh Chauhan)
Modified:
hive/branches/branch-0.13/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin.q.out
hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
Modified:
hive/branches/branch-0.13/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java?rev=1576021&r1=1576020&r2=1576021&view=diff
==============================================================================
---
hive/branches/branch-0.13/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
(original)
+++
hive/branches/branch-0.13/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/GenMRSkewJoinProcessor.java
Mon Mar 10 17:56:16 2014
@@ -349,6 +349,7 @@ public final class GenMRSkewJoinProcesso
}
}
if (child != null) {
+ currTask.removeDependentTask(child);
listTasks.add(child);
}
ConditionalResolverSkewJoinCtx context =
Modified:
hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin.q.out?rev=1576021&r1=1576020&r2=1576021&view=diff
==============================================================================
--- hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin.q.out
(original)
+++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin.q.out
Mon Mar 10 17:56:16 2014
@@ -77,7 +77,7 @@ STAGE DEPENDENCIES:
Stage-1 is a root stage
Stage-5 depends on stages: Stage-1 , consists of Stage-4, Stage-0
Stage-4
- Stage-0 depends on stages: Stage-1, Stage-4
+ Stage-0 depends on stages: Stage-4
Stage-2 depends on stages: Stage-0
STAGE PLANS:
@@ -539,7 +539,7 @@ STAGE DEPENDENCIES:
Stage-1 is a root stage
Stage-5 depends on stages: Stage-1 , consists of Stage-4, Stage-2
Stage-4
- Stage-2 depends on stages: Stage-1, Stage-4
+ Stage-2 depends on stages: Stage-4
Stage-0 is a root stage
STAGE PLANS:
@@ -708,7 +708,7 @@ STAGE DEPENDENCIES:
Stage-1 is a root stage
Stage-5 depends on stages: Stage-1 , consists of Stage-4, Stage-2
Stage-4
- Stage-2 depends on stages: Stage-1, Stage-4
+ Stage-2 depends on stages: Stage-4
Stage-0 is a root stage
STAGE PLANS:
@@ -885,7 +885,7 @@ STAGE DEPENDENCIES:
Stage-1 is a root stage
Stage-7 depends on stages: Stage-1 , consists of Stage-5, Stage-6, Stage-2
Stage-5
- Stage-2 depends on stages: Stage-1, Stage-5, Stage-6
+ Stage-2 depends on stages: Stage-5, Stage-6
Stage-6
Stage-0 is a root stage
Modified:
hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin_noskew.q.out?rev=1576021&r1=1576020&r2=1576021&view=diff
==============================================================================
---
hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
(original)
+++
hive/branches/branch-0.13/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
Mon Mar 10 17:56:16 2014
@@ -8,7 +8,7 @@ STAGE DEPENDENCIES:
Stage-1 is a root stage
Stage-6 depends on stages: Stage-1 , consists of Stage-5, Stage-2
Stage-5
- Stage-2 depends on stages: Stage-1, Stage-5
+ Stage-2 depends on stages: Stage-5
Stage-0 depends on stages: Stage-2
Stage-8 depends on stages: Stage-0
Stage-3 depends on stages: Stage-8
