From 9a2d0f197747c4f10ff89a8e2e7ca0712e94b608 Mon Sep 17 00:00:00 2001
From: zhudebin <zdb_hn@163.com>
Date: Mon, 13 Jun 2016 19:15:00 +0800
Subject: [PATCH 1/3] HADOOP-13192 org.apache.hadoop.util.LineReader  match
 recordDelimiter has a bug

---
 .../src/main/java/org/apache/hadoop/util/LineReader.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
index 153953d27360b..576f16e6492d4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
@@ -318,7 +318,7 @@ private int readCustomLine(Text str, int maxLineLength, int maxBytesToConsume)
             break;
           }
         } else if (delPosn != 0) {
-          bufferPosn--;
+          bufferPosn -= delPosn;
           delPosn = 0;
         }
       }

From 71afbfcdab32784253e8fbaf4365962ff968e405 Mon Sep 17 00:00:00 2001
From: zhudebin <zdb_hn@163.com>
Date: Fri, 17 Jun 2016 11:09:51 +0800
Subject: [PATCH 2/3] fix bug [hadoop-1392], add test case for LineReader

---
 .../org/apache/hadoop/util/LineReader.java    |  3 +++
 .../apache/hadoop/util/TestLineReader.java    | 25 ++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
index 576f16e6492d4..e20a7c1084e7b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
@@ -319,6 +319,9 @@ private int readCustomLine(Text str, int maxLineLength, int maxBytesToConsume)
           }
         } else if (delPosn != 0) {
           bufferPosn -= delPosn;
+          if(bufferPosn < -1) {
+            bufferPosn = -1;
+          }
           delPosn = 0;
         }
       }
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
index 9d909bcebd067..a47ac65831070 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
@@ -58,7 +58,7 @@ public void testCustomDelimiter() throws Exception {
      * Check Condition
      *  In the second key value pair, the value should contain 
      *  "</"  from currentToken and
-     *  "id>" from next token 
+     *  "id>" from next token
      */  
     
     Delimiter="</entity>"; 
@@ -80,7 +80,7 @@ public void testCustomDelimiter() throws Exception {
     String TestPartOfInput = CurrentBufferTailToken+NextBufferHeadToken;
   
     int BufferSize=64 * 1024;
-    int numberOfCharToFillTheBuffer=BufferSize-CurrentBufferTailToken.length();
+    int numberOfCharToFillTheBuffer = BufferSize - CurrentBufferTailToken.length();
     StringBuilder fillerString=new StringBuilder();
     for (int i=0;i<numberOfCharToFillTheBuffer;i++) {  
       fillerString.append('a'); // char 'a' as a filler for the test string
@@ -92,7 +92,7 @@ public void testCustomDelimiter() throws Exception {
     
     line = new Text();
     
-    lineReader.readLine(line); 
+    lineReader.readLine(line);
     Assert.assertEquals(fillerString.toString(),line.toString());
     
     lineReader.readLine(line);
@@ -118,10 +118,10 @@ public void testCustomDelimiter() throws Exception {
     
     lineReader = new LineReader(
         new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
-    
-    lineReader.readLine(line); 
+
+    lineReader.readLine(line);
     Assert.assertEquals("",line.toString());
-    lineReader.readLine(line); 
+    lineReader.readLine(line);
     Assert.assertEquals("Kerala ",line.toString());
     
     lineReader.readLine(line); 
@@ -137,5 +137,18 @@ public void testCustomDelimiter() throws Exception {
     
     lineReader.readLine(line); 
     Assert.assertEquals(("ecord"+"recor"+"core"),line.toString());
+
+    // Test 3
+    // The test scenario is such that,
+    // aaaabccc split by aaab
+    TestData = "aaaabccc";
+    Delimiter = "aaab";
+    lineReader = new LineReader(
+        new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
+
+    lineReader.readLine(line);
+    Assert.assertEquals("a",line.toString());
+    lineReader.readLine(line);
+    Assert.assertEquals("ccc",line.toString());
   }
 }

From 41d3ce3b3fda57740dc88a2da11936f9d251c5e9 Mon Sep 17 00:00:00 2001
From: zhudebin <zdb_hn@163.com>
Date: Fri, 17 Jun 2016 16:20:17 +0800
Subject: [PATCH 3/3] fix the checkstyle warnings

---
 .../apache/hadoop/util/TestLineReader.java    | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
index a47ac65831070..52f8b9f6ef2aa 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
@@ -80,20 +80,21 @@ public void testCustomDelimiter() throws Exception {
     String TestPartOfInput = CurrentBufferTailToken+NextBufferHeadToken;
   
     int BufferSize=64 * 1024;
-    int numberOfCharToFillTheBuffer = BufferSize - CurrentBufferTailToken.length();
+    int numberOfCharToFillTheBuffer =
+            BufferSize - CurrentBufferTailToken.length();
     StringBuilder fillerString=new StringBuilder();
-    for (int i=0;i<numberOfCharToFillTheBuffer;i++) {  
+    for (int i=0; i<numberOfCharToFillTheBuffer; i++) {
       fillerString.append('a'); // char 'a' as a filler for the test string
     }
 
     TestData = fillerString + TestPartOfInput;
     lineReader = new LineReader(
-        new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
+        new ByteArrayInputStream(TestData.getBytes()), Delimiter.getBytes());
     
     line = new Text();
     
     lineReader.readLine(line);
-    Assert.assertEquals(fillerString.toString(),line.toString());
+    Assert.assertEquals(fillerString.toString(), line.toString());
     
     lineReader.readLine(line);
     Assert.assertEquals(Expected, line.toString());
@@ -107,36 +108,37 @@ public void testCustomDelimiter() throws Exception {
     Delimiter = "record";
     StringBuilder TestStringBuilder = new StringBuilder();
     
-    TestStringBuilder.append(Delimiter+"Kerala ");
-    TestStringBuilder.append(Delimiter+"Bangalore");
-    TestStringBuilder.append(Delimiter+" North Korea");
-    TestStringBuilder.append(Delimiter+Delimiter+
+    TestStringBuilder.append(Delimiter + "Kerala ");
+    TestStringBuilder.append(Delimiter + "Bangalore");
+    TestStringBuilder.append(Delimiter + " North Korea");
+    TestStringBuilder.append(Delimiter + Delimiter+
                         "Guantanamo");
-    TestStringBuilder.append(Delimiter+"ecord"+"recor"+"core"); //~EOF with 're'
+    TestStringBuilder.append(Delimiter + "ecord"
+            + "recor" + "core"); //~EOF with 're'
     
     TestData=TestStringBuilder.toString();
     
     lineReader = new LineReader(
-        new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
+        new ByteArrayInputStream(TestData.getBytes()), Delimiter.getBytes());
 
     lineReader.readLine(line);
-    Assert.assertEquals("",line.toString());
+    Assert.assertEquals("", line.toString());
     lineReader.readLine(line);
-    Assert.assertEquals("Kerala ",line.toString());
+    Assert.assertEquals("Kerala ", line.toString());
     
     lineReader.readLine(line); 
-    Assert.assertEquals("Bangalore",line.toString());
+    Assert.assertEquals("Bangalore", line.toString());
     
     lineReader.readLine(line); 
-    Assert.assertEquals(" North Korea",line.toString());
+    Assert.assertEquals(" North Korea", line.toString());
     
     lineReader.readLine(line); 
-    Assert.assertEquals("",line.toString());
+    Assert.assertEquals("", line.toString());
     lineReader.readLine(line); 
-    Assert.assertEquals("Guantanamo",line.toString());
+    Assert.assertEquals("Guantanamo", line.toString());
     
     lineReader.readLine(line); 
-    Assert.assertEquals(("ecord"+"recor"+"core"),line.toString());
+    Assert.assertEquals(("ecord"+"recor"+"core"), line.toString());
 
     // Test 3
     // The test scenario is such that,
@@ -144,11 +146,11 @@ public void testCustomDelimiter() throws Exception {
     TestData = "aaaabccc";
     Delimiter = "aaab";
     lineReader = new LineReader(
-        new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
+        new ByteArrayInputStream(TestData.getBytes()), Delimiter.getBytes());
 
     lineReader.readLine(line);
-    Assert.assertEquals("a",line.toString());
+    Assert.assertEquals("a", line.toString());
     lineReader.readLine(line);
-    Assert.assertEquals("ccc",line.toString());
+    Assert.assertEquals("ccc", line.toString());
   }
 }