Repository: spark Updated Branches: refs/heads/branch-1.4 788503a40 -> 0ff34f804
[SQL] Show better error messages for incorrect join types in DataFrames. As a follow-up to https://github.com/apache/spark/pull/5944 Author: Reynold Xin <[email protected]> Closes #6064 from rxin/jointype-better-error and squashes the following commits: 7629bf7 [Reynold Xin] [SQL] Show better error messages for incorrect join types in DataFrames. (cherry picked from commit 4f4dbb030c208caba18f314a1ef1751696627d26) 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/0ff34f80 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0ff34f80 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0ff34f80 Branch: refs/heads/branch-1.4 Commit: 0ff34f804fbfce925715abc06beab8967a841baa Parents: 788503a Author: Reynold Xin <[email protected]> Authored: Mon May 11 17:02:11 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Mon May 11 17:02:17 2015 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/catalyst/plans/joinTypes.scala | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0ff34f80/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala index 5dc0539..77dec7c 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala @@ -24,6 +24,16 @@ object JoinType { case "leftouter" | "left" => LeftOuter case "rightouter" | "right" => RightOuter case "leftsemi" => LeftSemi + case _ => + val supported = Seq( + "inner", + "outer", "full", "fullouter", + "leftouter", "left", + "rightouter", "right", + "leftsemi") + + throw new IllegalArgumentException(s"Unsupported join type '$typ'. " + + "Supported join types include: " + supported.mkString("'", "', '", "'") + ".") } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
