You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2016/07/05 21:59:15 UTC
[1/2] hive git commit: HIVE-14140 : LLAP: package codec jars (Sergey
Shelukhin, reviewed by Gopal V)
Repository: hive
Updated Branches:
refs/heads/branch-2.1 c0d53831c -> b70624127
refs/heads/master 23fd2ae1c -> 21cddf067
HIVE-14140 : LLAP: package codec jars (Sergey Shelukhin, reviewed by Gopal V)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/21cddf06
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/21cddf06
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/21cddf06
Branch: refs/heads/master
Commit: 21cddf067e0c4f30771d2e216fc3f14002fe516d
Parents: 23fd2ae
Author: Sergey Shelukhin <se...@apache.org>
Authored: Tue Jul 5 14:55:18 2016 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Tue Jul 5 14:55:18 2016 -0700
----------------------------------------------------------------------
.../hadoop/hive/llap/cli/LlapServiceDriver.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/21cddf06/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 dc80992..98faa2c 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
@@ -195,7 +195,8 @@ public class LlapServiceDriver {
// if needed, use --hiveconf llap.daemon.service.hosts=@llap0 to dynamically switch between
// instances
conf.set(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + options.getName());
- propsDirectOptions.setProperty(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + options.getName());
+ propsDirectOptions.setProperty(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname,
+ "@" + options.getName());
}
if (options.getSize() != -1) {
@@ -205,7 +206,8 @@ public class LlapServiceDriver {
Preconditions.checkArgument(options.getCache() < options.getSize(),
"Cache has to be smaller than the container sizing");
} else if (options.getCache() < options.getSize()) {
- LOG.warn("Note that this might need YARN physical memory monitoring to be turned off (yarn.nodemanager.pmem-check-enabled=false)");
+ LOG.warn("Note that this might need YARN physical memory monitoring to be turned off "
+ + "(yarn.nodemanager.pmem-check-enabled=false)");
}
}
if (options.getXmx() != -1) {
@@ -329,6 +331,12 @@ public class LlapServiceDriver {
for (String className : DEFAULT_AUX_CLASSES) {
localizeJarForClass(lfs, libDir, className, false);
}
+ Collection<String> codecs = conf.getStringCollection("io.compression.codecs");
+ if (codecs != null) {
+ for (String codecClassName : codecs) {
+ localizeJarForClass(lfs, libDir, codecClassName, false);
+ }
+ }
if (options.getIsHBase()) {
try {
@@ -540,10 +548,9 @@ public class LlapServiceDriver {
throw (t instanceof IOException) ? (IOException)t : new IOException(t);
}
hasException = true;
- String err =
- "Cannot find a jar for [" + className + "] due to an exception (" + t.getMessage()
- + "); not packaging the jar";
- LOG.error(err, t);
+ String err = "Cannot find a jar for [" + className + "] due to an exception ("
+ + t.getMessage() + "); not packaging the jar";
+ LOG.error(err);
System.err.println(err);
}
if (jarPath != null) {
[2/2] hive git commit: HIVE-14140 : LLAP: package codec jars (Sergey
Shelukhin, reviewed by Gopal V)
Posted by se...@apache.org.
HIVE-14140 : LLAP: package codec jars (Sergey Shelukhin, reviewed by Gopal V)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b7062412
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b7062412
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b7062412
Branch: refs/heads/branch-2.1
Commit: b706241275d0124243ea35c4667b0bb7cdfd6e94
Parents: c0d5383
Author: Sergey Shelukhin <se...@apache.org>
Authored: Tue Jul 5 14:55:18 2016 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Tue Jul 5 14:55:48 2016 -0700
----------------------------------------------------------------------
.../hadoop/hive/llap/cli/LlapServiceDriver.java | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/b7062412/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 dc80992..98faa2c 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
@@ -195,7 +195,8 @@ public class LlapServiceDriver {
// if needed, use --hiveconf llap.daemon.service.hosts=@llap0 to dynamically switch between
// instances
conf.set(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + options.getName());
- propsDirectOptions.setProperty(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, "@" + options.getName());
+ propsDirectOptions.setProperty(ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname,
+ "@" + options.getName());
}
if (options.getSize() != -1) {
@@ -205,7 +206,8 @@ public class LlapServiceDriver {
Preconditions.checkArgument(options.getCache() < options.getSize(),
"Cache has to be smaller than the container sizing");
} else if (options.getCache() < options.getSize()) {
- LOG.warn("Note that this might need YARN physical memory monitoring to be turned off (yarn.nodemanager.pmem-check-enabled=false)");
+ LOG.warn("Note that this might need YARN physical memory monitoring to be turned off "
+ + "(yarn.nodemanager.pmem-check-enabled=false)");
}
}
if (options.getXmx() != -1) {
@@ -329,6 +331,12 @@ public class LlapServiceDriver {
for (String className : DEFAULT_AUX_CLASSES) {
localizeJarForClass(lfs, libDir, className, false);
}
+ Collection<String> codecs = conf.getStringCollection("io.compression.codecs");
+ if (codecs != null) {
+ for (String codecClassName : codecs) {
+ localizeJarForClass(lfs, libDir, codecClassName, false);
+ }
+ }
if (options.getIsHBase()) {
try {
@@ -540,10 +548,9 @@ public class LlapServiceDriver {
throw (t instanceof IOException) ? (IOException)t : new IOException(t);
}
hasException = true;
- String err =
- "Cannot find a jar for [" + className + "] due to an exception (" + t.getMessage()
- + "); not packaging the jar";
- LOG.error(err, t);
+ String err = "Cannot find a jar for [" + className + "] due to an exception ("
+ + t.getMessage() + "); not packaging the jar";
+ LOG.error(err);
System.err.println(err);
}
if (jarPath != null) {