Skip to content

[SPARK-37636][SQL][FOLLOW-UP] Move handling Hive exceptions for create/drop database to HiveClientImpl #35173

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

[SPARK-37636][SQL][FOLLOW-UP] Move handling Hive exceptions for create/drop database to HiveClientImpl #35173

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a6ff2
initial commit
imback82 Jan 11, 2022
302784b
Merge remote-tracking branch 'upstream/master' into drop_db_withClien…
imback82 Jan 17, 2022
f76bb06
Address PR comments
imback82 Jan 17, 2022
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
17 changes: 8 additions & 9 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,14 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
override def dropDatabase(
db: String,
ignoreIfNotExists: Boolean,
cascade: Boolean): Unit = withClient {
try {
client.dropDatabase(db, ignoreIfNotExists, cascade)
} catch {
case NonFatal(exception) =>
if (exception.getClass.getName.equals("org.apache.hadoop.hive.ql.metadata.HiveException")
&& exception.getMessage.contains(s"Database $db is not empty.")) {
throw QueryCompilationErrors.cannotDropNonemptyDatabaseError(db)
} else throw exception
cascade: Boolean): Unit = withClientWrappingException {
client.dropDatabase(db, ignoreIfNotExists, cascade)
} { exception =>
if (exception.getClass.getName.equals("org.apache.hadoop.hive.ql.metadata.HiveException")
&& exception.getMessage.contains(s"Database $db is not empty")) {
Copy link
Contributor Author

@imback82 imback82 Jan 11, 2022

Choose a reason for hiding this comment

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

@cloud-fan Note that I removed . when checking the message.
For Hive 0.12, the exception message is InvalidOperationException(message:Database temporary is not empty), whereas for Hive >0.12, the message is [InvalidOperationException(message:Database temporary is not empty. One or more tables exist.)]. So the wrapping wasn't working for Hive 0.12.

throw QueryCompilationErrors.cannotDropNonemptyDatabaseError(db)
} else {
None
}
}

Expand Down
10 changes: 10 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/client/VersionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,16 @@ class VersionsSuite extends SparkFunSuite with Logging {

test(s"$version: dropDatabase") {
assert(client.databaseExists("temporary"))
client.createTable(table("temporary", tableName = "tbl"), ignoreIfExists = false)
try {
client.dropDatabase("temporary", ignoreIfNotExists = false, cascade = false)
assert(false, "dropDatabase should throw HiveException")
} catch {
case ex: Throwable =>
assert(ex.getClass.getName.equals("org.apache.hadoop.hive.ql.metadata.HiveException"))
assert(ex.getMessage.contains("Database temporary is not empty"))
}

client.dropDatabase("temporary", ignoreIfNotExists = false, cascade = true)
assert(client.databaseExists("temporary") == false)
}
Expand Down