You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2010/01/14 02:39:27 UTC

svn commit: r899022 - in /hadoop/hbase/trunk: CHANGES.txt src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java

Author: apurtell
Date: Thu Jan 14 01:39:27 2010
New Revision: 899022

URL: http://svn.apache.org/viewvc?rev=899022&view=rev
Log:
HBASE-2120 [stargate] Unable to delete column families

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=899022&r1=899021&r2=899022&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Jan 14 01:39:27 2010
@@ -156,6 +156,8 @@
                (Kay Kay via JD)
    HBASE-2101  KeyValueSortReducer collapses all values to last passed
    HBASE-2119  Fix top-level NOTICES.txt file. Its stale.
+   HBASE-2120  [stargate] Unable to delete column families (Greg Lu via Andrew
+               Purtell)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java?rev=899022&r1=899021&r2=899022&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java (original)
+++ hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java Thu Jan 14 01:39:27 2010
@@ -281,13 +281,13 @@
     for (byte[] column: rowspec.getColumns()) {
       byte[][] split = KeyValue.parseColumn(column);
       if (rowspec.hasTimestamp()) {
-        if (split.length == 2) {
+        if (split.length == 2 && split[1].length != 0) {
           delete.deleteColumns(split[0], split[1], rowspec.getTimestamp());
         } else {
           delete.deleteFamily(split[0], rowspec.getTimestamp());
         }
       } else {
-        if (split.length == 2) {
+        if (split.length == 2 && split[1].length != 0) {
           delete.deleteColumns(split[0], split[1]);
         } else {
           delete.deleteFamily(split[0]);