svn commit: r793115 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java

[stack]

Author: stack
Date: Fri Jul 10 21:34:16 2009
New Revision: 793115

URL: http://svn.apache.org/viewvc?rev=793115&view=rev
Log:
HBASE-1644 Result.row is cached in getRow; this breaks MapReduce

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=793115&r1=793114&r2=793115&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jul 10 21:34:16 2009
@@ -254,6 +254,8 @@
    HBASE-1641  Stargate build.xml causes error in Eclipse
    HBASE-1627  TableInputFormatBase#nextKeyValue catches the wrong exception
                (Doğacan Güney via Stack)
+   HBASE-1644  Result.row is cached in getRow; this breaks MapReduce
+               (Doğacan Güney via Stack)
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java?rev=793115&r1=793114&r2=793115&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
 (original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java
 Fri Jul 10 21:34:16 2009
@@ -198,19 +198,17 @@
     public boolean nextKeyValue() throws IOException, InterruptedException {
       if (key == null) key = new ImmutableBytesWritable();
       if (value == null) value = new Result();
-      Result result;
       try {
-        result = this.scanner.next();
+        value = this.scanner.next();
       } catch (IOException e) {
         LOG.debug("recovered from " + StringUtils.stringifyException(e));  
         restart(lastRow);
         scanner.next();    // skip presumed already mapped row
-        result = scanner.next();
+        value = scanner.next();
       }
-      if (result != null && result.size() > 0) {
-        key.set(result.getRow());
+      if (value != null && value.size() > 0) {
+        key.set(value.getRow());
         lastRow = key.get();
-        Writables.copyWritable(result, value);
         return true;
       }
       return false;