aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2015-04-02 16:01:03 -0700
committerMichael Armbrust <michael@databricks.com>2015-04-02 16:01:03 -0700
commit4214e50fc32de1478584d8edfa3a35576c12c025 (patch)
tree5c463803bb849711f0673191b9a73de5b6cd4b3d
parente3202aa2e9bd140effbcf2a7a02b90cb077e760b (diff)
downloadspark-4214e50fc32de1478584d8edfa3a35576c12c025.tar.gz
spark-4214e50fc32de1478584d8edfa3a35576c12c025.tar.bz2
spark-4214e50fc32de1478584d8edfa3a35576c12c025.zip
[SQL] Throw UnsupportedOperationException instead of NotImplementedError
NotImplementedError in scala 2.10 is a fatal exception, which is not very nice to throw when not actually fatal. Author: Michael Armbrust <michael@databricks.com> Closes #5315 from marmbrus/throwUnsupported and squashes the following commits: c29e03b [Michael Armbrust] [SQL] Throw UnsupportedOperationException instead of NotImplementedError 052e05b [Michael Armbrust] [SQL] Throw UnsupportedOperationException instead of NotImplementedError
-rw-r--r--sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala5
-rw-r--r--sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala2
2 files changed, 3 insertions, 4 deletions
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
index 6bb1c47dba..46991fbd68 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
@@ -184,9 +184,8 @@ class HiveContext(sc: SparkContext) extends SQLContext(sc) {
catalog.client.alterTable(tableFullName, new Table(hiveTTable))
}
case otherRelation =>
- throw new NotImplementedError(
- s"Analyze has only implemented for Hive tables, " +
- s"but $tableName is a ${otherRelation.nodeName}")
+ throw new UnsupportedOperationException(
+ s"Analyze only works for Hive tables, but $tableName is a ${otherRelation.nodeName}")
}
}
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala
index 1e05a024b8..ccd0e5aa51 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/StatisticsSuite.scala
@@ -120,7 +120,7 @@ class StatisticsSuite extends QueryTest with BeforeAndAfterAll {
// Try to analyze a temp table
sql("""SELECT * FROM src""").registerTempTable("tempTable")
- intercept[NotImplementedError] {
+ intercept[UnsupportedOperationException] {
analyze("tempTable")
}
catalog.unregisterTable(Seq("tempTable"))