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 11:38:59 UTC
svn commit: r899153 - in /hadoop/hbase/branches/0.20: 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
Author: apurtell
Date: Thu Jan 14 10:38:59 2010
New Revision: 899153
URL: http://svn.apache.org/viewvc?rev=899153&view=rev
Log:
HBASE-2024 [stargate] Deletes not working as expected
HBASE-2122 [stargate] Initializing scanner column families doesn't work
Modified:
hadoop/hbase/branches/0.20/CHANGES.txt
hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java
Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=899153&r1=899152&r2=899153&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Thu Jan 14 10:38:59 2010
@@ -50,6 +50,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-1970 Export does one version only; make it configurable how many
Modified: hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java?rev=899153&r1=899152&r2=899153&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java (original)
+++ hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/RowResource.java Thu Jan 14 10:38:59 2010
@@ -271,7 +271,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/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java?rev=899153&r1=899152&r2=899153&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java (original)
+++ hadoop/hbase/branches/0.20/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/ScannerResultGenerator.java Thu Jan 14 10:38:59 2010
@@ -59,7 +59,7 @@
byte[][] columns = rowspec.getColumns();
for (byte[] column: columns) {
byte[][] split = KeyValue.parseColumn(column);
- if (split[1] != null) {
+ if (split.length == 2 && split[1].length != 0) {
scan.addColumn(split[0], split[1]);
} else {
scan.addFamily(split[0]);