imback82 commented on a change in pull request #35173:
URL: https://github.com/apache/spark/pull/35173#discussion_r785624257
##########
File path:
sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala
##########
@@ -332,14 +332,24 @@ private[hive] class HiveClientImpl(
database: CatalogDatabase,
ignoreIfExists: Boolean): Unit = withHiveState {
val hiveDb = toHiveDatabase(database, Some(userName))
- shim.createDatabase(client, hiveDb, ignoreIfExists)
+ try {
+ shim.createDatabase(client, hiveDb, ignoreIfExists)
+ } catch {
+ case _: AlreadyExistsException =>
+ throw new DatabaseAlreadyExistsException(database.name)
+ }
}
override def dropDatabase(
name: String,
ignoreIfNotExists: Boolean,
cascade: Boolean): Unit = withHiveState {
- shim.dropDatabase(client, name, true, ignoreIfNotExists, cascade)
+ try {
+ shim.dropDatabase(client, name, true, ignoreIfNotExists, cascade)
+ } catch {
+ case e: HiveException if e.getMessage.contains(s"Database $name is not
empty") =>
+ throw QueryCompilationErrors.cannotDropNonemptyDatabaseError(name)
Review comment:
ditto
##########
File path:
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala
##########
@@ -120,11 +107,8 @@ private[spark] class HiveExternalCatalog(conf: SparkConf,
hadoopConf: Configurat
case i: InvocationTargetException => i.getCause
case o => o
}
- wrapException(e) match {
- case Some(wrapped) => throw wrapped
- case None => throw new AnalysisException(
- e.getClass.getCanonicalName + ": " + e.getMessage, cause = Some(e))
- }
Review comment:
This is reverting changes made in #35113.
##########
File path:
sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala
##########
@@ -332,14 +332,24 @@ private[hive] class HiveClientImpl(
database: CatalogDatabase,
ignoreIfExists: Boolean): Unit = withHiveState {
val hiveDb = toHiveDatabase(database, Some(userName))
- shim.createDatabase(client, hiveDb, ignoreIfExists)
+ try {
+ shim.createDatabase(client, hiveDb, ignoreIfExists)
+ } catch {
+ case _: AlreadyExistsException =>
+ throw new DatabaseAlreadyExistsException(database.name)
Review comment:
I am wondering if we need to do something similar as:
https://github.com/apache/spark/blob/17aaf8ed29e24516ca460d92b481a0b2f0545ddf/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala#L607-L612
@MaxGekk do you happen to know?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
