From c833cae12922465d7e9789b98fba19324256efe2 Mon Sep 17 00:00:00 2001 From: thomastechs Date: Thu, 31 Dec 2015 02:51:22 +0530 Subject: [PATCH 1/7] Update Catalog.scala Avoiding the the No such table exception and throwing analysis exception as per the bug: SPARK-12533 --- .../scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8f4ce74a2ea3..5279b8abdd96 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("The table named "+tableName+" was not found.") } val tableWithQualifiers = Subquery(tableName, table) From 4463a950e6f2b857314cdfd1871449a92ea652af Mon Sep 17 00:00:00 2001 From: thomastechs Date: Thu, 31 Dec 2015 16:33:33 +0530 Subject: [PATCH 2/7] Update Catalog.scala- [SPARK-12533] Incorporating the review comments --- .../scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5279b8abdd96..d0246188657a 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 AnalysisException("The table named "+tableName+" was not found.") + throw new AnalysisException("The table named " + tableName + " was not found.") } val tableWithQualifiers = Subquery(tableName, table) From 9e8797ef37151f4eeede6534d0e77389ed4aa19f Mon Sep 17 00:00:00 2001 From: thomastechs Date: Fri, 1 Jan 2016 21:53:24 +0530 Subject: [PATCH 3/7] Updated Catalog.scala with standard message AnalysisException is updated as per the bug fic mentions SPARK-12533 --- .../scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d0246188657a..3b775c3ca87b 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 AnalysisException("The table named " + tableName + " was not found.") + throw new AnalysisException("Table not found: " + tableName) } val tableWithQualifiers = Subquery(tableName, table) From 66399565ad7cf71fcae4744dc157e6bc149b9da3 Mon Sep 17 00:00:00 2001 From: thomastechs Date: Fri, 1 Jan 2016 21:59:54 +0530 Subject: [PATCH 4/7] Updated Analyzer.scala with the AnalysisException As the exception type returned from the lookupRelation method is changed to AnalysisException, it is updated here also. --- .../scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala index c396546b4c00..17350eef0328 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala @@ -302,7 +302,7 @@ class Analyzer( try { catalog.lookupRelation(u.tableIdentifier, u.alias) } catch { - case _: NoSuchTableException => + case _: AnalysisException => u.failAnalysis(s"Table not found: ${u.tableName}") } } From 76a9623fed32eeb3c4cd34e6a7ad54ffefca1b69 Mon Sep 17 00:00:00 2001 From: thomastechs Date: Fri, 1 Jan 2016 22:05:47 +0530 Subject: [PATCH 5/7] [SPARK-12438][SQL]Updating CachedTableSuite.scala Updating the test case methods corresponding the bug fix [SPARK-12438] --- .../test/scala/org/apache/spark/sql/CachedTableSuite.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d86df4cfb9b4..d9003ddab53a 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.AnalysisException 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")) } From f74a9a227e5667b6ffec8f347eec369e1246b1f3 Mon Sep 17 00:00:00 2001 From: thomastechs Date: Sat, 2 Jan 2016 22:26:24 +0530 Subject: [PATCH 6/7] [SPARK-12533]Updated CachedTableSuite.scala Removed the AnalysisException class import command, as it throws (hidden) warning. The Analysis Exception is already available in this package --- .../src/test/scala/org/apache/spark/sql/CachedTableSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d9003ddab53a..6b735bcf1610 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.AnalysisException + import org.apache.spark.sql.execution.Exchange import org.apache.spark.sql.execution.PhysicalRDD From f75c44e132bea250ac3c35e3a69bc2fa16d49eb1 Mon Sep 17 00:00:00 2001 From: thomastechs Date: Sat, 2 Jan 2016 22:32:41 +0530 Subject: [PATCH 7/7] [SPARK-12533]Updated Analyzer.scala Reverting to change to previous state, because the relevant test cases are to be triggered. --- .../scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala index 17350eef0328..c396546b4c00 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala @@ -302,7 +302,7 @@ class Analyzer( try { catalog.lookupRelation(u.tableIdentifier, u.alias) } catch { - case _: AnalysisException => + case _: NoSuchTableException => u.failAnalysis(s"Table not found: ${u.tableName}") } }