Return-Path: Delivered-To: apmail-hive-commits-archive@www.apache.org Received: (qmail 91295 invoked from network); 5 Mar 2011 20:30:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Mar 2011 20:30:48 -0000 Received: (qmail 64713 invoked by uid 500); 5 Mar 2011 20:30:48 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 64691 invoked by uid 500); 5 Mar 2011 20:30:48 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 64672 invoked by uid 99); 5 Mar 2011 20:30:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Mar 2011 20:30:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Mar 2011 20:30:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E35D52388A2C; Sat, 5 Mar 2011 20:30:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1078344 - /hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Date: Sat, 05 Mar 2011 20:30:24 -0000 To: commits@hive.apache.org From: heyongqiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110305203024.E35D52388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: heyongqiang Date: Sat Mar 5 20:30:24 2011 New Revision: 1078344 URL: http://svn.apache.org/viewvc?rev=1078344&view=rev Log: HIVE-2018 avoid loading Hive aux jars in CLI remote mode (Ning Zhang via He Yongqiang) Modified: hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Modified: hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java URL: http://svn.apache.org/viewvc/hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java?rev=1078344&r1=1078343&r2=1078344&view=diff ============================================================================== --- hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (original) +++ hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Sat Mar 5 20:30:24 2011 @@ -447,19 +447,6 @@ public class CliDriver { conf.set((String) item.getKey(), (String) item.getValue()); } - if (!ShimLoader.getHadoopShims().usesJobShell()) { - // hadoop-20 and above - we need to augment classpath using hiveconf - // components - // see also: code in ExecDriver.java - ClassLoader loader = conf.getClassLoader(); - String auxJars = HiveConf.getVar(conf, HiveConf.ConfVars.HIVEAUXJARS); - if (StringUtils.isNotBlank(auxJars)) { - loader = Utilities.addToClassPath(loader, StringUtils.split(auxJars, ",")); - } - conf.setClassLoader(loader); - Thread.currentThread().setContextClassLoader(loader); - } - SessionState.start(ss); // connect to Hive Server @@ -473,6 +460,20 @@ public class CliDriver { } } + // CLI remote mode is a thin client: only load auxJars in local mode + if (!ss.isRemoteMode() && !ShimLoader.getHadoopShims().usesJobShell()) { + // hadoop-20 and above - we need to augment classpath using hiveconf + // components + // see also: code in ExecDriver.java + ClassLoader loader = conf.getClassLoader(); + String auxJars = HiveConf.getVar(conf, HiveConf.ConfVars.HIVEAUXJARS); + if (StringUtils.isNotBlank(auxJars)) { + loader = Utilities.addToClassPath(loader, StringUtils.split(auxJars, ",")); + } + conf.setClassLoader(loader); + Thread.currentThread().setContextClassLoader(loader); + } + CliDriver cli = new CliDriver(); // Execute -i init files (always in silent mode)