hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r599223 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt src/java/org/apache/hadoop/hbase/HStore.java
Date Thu, 29 Nov 2007 00:37:29 GMT
Author: stack
Date: Wed Nov 28 16:37:19 2007
New Revision: 599223

URL: http://svn.apache.org/viewvc?rev=599223&view=rev
Log:
HADOOP-2253 getRow can return HBASE::DELETEVAL cells

Modified:
    lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
    lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java

Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=599223&r1=599222&r2=599223&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Wed Nov 28 16:37:19 2007
@@ -37,6 +37,8 @@
    HADOOP-2276 Address regression caused by HADOOP-2274, fix HADOOP-2173 (When
                the master times out a region servers lease, the region server
                may not restart)
+   HADOOP-2253 getRow can return HBASE::DELETEVAL cells
+               (Bryan Duxbury via Stack)
 
   IMPROVEMENTS
     HADOOP-2401 Add convenience put method that takes writable

Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java?rev=599223&r1=599222&r2=599223&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java Wed
Nov 28 16:37:19 2007
@@ -187,7 +187,10 @@
         Text itCol = itKey.getColumn();
         if (results.get(itCol) == null && key.matchesWithoutColumn(itKey)) {
           byte [] val = tailMap.get(itKey);
-          results.put(itCol, val);
+
+          if (!HLogEdit.isDeleted(val)) {
+            results.put(itCol, val);
+          }
 
         } else if (key.getRow().compareTo(itKey.getRow()) < 0) {
           break;



Mime
View raw message