diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java index 2f6d11e..5c8fd25 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java @@ -791,7 +791,20 @@ public class HColumnDescriptor implements Comparable { return setValue(HConstants.IN_MEMORY, Boolean.toString(inMemory)); } - public KeepDeletedCells getKeepDeletedCells() { + /** + * (This will not work correctly for the new TTL setting.) + * @return the current KeepDeletedCells setting + * @deprecated use {@link #getKeepDeletedCellsEnum() instead} + */ + @Deprecated + public boolean getKeepDeletedCells() { + return KeepDeletedCells.TRUE.equals(getKeepDeletedCellsEnum()); + } + + /** + * @return the current KeepDeletedCells value + */ + public KeepDeletedCells getKeepDeletedCellsEnum() { String value = getValue(KEEP_DELETED_CELLS); if (value != null) { // toUpperCase for backwards compatibility diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java index 976876cf..11be698 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java @@ -68,7 +68,7 @@ public class TestHColumnDescriptor { assertEquals(hcd.getValue("a"), deserializedHcd.getValue("a")); assertEquals(hcd.getMaxVersions(), deserializedHcd.getMaxVersions()); assertEquals(hcd.getMinVersions(), deserializedHcd.getMinVersions()); - assertEquals(hcd.getKeepDeletedCells(), deserializedHcd.getKeepDeletedCells()); + assertEquals(hcd.getKeepDeletedCellsEnum(), deserializedHcd.getKeepDeletedCellsEnum()); assertEquals(inmemory, deserializedHcd.isInMemory()); assertEquals(hcd.getScope(), deserializedHcd.getScope()); assertTrue(deserializedHcd.getCompressionType().equals(Compression.Algorithm.SNAPPY)); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java index a8b314e..7e96fc3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScanInfo.java @@ -52,7 +52,7 @@ public class ScanInfo { public ScanInfo(final HColumnDescriptor family, final long ttl, final long timeToPurgeDeletes, final KVComparator comparator) { this(family.getName(), family.getMinVersions(), family.getMaxVersions(), ttl, family - .getKeepDeletedCells(), timeToPurgeDeletes, comparator); + .getKeepDeletedCellsEnum(), timeToPurgeDeletes, comparator); } /** diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java index 034d6bc..1c8d347 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java @@ -251,7 +251,7 @@ public class TestCoprocessorScanPolicy { HColumnDescriptor family = store.getFamily(); ScanInfo scanInfo = new ScanInfo(family.getName(), family.getMinVersions(), newVersions == null ? family.getMaxVersions() : newVersions, - newTtl == null ? oldSI.getTtl() : newTtl, family.getKeepDeletedCells(), + newTtl == null ? oldSI.getTtl() : newTtl, family.getKeepDeletedCellsEnum(), oldSI.getTimeToPurgeDeletes(), oldSI.getComparator()); Scan scan = new Scan(); scan.setMaxVersions(newVersions == null ? oldSI.getMaxVersions() : newVersions); @@ -271,7 +271,7 @@ public class TestCoprocessorScanPolicy { HColumnDescriptor family = store.getFamily(); ScanInfo scanInfo = new ScanInfo(family.getName(), family.getMinVersions(), newVersions == null ? family.getMaxVersions() : newVersions, - newTtl == null ? oldSI.getTtl() : newTtl, family.getKeepDeletedCells(), + newTtl == null ? oldSI.getTtl() : newTtl, family.getKeepDeletedCellsEnum(), oldSI.getTimeToPurgeDeletes(), oldSI.getComparator()); Scan scan = new Scan(); scan.setMaxVersions(newVersions == null ? oldSI.getMaxVersions() : newVersions); @@ -291,7 +291,7 @@ public class TestCoprocessorScanPolicy { HColumnDescriptor family = store.getFamily(); ScanInfo scanInfo = new ScanInfo(family.getName(), family.getMinVersions(), newVersions == null ? family.getMaxVersions() : newVersions, - newTtl == null ? oldSI.getTtl() : newTtl, family.getKeepDeletedCells(), + newTtl == null ? oldSI.getTtl() : newTtl, family.getKeepDeletedCellsEnum(), oldSI.getTimeToPurgeDeletes(), oldSI.getComparator()); return new StoreScanner(store, scanInfo, scan, targetCols, ((HStore) store).getHRegion().getReadpoint(IsolationLevel.READ_COMMITTED));