[SPARK-37636][SQL][FOLLOW-UP] Move handling Hive exceptions for create/drop database to HiveClientImpl #35173
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
imback82
commented
Jan 11, 2022
| 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")) { |
Contributor
Author
There was a problem hiding this comment.
@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.
cloud-fan
reviewed
Jan 12, 2022
sql/hive/src/test/scala/org/apache/spark/sql/hive/client/VersionsSuite.scala
Outdated
Show resolved
Hide resolved
imback82
changed the title
imback82
commented
Jan 17, 2022
| case Some(wrapped) => throw wrapped | ||
| case None => throw new AnalysisException( | ||
| e.getClass.getCanonicalName + ": " + e.getMessage, cause = Some(e)) | ||
| } |
Contributor
Author
There was a problem hiding this comment.
This is reverting changes made in #35113.
| shim.createDatabase(client, hiveDb, ignoreIfExists) | ||
| } catch { | ||
| case _: AlreadyExistsException => | ||
| throw new DatabaseAlreadyExistsException(database.name) |
Contributor
Author
There was a problem hiding this comment.
| 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) |
cloud-fan
approved these changes
Jan 17, 2022
Contributor
Author
|
@cloud-fan is this ready to be merged? |
Contributor
|
thanks, merging to master! |
senthh
pushed a commit
to senthh/spark-1
that referenced
this pull request
Feb 3, 2022
…e/drop database to HiveClientImpl ### What changes were proposed in this pull request? apache#35113 introduced `HiveExternalCatalog.withClientWrappingException` to to wrap a Hive exception to a Spark exception. However, there was a limitation of testing it against different Hive versions as outlined in apache#35173 (comment). This PR proposes to revert `HiveExternalCatalog.withClientWrappingException` and move wrapping logic to `HiveClientImpl`. ### Why are the changes needed? 1. To make testing against different Hive versions better. 2. For Hive 0.12, the wrapping logic was not working correctly for `dropDatabase` because the message was not matching. ### Does this PR introduce _any_ user-facing change? Yes, for Hive 0.12, the exception message will now be consistent with other versions. Before: `InvalidOperationException(message:Database db is not empty)` After: `Cannot drop a non-empty database: db. Use CASCADE option to drop a non-empty database` ### How was this patch tested? Added a new test coverage. Closes apache#35173 from imback82/drop_db_withClientWrappingException. Authored-by: Terry Kim <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
#35113 introduced
HiveExternalCatalog.withClientWrappingExceptionto to wrap a Hive exception to a Spark exception. However, there was a limitation of testing it against different Hive versions as outlined in #35173 (comment). This PR proposes to revertHiveExternalCatalog.withClientWrappingExceptionand move wrapping logic toHiveClientImpl.Why are the changes needed?
dropDatabasebecause the message was not matching.Does this PR introduce any user-facing change?
Yes, for Hive 0.12, the exception message will now be consistent with other versions.
Before:
InvalidOperationException(message:Database db is not empty)After:
Cannot drop a non-empty database: db. Use CASCADE option to drop a non-empty databaseHow was this patch tested?
Added a new test coverage.