Skip to content

[SPARK-13180] Protect against SessionState being null when accessing HiveClientImpl#conf #11066

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

[SPARK-13180] Protect against SessionState being null when accessing HiveClientImpl#conf #11066

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
80f9b3f
Wrap HiveClientImpl#conf with withHiveState
tedyu Feb 3, 2016
2767d56
Revert
tedyu Feb 3, 2016
6ee7d98
Protect against SessionState being null when accessing HiveClientImpl…
tedyu Feb 3, 2016
aff16d6
Address Herman's review comment
tedyu Feb 4, 2016
438e2a3
Fix order of import
tedyu Feb 4, 2016
0a43c19
Drop incorrect import
tedyu Feb 4, 2016
f20a61f
Remove parenthesis
tedyu Feb 4, 2016
8b9e24c
Revert to v1
tedyu Feb 5, 2016
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
13 changes: 12 additions & 1 deletion sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,18 @@ private[hive] class HiveClientImpl(
}

/** Returns the configuration for the current session. */
def conf: HiveConf = SessionState.get().getConf
def conf: HiveConf = {
Copy link
Contributor

@hvanhovell hvanhovell Feb 4, 2016

Choose a reason for hiding this comment

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

This is an exact copy of https://github.com/apache/spark/blob/master/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala#L171-L182.

Can you refactor this?

var ss = SessionState.get()
// SessionState is lazy initialization, it can be null here
if (ss == null) {
val original = Thread.currentThread().getContextClassLoader
val conf = new HiveConf(classOf[SessionState])
conf.setClassLoader(original)
ss = new SessionState(conf)
SessionState.start(ss)
}
ss.getConf
}

override def getConf(key: String, defaultValue: String): String = {
conf.get(key, defaultValue)
Expand Down