瀏覽代碼

HADOOP-2253 getRow can return HBASE::DELETEVAL cells

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@599223 13f79535-47bb-0310-9956-ffa450edef68
Michael Stack 17 年之前
父節點
當前提交
7d31fd18c9
共有 2 個文件被更改,包括 6 次插入1 次删除
  1. 2 0
      src/contrib/hbase/CHANGES.txt
  2. 4 1
      src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java

+ 2 - 0
src/contrib/hbase/CHANGES.txt

@@ -37,6 +37,8 @@ Trunk (unreleased changes)
    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

+ 4 - 1
src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java

@@ -187,7 +187,10 @@ class HStore implements HConstants {
         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;