You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/06/08 18:41:11 UTC
spark git commit: [MINOR] change new Exception to
IllegalArgumentException
Repository: spark
Updated Branches:
refs/heads/master 149d1b28e -> 49f19b954
[MINOR] change new Exception to IllegalArgumentException
Author: Daoyuan Wang <da...@intel.com>
Closes #6434 from adrian-wang/joinerr and squashes the following commits:
ee1b64f [Daoyuan Wang] break line
f7c53e9 [Daoyuan Wang] to IllegalArgumentException
f8dea2d [Daoyuan Wang] sys.err to IllegalStateException
be82259 [Daoyuan Wang] change new exception to sys.err
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/49f19b95
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/49f19b95
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/49f19b95
Branch: refs/heads/master
Commit: 49f19b954b32d57d03ca0e25ea4205d01e794d48
Parents: 149d1b2
Author: Daoyuan Wang <da...@intel.com>
Authored: Mon Jun 8 09:41:06 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Jun 8 09:41:06 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/execution/joins/HashOuterJoin.scala | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/49f19b95/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala
index 4557439..c21a453 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala
@@ -48,7 +48,8 @@ case class HashOuterJoin(
case LeftOuter => left.outputPartitioning
case RightOuter => right.outputPartitioning
case FullOuter => UnknownPartitioning(left.outputPartitioning.numPartitions)
- case x => throw new Exception(s"HashOuterJoin should not take $x as the JoinType")
+ case x =>
+ throw new IllegalArgumentException(s"HashOuterJoin should not take $x as the JoinType")
}
override def requiredChildDistribution: Seq[ClusteredDistribution] =
@@ -63,7 +64,7 @@ case class HashOuterJoin(
case FullOuter =>
left.output.map(_.withNullability(true)) ++ right.output.map(_.withNullability(true))
case x =>
- throw new Exception(s"HashOuterJoin should not take $x as the JoinType")
+ throw new IllegalArgumentException(s"HashOuterJoin should not take $x as the JoinType")
}
}
@@ -216,7 +217,8 @@ case class HashOuterJoin(
rightHashTable.getOrElse(key, EMPTY_LIST), joinedRow)
}
- case x => throw new Exception(s"HashOuterJoin should not take $x as the JoinType")
+ case x =>
+ throw new IllegalArgumentException(s"HashOuterJoin 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