diff --git src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java index ae0471f..9c7c37b 100644 --- src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java +++ src/main/java/org/apache/hadoop/hbase/regionserver/ScanDeleteTracker.java @@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.regionserver.DeleteTracker.DeleteResult; import org.apache.hadoop.hbase.util.Bytes; /** @@ -43,7 +42,8 @@ import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Private public class ScanDeleteTracker implements DeleteTracker { - private long familyStamp = -1L; + private boolean hasFamilyStamp = false; + private long familyStamp = 0L; private byte [] deleteBuffer = null; private int deleteOffset = 0; private int deleteLength = 0; @@ -71,8 +71,9 @@ public class ScanDeleteTracker implements DeleteTracker { @Override public void add(byte[] buffer, int qualifierOffset, int qualifierLength, long timestamp, byte type) { - if (timestamp > familyStamp) { + if (!hasFamilyStamp || timestamp > familyStamp) { if (type == KeyValue.Type.DeleteFamily.getCode()) { + hasFamilyStamp = true; familyStamp = timestamp; return; } @@ -107,7 +108,7 @@ public class ScanDeleteTracker implements DeleteTracker { @Override public DeleteResult isDeleted(byte [] buffer, int qualifierOffset, int qualifierLength, long timestamp) { - if (timestamp <= familyStamp) { + if (hasFamilyStamp && timestamp <= familyStamp) { return DeleteResult.FAMILY_DELETED; } @@ -146,12 +147,13 @@ public class ScanDeleteTracker implements DeleteTracker { @Override public boolean isEmpty() { - return deleteBuffer == null && familyStamp == 0; + return deleteBuffer == null && !hasFamilyStamp; } @Override // called between every row. public void reset() { + hasFamilyStamp = false; familyStamp = 0L; deleteBuffer = null; } diff --git src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java index 7d0261c..bf186e1 100644 --- src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java @@ -377,11 +377,10 @@ public class TestCompaction extends HBaseTestCase { deleteVersion.deleteColumn(fam2, col2, 1); /* * the table has 4 versions: 0, 1, 2, and 3. - * 0 does not count. * We delete 1. - * Should have 2 remaining. + * Should have 3 remaining. */ - testMinorCompactionWithDelete(deleteVersion, 2); + testMinorCompactionWithDelete(deleteVersion, 3); } /* diff --git src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java index 13ed753..765f12b 100644 --- src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java +++ src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java @@ -110,6 +110,19 @@ public class TestScanDeleteTracker extends HBaseTestCase { assertEquals(false ,sdt.isEmpty()); } + public void testDelete_KeepVersionZero(){ + byte [] qualifier = Bytes.toBytes("qualifier"); + deleteType = KeyValue.Type.Delete.getCode(); + + long deleteTimestamp = 10; + long valueTimestamp = 0; + + sdt.reset(); + sdt.add(qualifier, 0, qualifier.length, deleteTimestamp, deleteType); + DeleteResult ret = sdt.isDeleted(qualifier, 0, qualifier.length, valueTimestamp); + assertEquals(DeleteResult.NOT_DELETED, ret); + } + @org.junit.Rule public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =