Repository: hive Updated Branches: refs/heads/branch-1.2 eac8b3d38 -> aef08f44e
Revert "HIVE-10685: Alter table concatenate oparetor will cause duplicate data (guoliming reviewed by Prasanth Jayachandran)" This reverts commit f5b158acf650a5ebaa0421a460d94d64d0656266. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0b80252f Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0b80252f Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0b80252f Branch: refs/heads/branch-1.2 Commit: 0b80252fa84e8171a849866ff760eb37832fc910 Parents: eac8b3d Author: Prasanth Jayachandran <[email protected]> Authored: Mon Jun 15 15:29:10 2015 -0700 Committer: Prasanth Jayachandran <[email protected]> Committed: Mon Jun 15 15:29:10 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/0b80252f/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<OrcFileKeyWrapper, OrcFileValueWrapper> { @@ -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; }
