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 BDED418FD6 for ; Mon, 15 Jun 2015 22:27:57 +0000 (UTC) Received: (qmail 80000 invoked by uid 500); 15 Jun 2015 22:27:57 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 79919 invoked by uid 500); 15 Jun 2015 22:27:57 -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 79845 invoked by uid 99); 15 Jun 2015 22:27:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2015 22:27:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 567DFE35C7; Mon, 15 Jun 2015 22:27:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prasanthj@apache.org To: commits@hive.apache.org Date: Mon, 15 Jun 2015 22:27:58 -0000 Message-Id: <6f1f1f2d60f6446c816bd3811f5b5b9b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hive git commit: Revert "HIVE-10685: Alter table concatenate oparetor will cause duplicate data (guoliming reviewed by Prasanth Jayachandran)" Revert "HIVE-10685: Alter table concatenate oparetor will cause duplicate data (guoliming reviewed by Prasanth Jayachandran)" This reverts commit b4983d4b2eeb16e461bfb47509fd1c87cb8684a2. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/3e455c29 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/3e455c29 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/3e455c29 Branch: refs/heads/branch-1.0 Commit: 3e455c2993ba49492817dbf732bcb4742f35df41 Parents: 095f96b Author: Prasanth Jayachandran Authored: Mon Jun 15 15:26:10 2015 -0700 Committer: Prasanth Jayachandran Committed: Mon Jun 15 15:27:37 2015 -0700 ---------------------------------------------------------------------- .../hive/ql/io/orc/OrcFileStripeMergeRecordReader.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/3e455c29/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeRecordReader.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeRecordReader.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeRecordReader.java index 20c4d31..603b75a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeRecordReader.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeRecordReader.java @@ -18,16 +18,16 @@ package org.apache.hadoop.hive.ql.io.orc; -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.FileSplit; import org.apache.hadoop.mapred.RecordReader; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + public class OrcFileStripeMergeRecordReader implements RecordReader { @@ -79,7 +79,7 @@ public class OrcFileStripeMergeRecordReader implements // if stripe offset is outside the split boundary then ignore the current // stripe as it will be handled by some other mapper. if (si.getOffset() >= start && si.getOffset() < end) { - valueWrapper.setStripeStatistics(stripeStatistics.get(stripeIdx)); + valueWrapper.setStripeStatistics(stripeStatistics.get(stripeIdx++)); valueWrapper.setStripeInformation(si); if (!iter.hasNext()) { valueWrapper.setLastStripeInFile(true); @@ -94,7 +94,6 @@ public class OrcFileStripeMergeRecordReader implements } else { continue; } - stripeIdx++; return true; }