You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2017/11/21 23:56:49 UTC
[06/51] [abbrv] hive git commit: HIVE-18050 : LlapServiceDriver shoud
split HIVE_AUX_JARS_PATH by ':' instead of ', ' (Aegeaner,
reviewed by Sergey Shelukhin)
HIVE-18050 : LlapServiceDriver shoud split HIVE_AUX_JARS_PATH by ':' instead of ',' (Aegeaner, reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/179e32f0
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/179e32f0
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/179e32f0
Branch: refs/heads/standalone-metastore
Commit: 179e32f0bd1ea915bb49aec389cba698af92150b
Parents: a9e9d60
Author: sergey <se...@apache.org>
Authored: Tue Nov 21 13:48:58 2017 -0800
Committer: sergey <se...@apache.org>
Committed: Tue Nov 21 13:48:58 2017 -0800
----------------------------------------------------------------------
.../apache/hadoop/hive/llap/cli/LlapServiceDriver.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/179e32f0/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
index 5090be2..4704351 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/cli/LlapServiceDriver.java
@@ -452,22 +452,22 @@ public class LlapServiceDriver {
if (options.getIsHiveAux()) {
// Note: we don't add ADDED jars, RELOADABLE jars, etc. That is by design; there are too many ways
// to add jars in Hive, some of which are session/etc. specific. Env + conf + arg should be enough.
- addAuxJarsToSet(auxJars, conf.getAuxJars());
- addAuxJarsToSet(auxJars, System.getenv("HIVE_AUX_JARS_PATH"));
+ addAuxJarsToSet(auxJars, conf.getAuxJars(), ",");
+ addAuxJarsToSet(auxJars, System.getenv("HIVE_AUX_JARS_PATH"), ":");
LOG.info("Adding the following aux jars from the environment and configs: " + auxJars);
}
- addAuxJarsToSet(auxJars, options.getAuxJars());
+ addAuxJarsToSet(auxJars, options.getAuxJars(), ",");
for (String jarPath : auxJars) {
lfs.copyFromLocalFile(new Path(jarPath), libDir);
}
return null;
}
- private void addAuxJarsToSet(HashSet<String> auxJarSet, String auxJars) {
+ private void addAuxJarsToSet(HashSet<String> auxJarSet, String auxJars, String delimiter) {
if (auxJars != null && !auxJars.isEmpty()) {
// TODO: transitive dependencies warning?
- String[] jarPaths = auxJars.split(",");
+ String[] jarPaths = auxJars.split(delimiter);
for (String jarPath : jarPaths) {
if (!jarPath.isEmpty()) {
auxJarSet.add(jarPath);