From commits-return-8312-archive-asf-public=cust-asf.ponee.io@pig.apache.org Fri Oct 12 19:01:47 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 016CD180660 for ; Fri, 12 Oct 2018 19:01:46 +0200 (CEST) Received: (qmail 51010 invoked by uid 500); 12 Oct 2018 17:01:46 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 50998 invoked by uid 99); 12 Oct 2018 17:01:46 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2018 17:01:46 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C18163A0F4C for ; Fri, 12 Oct 2018 17:01:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1843691 - /pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezJobSplitWriter.java Date: Fri, 12 Oct 2018 17:01:44 -0000 To: commits@pig.apache.org From: rohini@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181012170144.C18163A0F4C@svn01-us-west.apache.org> Author: rohini Date: Fri Oct 12 17:01:44 2018 New Revision: 1843691 URL: http://svn.apache.org/viewvc?rev=1843691&view=rev Log: Fix test failure for PIG-5359 Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezJobSplitWriter.java Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezJobSplitWriter.java URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezJobSplitWriter.java?rev=1843691&r1=1843690&r2=1843691&view=diff ============================================================================== --- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezJobSplitWriter.java (original) +++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/TezJobSplitWriter.java Fri Oct 12 17:01:44 2018 @@ -73,8 +73,8 @@ public class TezJobSplitWriter { * @throws IOException * @throws InterruptedException */ - public static void createSplitFiles(Path jobSubmitDir, Configuration conf, FileSystem fs, - T[] splits, MRSplitsProto splitsProto) throws IOException, InterruptedException { + public static void createSplitFiles(Path jobSubmitDir, Configuration conf, FileSystem fs, + InputSplit[] splits, MRSplitsProto splitsProto) throws IOException, InterruptedException { FSDataOutputStream out = createFile(fs, JobSubmissionFiles.getJobSplitFile(jobSubmitDir), conf); SplitMetaInfo[] info = writeSplits(conf, splits, out, splitsProto); out.close(); @@ -108,11 +108,11 @@ public class TezJobSplitWriter { * @throws InterruptedException */ @SuppressWarnings("unchecked") - private static SplitMetaInfo[] writeSplits(Configuration conf, T[] array, + private static SplitMetaInfo[] writeSplits(Configuration conf, InputSplit[] inputSplits, FSDataOutputStream out, MRSplitsProto splitsProto) throws IOException, InterruptedException { SplitMetaInfo[] info = null; - if (array.length != 0) { - info = new SplitMetaInfo[array.length]; + if (inputSplits.length != 0) { + info = new SplitMetaInfo[inputSplits.length]; SerializationFactory factory = new SerializationFactory(conf); int maxBlockLocations = conf.getInt(MRConfig.MAX_BLOCK_LOCATIONS_KEY, MRConfig.MAX_BLOCK_LOCATIONS_DEFAULT); long offset = out.getPos(); @@ -121,16 +121,18 @@ public class TezJobSplitWriter { long prevCount = out.getPos(); Text.writeString(out, splitProto.getSplitClassName()); splitProto.getSplitBytes().writeTo(out); - info[i++] = createSplitMetaInfo(array[i], offset, maxBlockLocations); + info[i] = createSplitMetaInfo(inputSplits[i], offset, maxBlockLocations); + i++; offset += out.getPos() - prevCount; } - while(i < array.length) { + while(i < inputSplits.length) { long prevCount = out.getPos(); - Text.writeString(out, array[i].getClass().getName()); - Serializer serializer = factory.getSerializer((Class) array[i].getClass()); + Text.writeString(out, inputSplits[i].getClass().getName()); + Serializer serializer = factory.getSerializer((Class) inputSplits[i].getClass()); serializer.open(out); - serializer.serialize(array[i]); - info[i++] = createSplitMetaInfo(array[i], offset, maxBlockLocations); + serializer.serialize(inputSplits[i]); + info[i] = createSplitMetaInfo(inputSplits[i], offset, maxBlockLocations); + i++; offset += out.getPos() - prevCount; } }