From hcatalog-commits-return-797-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org Thu Apr 5 05:52:30 2012 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 16D869209 for ; Thu, 5 Apr 2012 05:52:30 +0000 (UTC) Received: (qmail 75941 invoked by uid 500); 5 Apr 2012 05:52:29 -0000 Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org Received: (qmail 74512 invoked by uid 500); 5 Apr 2012 05:52:27 -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 74472 invoked by uid 99); 5 Apr 2012 05:52:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 05:52:26 +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; Thu, 05 Apr 2012 05:52:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 730482388980; Thu, 5 Apr 2012 05:52:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1309655 - in /incubator/hcatalog/trunk: CHANGES.txt src/java/org/apache/hcatalog/mapreduce/InitializeInput.java Date: Thu, 05 Apr 2012 05:52:02 -0000 To: hcatalog-commits@incubator.apache.org From: gates@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120405055202.730482388980@eris.apache.org> Author: gates Date: Thu Apr 5 05:52:01 2012 New Revision: 1309655 URL: http://svn.apache.org/viewvc?rev=1309655&view=rev Log: HCATALOG-320 Remove filtering of table properties which are not prefix with "hcat." Modified: incubator/hcatalog/trunk/CHANGES.txt incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InitializeInput.java Modified: incubator/hcatalog/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1309655&r1=1309654&r2=1309655&view=diff ============================================================================== --- incubator/hcatalog/trunk/CHANGES.txt (original) +++ incubator/hcatalog/trunk/CHANGES.txt Thu Apr 5 05:52:01 2012 @@ -102,6 +102,7 @@ Release 0.4.0 - Unreleased OPTIMIZATIONS BUG FIXES + HCAT-320 Remove filtering of table properties which are not prefix with "hcat." (rohini via gates) HCAT-357 e2e harness: allow to run again pre-installed packages (thw via daijy) Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InitializeInput.java URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InitializeInput.java?rev=1309655&r1=1309654&r2=1309655&view=diff ============================================================================== --- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InitializeInput.java (original) +++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InitializeInput.java Thu Apr 5 05:52:01 2012 @@ -27,30 +27,13 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.conf.HiveConf; -import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; import org.apache.hadoop.hive.metastore.api.FieldSchema; -import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Table; -import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; -import org.apache.hadoop.hive.metastore.MetaStoreUtils; -import org.apache.hadoop.hive.ql.exec.Utilities; -import org.apache.hadoop.hive.ql.io.HiveFileFormatUtils; -import org.apache.hadoop.hive.ql.io.HiveOutputFormat; -import org.apache.hadoop.hive.ql.metadata.HiveException; -import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler; -import org.apache.hadoop.hive.ql.metadata.HiveUtils; -import org.apache.hadoop.hive.ql.plan.TableDesc; -import org.apache.hadoop.hive.serde.Constants; -import org.apache.hadoop.hive.serde2.Deserializer; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.Job; - import org.apache.hcatalog.common.ErrorType; import org.apache.hcatalog.common.HCatConstants; import org.apache.hcatalog.common.HCatException; @@ -67,8 +50,6 @@ public class InitializeInput { private static final Log LOG = LogFactory.getLog(InitializeInput.class); - /** The prefix for keys used for storage handler arguments */ - static final String HCAT_KEY_PREFIX = "hcat."; private static HiveConf hiveConf; private static HiveMetaStoreClient createHiveMetaClient(Configuration conf) throws Exception { @@ -190,9 +171,7 @@ public class InitializeInput { inputJobInfo); for (String key : parameters.keySet()){ - if (key.startsWith(HCAT_KEY_PREFIX)){ hcatProperties.put(key, parameters.get(key)); - } } // FIXME // Bloating partinfo with inputJobInfo is not good