You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by hv...@apache.org on 2017/03/21 13:38:34 UTC
spark git commit: [SPARK-19994][HOTFIX][BRANCH-2.0] Change InnerLike
to Inner
Repository: spark
Updated Branches:
refs/heads/branch-2.0 3983b3dcd -> 72a0ee3ab
[SPARK-19994][HOTFIX][BRANCH-2.0] Change InnerLike to Inner
## What changes were proposed in this pull request?
InnerLike => Inner
## How was this patch tested?
Existing tests.
Author: wangzhenhua <wa...@huawei.com>
Closes #17376 from wzhfy/hotFixWrongOrdering.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/72a0ee3a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/72a0ee3a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/72a0ee3a
Branch: refs/heads/branch-2.0
Commit: 72a0ee3ab420a81903d63cea0a9584a534849dba
Parents: 3983b3d
Author: wangzhenhua <wa...@huawei.com>
Authored: Tue Mar 21 14:38:28 2017 +0100
Committer: Herman van Hovell <hv...@databricks.com>
Committed: Tue Mar 21 14:38:28 2017 +0100
----------------------------------------------------------------------
.../org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/72a0ee3a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala
index 50fd8f3..7a7340d 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoinExec.scala
@@ -84,7 +84,7 @@ case class SortMergeJoinExec(
case RightOuter => requiredOrders(rightKeys)
// There are null rows in both streams, so there is no order.
case FullOuter => Nil
- case _: InnerLike | LeftExistence(_) => requiredOrders(leftKeys)
+ case Inner | LeftExistence(_) => requiredOrders(leftKeys)
case x =>
throw new IllegalArgumentException(
s"${getClass.getSimpleName} should not take $x as the JoinType")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org