From 216e851892901e86eef8b5ffba703a159c95139f Mon Sep 17 00:00:00 2001 From: Sergey Soldatov Date: Mon, 20 Nov 2017 00:16:59 -0800 Subject: HBASE-19304 KEEP_DELETED_CELLS should ignore case --- .../src/main/java/org/apache/hadoop/hbase/KeepDeletedCells.java | 3 +++ .../org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/KeepDeletedCells.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/KeepDeletedCells.java index 32b6aa7..dd19fa1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/KeepDeletedCells.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/KeepDeletedCells.java @@ -45,4 +45,7 @@ public enum KeepDeletedCells { * time remove deleted cells after the TTL. */ TTL; + public static KeepDeletedCells getValue(String val) { + return valueOf(val.toUpperCase()); + } } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java index 14f7381..b8148e1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java @@ -898,7 +898,7 @@ public class ColumnFamilyDescriptorBuilder { @Override public KeepDeletedCells getKeepDeletedCells() { - return getStringOrDefault(KEEP_DELETED_CELLS_BYTES, KeepDeletedCells::valueOf, DEFAULT_KEEP_DELETED); + return getStringOrDefault(KEEP_DELETED_CELLS_BYTES, KeepDeletedCells::getValue, DEFAULT_KEEP_DELETED); } /** -- 2.5.4 (Apple Git-61)