hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prasan...@apache.org
Subject [1/2] hive git commit: Revert "HIVE-10685: Alter table concatenate oparetor will cause duplicate data (guoliming reviewed by Prasanth Jayachandran)"
Date Mon, 15 Jun 2015 22:28:49 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-1.1 4ed4e985d -> 11a0901b5


Revert "HIVE-10685: Alter table concatenate oparetor will cause duplicate data (guoliming
reviewed by Prasanth Jayachandran)"

This reverts commit 4ed4e985d697548a7f615018bc5a0b67064382ca.


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6ea82939
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6ea82939
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6ea82939

Branch: refs/heads/branch-1.1
Commit: 6ea8293993174aa983f6856b9d8789f7326da3d2
Parents: 4ed4e98
Author: Prasanth Jayachandran <j.prasanth.j@gmail.com>
Authored: Mon Jun 15 15:28:24 2015 -0700
Committer: Prasanth Jayachandran <j.prasanth.j@gmail.com>
Committed: Mon Jun 15 15:28:24 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/6ea82939/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;
     }
 


Mime
View raw message