svn commit: r711420 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/io/BatchUpdate.java

[st...@apache.org]

Author: stack
Date: Tue Nov  4 13:39:53 2008
New Revision: 711420

URL: http://svn.apache.org/viewvc?rev=711420&view=rev
Log:
HBASE-982 Deleting a column in MapReduce fails

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BatchUpdate.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=711420&r1=711419&r2=711420&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Nov  4 13:39:53 2008
@@ -62,6 +62,7 @@
    HBASE-979   REST web app is not started automatically
    HBASE-964   Startup stuck "waiting for root region"
    HBASE-980   Undo core of HBASE-975, caching of start and end row
+   HBASE-982   Deleting a column in MapReduce fails (Doğacan Güney via Stack)
    
   IMPROVEMENTS
    HBASE-901   Add a limit to key length, check key and value length on client side

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BatchUpdate.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BatchUpdate.java?rev=711420&r1=711419&r2=711420&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BatchUpdate.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BatchUpdate.java Tue Nov  4 13:39:53 2008
@@ -97,7 +97,13 @@
   public BatchUpdate(BatchUpdate buToCopy) {
     this(buToCopy.getRow(), buToCopy.getTimestamp());
     for(BatchOperation bo : buToCopy) {
-      this.put(bo.getColumn(), bo.getValue());
+      byte [] val = bo.getValue();
+      if (val == null) {
+        // Presume a delete is intended.
+        this.delete(bo.getColumn());
+      } else {
+        this.put(bo.getColumn(), val);
+      }
     }
   }
 
@@ -330,4 +336,4 @@
   public int compareTo(BatchUpdate o) {
     return Bytes.compareTo(this.row, o.getRow());
   }
-}
\ No newline at end of file
+}