From 198df11f1a9f419f820f47eba0e9f2ab371a824b Mon Sep 17 00:00:00 2001
From: Michael Armbrust <michael@databricks.com>
Date: Sat, 2 Aug 2014 16:48:07 -0700
Subject: [PATCH] [SPARK-2785][SQL] Remove assertions that throw when users try
unsupported Hive commands.
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.
---
.../scala/org/apache/spark/sql/hive/HiveQl.scala | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
index 3d2eb1eefa..bc2fefafd5 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
@@ -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,
--
GitLab