svn commit: r1569843 - in /hbase/branches/0.98/hbase-server/src: main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java

[ra...@apache.org]

Author: rajeshbabu
Date: Wed Feb 19 17:35:27 2014
New Revision: 1569843

URL: http://svn.apache.org/r1569843
Log:
HBASE-10534 Rowkey in TsvImporterTextMapper initializing with wrong length(Rajesh)

Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
    hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java?rev=1569843&r1=1569842&r2=1569843&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java Wed Feb 19 17:35:27 2014
@@ -349,6 +349,13 @@ public class ImportTsv extends Configure
       private static final long serialVersionUID = 1L;
     }
 
+    /**
+     * Return starting position and length of row key from the specified line bytes.
+     * @param lineBytes
+     * @param length
+     * @return Pair of row key offset and length.
+     * @throws BadTsvLineException
+     */
     public Pair<Integer, Integer> parseRowKey(byte[] lineBytes, int length)
         throws BadTsvLineException {
       int rkColumnIndex = 0;
@@ -371,7 +378,7 @@ public class ImportTsv extends Configure
                   + " are less than row key position.");
         }
       }
-      return new Pair<Integer, Integer>(startPos, endPos);
+      return new Pair<Integer, Integer>(startPos, endPos - startPos + 1);
     }
   }
 

Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java?rev=1569843&r1=1569842&r2=1569843&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java Wed Feb 19 17:35:27 2014
@@ -220,7 +220,7 @@ public class TestImportTsvParser {
     byte[] line = Bytes.toBytes("rowkey\tval_a\t1234");
     Pair<Integer, Integer> rowKeyOffsets = parser.parseRowKey(line, line.length);
     assertEquals(0, rowKeyOffsets.getFirst().intValue());
-    assertEquals(5, rowKeyOffsets.getSecond().intValue());
+    assertEquals(6, rowKeyOffsets.getSecond().intValue());
     try {
       line = Bytes.toBytes("\t\tval_a\t1234");
       parser.parseRowKey(line, line.length);
@@ -233,7 +233,7 @@ public class TestImportTsvParser {
     line = Bytes.toBytes("val_a\trowkey\t1234");
     rowKeyOffsets = parser.parseRowKey(line, line.length);
     assertEquals(6, rowKeyOffsets.getFirst().intValue());
-    assertEquals(11, rowKeyOffsets.getSecond().intValue());
+    assertEquals(6, rowKeyOffsets.getSecond().intValue());
     try {
       line = Bytes.toBytes("val_a");
       rowKeyOffsets = parser.parseRowKey(line, line.length);
@@ -246,7 +246,7 @@ public class TestImportTsvParser {
     line = Bytes.toBytes("val_a\t1234\trowkey");
     rowKeyOffsets = parser.parseRowKey(line, line.length);
     assertEquals(11, rowKeyOffsets.getFirst().intValue());
-    assertEquals(16, rowKeyOffsets.getSecond().intValue());
+    assertEquals(6, rowKeyOffsets.getSecond().intValue());
   }
 
   @Test