[SPARK-16528][SQL] Fix NPE problem in HiveClientImpl #14200
Closed
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
Contributor
Author
|
test this please |
jacek-lewandowski
changed the title
There are some calls to methods or fields (getParameters, properties) which are then passed to Java/Scala collection converters. Unfortunately those fields can be null in some cases and then the conversions throws NPE. We fix it by wrapping calls to those fields and methods with option and then do the conversion.
jacek-lewandowski
force-pushed
the
SPARK-16528
branch
from
667abc0 to
49c5451
Compare
jacek-lewandowski
changed the title
Member
|
OK by me |
|
Test build #62310 has finished for PR 14200 at commit
|
|
Test build #62311 has finished for PR 14200 at commit
|
Contributor
|
LGTM - merging in master/2.0. |
asfgit
pushed a commit
that referenced
this pull request
Jul 14, 2016
## What changes were proposed in this pull request? There are some calls to methods or fields (getParameters, properties) which are then passed to Java/Scala collection converters. Unfortunately those fields can be null in some cases and then the conversions throws NPE. We fix it by wrapping calls to those fields and methods with option and then do the conversion. ## How was this patch tested? Manually tested with a custom Hive metastore. Author: Jacek Lewandowski <[email protected]> Closes #14200 from jacek-lewandowski/SPARK-16528. (cherry picked from commit 31ca741) Signed-off-by: Reynold Xin <[email protected]>
| description = d.getDescription, | ||
| locationUri = d.getLocationUri, | ||
| properties = d.getParameters.asScala.toMap) | ||
| properties = Option(d.getParameters).map(_.asScala.toMap).orNull) |
Contributor
There was a problem hiding this comment.
Is Map.empty a better default value? Or we should update the properties field in CatalogDatabase to indicate that it's nullable.
Contributor
Author
There was a problem hiding this comment.
Perhaps... however this would change the semantics which was out of the scope of this ticket.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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?
There are some calls to methods or fields (getParameters, properties) which are then passed to Java/Scala collection converters. Unfortunately those fields can be null in some cases and then the conversions throws NPE. We fix it by wrapping calls to those fields and methods with option and then do the conversion.
How was this patch tested?
Manually tested with a custom Hive metastore.