svn commit: r1804035 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/io/InterRecordReader.java

[szita]

Author: szita
Date: Thu Aug  3 18:51:27 2017
New Revision: 1804035

URL: http://svn.apache.org/viewvc?rev=1804035&view=rev
Log:
PIG-5284: Fix flakyness introduced by PIG-3655 (szita)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/impl/io/InterRecordReader.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1804035&r1=1804034&r2=1804035&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Aug  3 18:51:27 2017
@@ -40,6 +40,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-5284: Fix flakyness introduced by PIG-3655 (szita)
+
 PIG-5278: Unit test failures because of PIG-5264 (nkollar via rohini)
 
 PIG-5276: building "jar" should not call "clean" (nkollar via szita)

Modified: pig/trunk/src/org/apache/pig/impl/io/InterRecordReader.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/io/InterRecordReader.java?rev=1804035&r1=1804034&r2=1804035&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/io/InterRecordReader.java (original)
+++ pig/trunk/src/org/apache/pig/impl/io/InterRecordReader.java Thu Aug  3 
18:51:27 2017
@@ -90,7 +90,7 @@ public class InterRecordReader extends R
      * @throws IOException
      */
   private boolean skipUntilMarkerOrSplitEndOrEOF() throws IOException {
-      int b = 0;
+      int b = Integer.MIN_VALUE;
 outer:while (b != -1) {
           if (b != syncMarker[0]) {
 
@@ -110,6 +110,10 @@ outer:while (b != -1) {
               b = in.read();
               if (b == -1) return false;
               if ((byte) b != syncMarker[i]) {
+                  if (in.getPosition() > end) {
+                      //Again we should not read past the split end, only if 
at least the first byte of marker was seen before it
+                      return false;
+                  }
                   continue outer;
               }
               ++i;