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

[apurtell]

Author: apurtell
Date: Thu Jan 14 10:39:48 2010
New Revision: 899154

URL: http://svn.apache.org/viewvc?rev=899154&view=rev
Log:
HBASE-2024 [stargate] Deletes not working as expected
HBASE-2122 [stargate] Initializing scanner column families doesn't work

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

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=899154&r1=899153&r2=899154&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Jan 14 10:39:48 2010
@@ -159,6 +159,10 @@
    HBASE-2120  [stargate] Unable to delete column families (Greg Lu via Andrew
                Purtell)
    HBASE-2123  Remove 'master' command-line option from PE
+   HBASE-2024  [stargate] Deletes not working as expected (Greg Lu via Andrew
+               Purtell)
+   HBASE-2122  [stargate] Initializing scanner column families doesn't work
+               (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=899154&r1=899153&r2=899154&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 10:39:48 2010
@@ -277,7 +277,13 @@
     if (LOG.isDebugEnabled()) {
       LOG.debug("DELETE " + uriInfo.getAbsolutePath());
     }
-    Delete delete = new Delete(rowspec.getRow());
+
+    Delete delete = null;
+    if (rowspec.hasTimestamp())
+      delete = new Delete(rowspec.getRow(), rowspec.getTimestamp(), null);
+    else
+      delete = new Delete(rowspec.getRow());
+
     for (byte[] column: rowspec.getColumns()) {
       byte[][] split = KeyValue.parseColumn(column);
       if (rowspec.hasTimestamp()) {

Modified: 
hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java?rev=899154&r1=899153&r2=899154&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java
 (original)
+++ 
hadoop/hbase/trunk/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java
 Thu Jan 14 10:39:48 2010
@@ -59,7 +59,7 @@
         byte[][] columns = rowspec.getColumns();
         for (byte[] column: columns) {
           byte[][] split = KeyValue.parseColumn(column);
-          if (split.length == 2) {
+          if (split.length == 2 && split[1].length != 0) {
             scan.addColumn(split[0], split[1]);
           } else {
             scan.addFamily(split[0]);