Repository: spark Updated Branches: refs/heads/branch-1.4 9e226e1c8 -> 788503a40
Update Documentation: leftsemi instead of semijoin should sync up with here? https://github.com/apache/spark/blob/119f45d61d7b48d376cca05e1b4f0c7fcf65bfa8/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala#L26 Author: LCY Vincent <[email protected]> Closes #5944 from vincentlaucy/master and squashes the following commits: fc0e454 [LCY Vincent] Update DataFrame.scala (cherry picked from commit a8ea09683acc071cd81b244e8d2b7d9638b1aced) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/788503a4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/788503a4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/788503a4 Branch: refs/heads/branch-1.4 Commit: 788503a40280af49ebea1cc36431cf465300b286 Parents: 9e226e1 Author: LCY Vincent <[email protected]> Authored: Mon May 11 14:48:10 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Mon May 11 14:48:18 2015 -0700 ---------------------------------------------------------------------- sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/788503a4/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala index 7947042..c92ca60 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala @@ -433,7 +433,7 @@ class DataFrame private[sql]( * * @param right Right side of the join. * @param joinExprs Join expression. - * @param joinType One of: `inner`, `outer`, `left_outer`, `right_outer`, `semijoin`. + * @param joinType One of: `inner`, `outer`, `left_outer`, `right_outer`, `leftsemi`. * @group dfops */ def join(right: DataFrame, joinExprs: Column, joinType: String): DataFrame = { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
