Skip to content

[SPARK-22954][SQL] Fix the exception thrown by Analyze command on temporary views to throw AnalysisException #20177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

[SPARK-22954][SQL] Fix the exception thrown by Analyze command on temporary views to throw AnalysisException #20177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e92e6c
[SPARK-22954][SQL] Fixed the problem where temporary views were not l…
su225 Jan 5, 2018
4de6ac8
[SPARK-22954][SQL] Fixed database name lookup so that None is returne…
su225 Jan 6, 2018
98b8711
[SPARK-22954][SQL] Fixed the test to test for AnalysisException inste…
su225 Jan 7, 2018
0e873e5
[SPARK-22954][SQL] Fix the problem for other versions of analyze comm…
su225 Jan 21, 2018
77e4d6d
[SPARK-22954][SQL] Reorganize imports to satisfy Scalastyle.
su225 Jan 21, 2018
4d4e3fe
[SPARK-22954][SQL] Removed some extraneous whitespace.
su225 Jan 21, 2018
4c86456
[SPARK-22954][SQL] Add test case to make sure that calling analyze pa…
su225 Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/command/AnalyzeColumnCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ case class AnalyzeColumnCommand(

override def run(sparkSession: SparkSession): Seq[Row] = {
val sessionState = sparkSession.sessionState
val db = tableIdent.database.getOrElse(sessionState.catalog.getCurrentDatabase)
val tableIdentWithDB = TableIdentifier(tableIdent.table, Some(db))
val tableMeta = sessionState.catalog.getTableMetadata(tableIdentWithDB)
val db = tableIdent.database
val tableIdentWithDB = TableIdentifier(tableIdent.table, db)
val tableMeta = sessionState.catalog.getTempViewOrPermanentTableMetadata(tableIdentWithDB)
if (tableMeta.tableType == CatalogTableType.VIEW) {
throw new AnalysisException("ANALYZE TABLE is not supported on views.")
}
Expand Down
9 changes: 5 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/command/AnalyzePartitionCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ case class AnalyzePartitionCommand(

override def run(sparkSession: SparkSession): Seq[Row] = {
val sessionState = sparkSession.sessionState
val db = tableIdent.database.getOrElse(sessionState.catalog.getCurrentDatabase)
val tableIdentWithDB = TableIdentifier(tableIdent.table, Some(db))
val tableMeta = sessionState.catalog.getTableMetadata(tableIdentWithDB)
val db = tableIdent.database
val tableIdentWithDB = TableIdentifier(tableIdent.table, db)
val tableMeta = sessionState.catalog.getTempViewOrPermanentTableMetadata(tableIdentWithDB)
if (tableMeta.tableType == CatalogTableType.VIEW) {
throw new AnalysisException("ANALYZE TABLE is not supported on views.")
}
Expand All @@ -88,7 +88,8 @@ case class AnalyzePartitionCommand(

if (partitions.isEmpty) {
if (partitionValueSpec.isDefined) {
throw new NoSuchPartitionException(db, tableIdent.table, partitionValueSpec.get)
throw new NoSuchPartitionException(db.getOrElse(sessionState.catalog.getCurrentDatabase),
tableIdent.table, partitionValueSpec.get)
} else {
// the user requested to analyze all partitions for a table which has no partitions
// return normally, since there is nothing to do
Expand Down
6 changes: 3 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/command/AnalyzeTableCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ case class AnalyzeTableCommand(

override def run(sparkSession: SparkSession): Seq[Row] = {
val sessionState = sparkSession.sessionState
val db = tableIdent.database.getOrElse(sessionState.catalog.getCurrentDatabase)
val tableIdentWithDB = TableIdentifier(tableIdent.table, Some(db))
val tableMeta = sessionState.catalog.getTableMetadata(tableIdentWithDB)
val db = tableIdent.database
val tableIdentWithDB = TableIdentifier(tableIdent.table, db)
val tableMeta = sessionState.catalog.getTempViewOrPermanentTableMetadata(tableIdentWithDB)
if (tableMeta.tableType == CatalogTableType.VIEW) {
throw new AnalysisException("ANALYZE TABLE is not supported on views.")
}
Expand Down
24 changes: 21 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.sql.execution

import org.apache.spark.sql._
import org.apache.spark.sql.{AnalysisException, _}
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.NoSuchTableException
import org.apache.spark.sql.test.{SharedSQLContext, SQLTestUtils}
Expand Down Expand Up @@ -154,8 +154,26 @@ abstract class SQLViewSuite extends QueryTest with SQLTestUtils {
assertNoSuchTable(s"TRUNCATE TABLE $viewName")
assertNoSuchTable(s"SHOW CREATE TABLE $viewName")
assertNoSuchTable(s"SHOW PARTITIONS $viewName")
assertNoSuchTable(s"ANALYZE TABLE $viewName COMPUTE STATISTICS")
assertNoSuchTable(s"ANALYZE TABLE $viewName COMPUTE STATISTICS FOR COLUMNS id")
}
}

test("SPARK-22954 - Issue AnalysisException when ANALYZE is run on view") {
val viewName = "testView"
val analyzeNotSupportedOnViewsMsg = "ANALYZE TABLE is not supported on views."
withTempView(viewName) {
spark.range(10).createTempView(viewName)

assert(intercept[AnalysisException] {
sql(s"ANALYZE TABLE $viewName COMPUTE STATISTICS")
}.getMessage.contains(analyzeNotSupportedOnViewsMsg))

assert(intercept[AnalysisException] {
sql(s"ANALYZE TABLE $viewName COMPUTE STATISTICS FOR COLUMNS id")
}.getMessage.contains(analyzeNotSupportedOnViewsMsg))

assert(intercept[AnalysisException] {
sql(s"ANALYZE TABLE $viewName PARTITION (a) COMPUTE STATISTICS")
}.getMessage.contains(analyzeNotSupportedOnViewsMsg))
}
}

Expand Down