Skip to content
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

Jump to bottom

[LIVY-749] Remove explicitly adding datanucleus jars #280

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[LIVY-749] Remove explicitly adding datanucleus jars #280

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33c23ba
Merge pull request #1 from apache/master
shanyu Jul 31, 2019
d6d8261
Merge pull request #2 from apache/master
shanyu Aug 8, 2019
f1cca5a
Merge pull request #3 from apache/master
shanyu Feb 16, 2020
d147fc9
[LIVY-749] Remove explicitly adding datanucleus jars
shanyu Feb 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 0 additions & 31 deletions server/src/main/scala/org/apache/livy/server/interactive/InteractiveSession.scala
View file
Open in desktop
Expand Up @@ -197,35 +197,6 @@ object InteractiveSession extends Logging {
}
}

def datanucleusJars(livyConf: LivyConf, sparkMajorVersion: Int): Seq[String] = {
if (sys.env.getOrElse("LIVY_INTEGRATION_TEST", "false").toBoolean) {
// datanucleus jars has already been in classpath in integration test
Seq.empty
} else {
val sparkHome = livyConf.sparkHome().get
val libdir = sparkMajorVersion match {
case 2 =>
if (new File(sparkHome, "RELEASE").isFile) {
new File(sparkHome, "jars")
} else {
new File(sparkHome, "assembly/target/scala-2.11/jars")
}
case v =>
throw new RuntimeException(s"Unsupported Spark major version: $sparkMajorVersion")
}
val jars = if (!libdir.isDirectory) {
Seq.empty[String]
} else {
libdir.listFiles().filter(_.getName.startsWith("datanucleus-"))
.map(_.getAbsolutePath).toSeq
}
if (jars.isEmpty) {
warn("datanucleus jars can not be found")
}
jars
}
}

/**
* Look for hive-site.xml (for now just ignore spark.files defined in spark-defaults.conf)
* 1. First look for hive-site.xml in user request
Expand Down Expand Up @@ -290,12 +261,10 @@ object InteractiveSession extends Logging {
hiveSiteFile(sparkFiles, livyConf) match {
case (_, true) =>
debug("Enable HiveContext because hive-site.xml is found in user request.")
mergeConfList(datanucleusJars(livyConf, sparkMajorVersion), LivyConf.SPARK_JARS)
case (Some(file), false) =>
debug("Enable HiveContext because hive-site.xml is found under classpath, "
+ file.getAbsolutePath)
mergeConfList(List(file.getAbsolutePath), LivyConf.SPARK_FILES)
mergeConfList(datanucleusJars(livyConf, sparkMajorVersion), LivyConf.SPARK_JARS)
case (None, false) =>
warn("Enable HiveContext but no hive-site.xml found under" +
" classpath or user request.")
Expand Down