ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-2785][SQL] Remove assertions that throw when users try unsupported Hive commands.

Browse source 
Author: Michael Armbrust <michael@databricks.com>

Closes #1742 from marmbrus/asserts and squashes the following commits:

5182d54 [Michael Armbrust] Remove assertions that throw when users try unsupported Hive commands.
This commit is contained in:
Michael Armbrust 2014-08-02 16:48:07 -07:00
parent 158ad0bba9
commit 198df11f1a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
View file

@ -297,8 +297,11 @@ private[hive] object HiveQl {
matches.headOption
}
assert(remainingNodes.isEmpty,
s"Unhandled clauses: ${remainingNodes.map(dumpTree(_)).mkString("\n")}")
if (remainingNodes.nonEmpty) {
sys.error(
s"""Unhandled clauses: ${remainingNodes.map(dumpTree(_)).mkString("\n")}.
|You are likely trying to use an unsupported Hive feature."""".stripMargin)
}
clauses
}
@ -748,7 +751,10 @@ private[hive] object HiveQl {
case Token(allJoinTokens(joinToken),
relation1 ::
relation2 :: other) =>
assert(other.size <= 1, s"Unhandled join child $other")
if (!(other.size <= 1)) {
sys.error(s"Unsupported join operation: $other")
}
val joinType = joinToken match {
case "TOK_JOIN" => Inner
case "TOK_RIGHTOUTERJOIN" => RightOuter
@ -756,7 +762,6 @@ private[hive] object HiveQl {
case "TOK_FULLOUTERJOIN" => FullOuter
case "TOK_LEFTSEMIJOIN" => LeftSemi
}
assert(other.size <= 1, "Unhandled join clauses.")
Join(nodeToRelation(relation1),
nodeToRelation(relation2),
joinType,