From c82924d564c07e6e6f635b9e263994dedf06268a Mon Sep 17 00:00:00 2001
From: thomastechs <thomas.sebastian@tcs.com>
Date: Sun, 3 Jan 2016 11:09:30 -0800
Subject: [PATCH] [SPARK-12533][SQL] hiveContext.table() throws the wrong
exception
Avoiding the the No such table exception and throwing analysis exception as per the bug: SPARK-12533
Author: thomastechs <thomas.sebastian@tcs.com>
Closes #10529 from thomastechs/topic-branch.
---
.../org/apache/spark/sql/catalyst/analysis/Catalog.scala | 2 +-
.../test/scala/org/apache/spark/sql/CachedTableSuite.scala | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala
index 8f4ce74a2e..3b775c3ca8 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala
@@ -104,7 +104,7 @@ class SimpleCatalog(val conf: CatalystConf) extends Catalog {
val tableName = getTableName(tableIdent)
val table = tables.get(tableName)
if (table == null) {
- throw new NoSuchTableException
+ throw new AnalysisException("Table not found: " + tableName)
}
val tableWithQualifiers = Subquery(tableName, table)
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala
index d86df4cfb9..6b735bcf16 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/CachedTableSuite.scala
@@ -17,7 +17,7 @@
package org.apache.spark.sql
-import org.apache.spark.sql.catalyst.analysis.NoSuchTableException
+
import org.apache.spark.sql.execution.Exchange
import org.apache.spark.sql.execution.PhysicalRDD
@@ -289,7 +289,7 @@ class CachedTableSuite extends QueryTest with SQLTestUtils with SharedSQLContext
testData.select('key).registerTempTable("t1")
sqlContext.table("t1")
sqlContext.dropTempTable("t1")
- intercept[NoSuchTableException](sqlContext.table("t1"))
+ intercept[AnalysisException](sqlContext.table("t1"))
}
test("Drops cached temporary table") {
@@ -301,7 +301,7 @@ class CachedTableSuite extends QueryTest with SQLTestUtils with SharedSQLContext
assert(sqlContext.isCached("t2"))
sqlContext.dropTempTable("t1")
- intercept[NoSuchTableException](sqlContext.table("t1"))
+ intercept[AnalysisException](sqlContext.table("t1"))
assert(!sqlContext.isCached("t2"))
}
--
GitLab