Skip to content

[SPARK-22686][SQL] DROP TABLE IF EXISTS should not show AnalysisException #19888

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
dongjoon-hyun wants to merge 3 commits into from
Closed

[SPARK-22686][SQL] DROP TABLE IF EXISTS should not show AnalysisException #19888

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b113a2
[SPARK-22686][SQL] DROP TABLE IF EXISTS should not throw AnalysisExce…
dongjoon-hyun Dec 5, 2017
b2b4d54
Address comments
dongjoon-hyun Dec 5, 2017
4b6041b
Handle view and throw exception correctly.
dongjoon-hyun Dec 5, 2017
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
16 changes: 9 additions & 7 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,16 @@ case class DropTableCommand(
case _ =>
}
}
try {
sparkSession.sharedState.cacheManager.uncacheQuery(sparkSession.table(tableName))
} catch {
case _: NoSuchTableException if ifExists =>
case NonFatal(e) => log.warn(e.toString, e)

if (!ifExists || catalog.tableExists(tableName)) {

@cloud-fan cloud-fan Dec 5, 2017 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel it's more readable to write

if (catalog.tableExists(tableName)) {
  ... do the drop
} else if (ifExists) {
  // do nothing
} else {
  log.warn("The table to drop does not exist: " +tableName)
}

@cloud-fan cloud-fan Dec 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also update the UNCACHE TABLE, cc @gatorsmile

@dongjoon-hyun dongjoon-hyun Dec 5, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll update soon.

try {
sparkSession.sharedState.cacheManager.uncacheQuery(sparkSession.table(tableName))
} catch {
case NonFatal(e) => log.warn(e.toString, e)
}
catalog.refreshTable(tableName)
catalog.dropTable(tableName, ifExists, purge)
}
catalog.refreshTable(tableName)
catalog.dropTable(tableName, ifExists, purge)
Seq.empty[Row]
}
}
Expand Down