From hcatalog-commits-return-1157-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Fri Jan 11 19:17:04 2013 Return-Path: X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95EE8E48B for ; Fri, 11 Jan 2013 19:17:04 +0000 (UTC) Received: (qmail 40690 invoked by uid 500); 11 Jan 2013 19:17:04 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 40661 invoked by uid 500); 11 Jan 2013 19:17:04 -0000 Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hcatalog-dev@incubator.apache.org Delivered-To: mailing list hcatalog-commits@incubator.apache.org Received: (qmail 40653 invoked by uid 99); 11 Jan 2013 19:17:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2013 19:17:04 +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; Fri, 11 Jan 2013 19:17:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2CC262388847; Fri, 11 Jan 2013 19:16:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1432238 - in /incubator/hcatalog/branches/branch-0.5: CHANGES.txt core/src/main/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java Date: Fri, 11 Jan 2013 19:16:44 -0000 To: hcatalog-commits@incubator.apache.org From: avandana@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130111191644.2CC262388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: avandana Date: Fri Jan 11 19:16:43 2013 New Revision: 1432238 URL: http://svn.apache.org/viewvc?rev=1432238&view=rev Log: HCAT-554 Loading data using HCatLoader() from a table on non default namenode fails. Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt incubator/hcatalog/branches/branch-0.5/core/src/main/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java Modified: incubator/hcatalog/branches/branch-0.5/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/CHANGES.txt?rev=1432238&r1=1432237&r2=1432238&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.5/CHANGES.txt (original) +++ incubator/hcatalog/branches/branch-0.5/CHANGES.txt Fri Jan 11 19:16:43 2013 @@ -158,6 +158,8 @@ Release 0.5.0 - Unreleased OPTIMIZATIONS BUG FIXES + HCAT-554 Loading data using HCatLoader() from a table on non default namenode fails. (amalakar via avandana) + HCAT-586 checkstyle fails every time complaining that it's own header file does not have the proper header (gates) HCAT-580 Optimizations in HCAT-538 break e2e tests (daijy via gates) Modified: incubator/hcatalog/branches/branch-0.5/core/src/main/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.5/core/src/main/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java?rev=1432238&r1=1432237&r2=1432238&view=diff ============================================================================== --- incubator/hcatalog/branches/branch-0.5/core/src/main/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java (original) +++ incubator/hcatalog/branches/branch-0.5/core/src/main/java/org/apache/hcatalog/mapreduce/HCatBaseInputFormat.java Fri Jan 11 19:16:43 2013 @@ -316,15 +316,15 @@ public abstract class HCatBaseInputForma pathStrings.add(location.substring(pathStart, length)); Path[] paths = StringUtils.stringToPath(pathStrings.toArray(new String[0])); + String separator = ""; + StringBuilder str = new StringBuilder(); - FileSystem fs = FileSystem.get(jobConf); - Path path = paths[0].makeQualified(fs); - StringBuilder str = new StringBuilder(StringUtils.escapeString( - path.toString())); - for (int i = 1; i < paths.length; i++) { - str.append(StringUtils.COMMA_STR); - path = paths[i].makeQualified(fs); - str.append(StringUtils.escapeString(path.toString())); + for (Path path : paths) { + FileSystem fs = path.getFileSystem(jobConf); + final String qualifiedPath = fs.makeQualified(path).toString(); + str.append(separator) + .append(StringUtils.escapeString(qualifiedPath)); + separator = StringUtils.COMMA_STR; } jobConf.set("mapred.input.dir", str.toString());