Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F84B10E6C for ; Fri, 28 Feb 2014 21:35:20 +0000 (UTC) Received: (qmail 17476 invoked by uid 500); 28 Feb 2014 21:35:19 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 17371 invoked by uid 500); 28 Feb 2014 21:35:19 -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 17348 invoked by uid 99); 28 Feb 2014 21:35:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Feb 2014 21:35:18 +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, 28 Feb 2014 21:35:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 748B923888E2; Fri, 28 Feb 2014 21:34:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1573086 - in /hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse: FileSinkProcessor.java GenTezUtils.java Date: Fri, 28 Feb 2014 21:34:57 -0000 To: commits@hive.apache.org From: gunther@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140228213457.748B923888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gunther Date: Fri Feb 28 21:34:57 2014 New Revision: 1573086 URL: http://svn.apache.org/r1573086 Log: HIVE-6525: Fix some whitespace issues in GenTezUtils (Gunther Hagleitner) Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FileSinkProcessor.java hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FileSinkProcessor.java URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FileSinkProcessor.java?rev=1573086&r1=1573085&r2=1573086&view=diff ============================================================================== --- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FileSinkProcessor.java (original) +++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/FileSinkProcessor.java Fri Feb 28 21:34:57 2014 @@ -51,7 +51,7 @@ public class FileSinkProcessor implement GenTezProcContext context = (GenTezProcContext) procCtx; FileSinkOperator fileSink = (FileSinkOperator) nd; - + // just remember it for later processing context.fileSinkSet.add(fileSink); return true; Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java?rev=1573086&r1=1573085&r2=1573086&view=diff ============================================================================== --- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java (original) +++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java Fri Feb 28 21:34:57 2014 @@ -146,8 +146,8 @@ public class GenTezUtils { } // this method's main use is to help unit testing this class - protected void setupMapWork(MapWork mapWork, GenTezProcContext context, - PrunedPartitionList partitions, Operator root, + protected void setupMapWork(MapWork mapWork, GenTezProcContext context, + PrunedPartitionList partitions, Operator root, String alias) throws SemanticException { // All the setup is done in GenMapRedUtils GenMapRedUtils.setMapWork(mapWork, context.parseContext, @@ -155,12 +155,12 @@ public class GenTezUtils { } // removes any union operator and clones the plan - public void removeUnionOperators(Configuration conf, GenTezProcContext context, - BaseWork work) + public void removeUnionOperators(Configuration conf, GenTezProcContext context, + BaseWork work) throws SemanticException { Set> roots = work.getAllRootOperators(); - + // need to clone the plan. Set> newRoots = Utilities.cloneOperatorTree(conf, roots); @@ -185,14 +185,14 @@ public class GenTezUtils { if (current instanceof FileSinkOperator) { FileSinkOperator fileSink = (FileSinkOperator)current; - + // remember it for additional processing later context.fileSinkSet.add(fileSink); FileSinkDesc desc = fileSink.getConf(); Path path = desc.getDirName(); List linked; - + if (!context.linkedFileSinks.containsKey(path)) { linked = new ArrayList(); context.linkedFileSinks.put(path, linked); @@ -203,7 +203,7 @@ public class GenTezUtils { desc.setDirName(new Path(path, ""+linked.size())); desc.setLinkedFileSinkDesc(linked); } - + if (current instanceof UnionOperator) { Operator parent = null; int count = 0; @@ -214,7 +214,7 @@ public class GenTezUtils { parent = op; } } - + // we should have been able to reach the union from only one side. assert count <= 1; @@ -232,7 +232,7 @@ public class GenTezUtils { } else { operators.addAll(current.getChildOperators()); } - } + } work.replaceRoots(replacementMap); } @@ -240,11 +240,11 @@ public class GenTezUtils { throws SemanticException { ParseContext parseContext = context.parseContext; - + boolean isInsertTable = // is INSERT OVERWRITE TABLE GenMapRedUtils.isInsertInto(parseContext, fileSink); HiveConf hconf = parseContext.getConf(); - + boolean chDir = GenMapRedUtils.isMergeRequired(context.moveTask, hconf, fileSink, context.currentTask, isInsertTable);