From d79be3d6b0a3e13554293543d15fd1b9ec82675c Mon Sep 17 00:00:00 2001 From: Nirdosh Kumar Yadav Date: Mon, 5 Feb 2024 09:01:19 +0530 Subject: [PATCH 1/3] HBASE-28334: Remove unnecessary null DEFAULT_VALUE in TableDescriptorBuilder --- .../org/apache/hadoop/hbase/client/TableDescriptorBuilder.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java index 7cab90c7e378..3f80677a412b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java @@ -150,7 +150,6 @@ public class TableDescriptorBuilder { private static final Bytes ERASURE_CODING_POLICY_KEY = new Bytes(Bytes.toBytes(ERASURE_CODING_POLICY)); - private static final String DEFAULT_ERASURE_CODING_POLICY = null; /** * Used by shell/rest interface to access this metadata attribute which denotes if the table * should be treated by region normalizer. @@ -234,7 +233,6 @@ public class TableDescriptorBuilder { DEFAULT_VALUES.put(DURABILITY, DEFAULT_DURABLITY.name()); // use the enum name DEFAULT_VALUES.put(REGION_REPLICATION, String.valueOf(DEFAULT_REGION_REPLICATION)); DEFAULT_VALUES.put(PRIORITY, String.valueOf(DEFAULT_PRIORITY)); - DEFAULT_VALUES.put(ERASURE_CODING_POLICY, String.valueOf(DEFAULT_ERASURE_CODING_POLICY)); DEFAULT_VALUES.keySet().stream().map(s -> new Bytes(Bytes.toBytes(s))) .forEach(RESERVED_KEYWORDS::add); RESERVED_KEYWORDS.add(IS_META_KEY); From 93ecf169c4e23190f4949daf8a96366eb7a0aff5 Mon Sep 17 00:00:00 2001 From: Nirdosh Kumar Yadav Date: Mon, 5 Feb 2024 10:11:45 +0530 Subject: [PATCH 2/3] Updated Unit test comparision text --- .../hadoop/hbase/client/TestTableDescriptorBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java index 53f33845ef7d..c9197c6dace7 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java @@ -365,8 +365,9 @@ public void testStringCustomizedValues() throws HBaseException { .setMemStoreFlushSize("256MB").setErasureCodingPolicy("RS-6-3-1024k").build(); assertEquals( "'testStringCustomizedValues', " + "{TABLE_ATTRIBUTES => {DURABILITY => 'ASYNC_WAL', " - + "ERASURE_CODING_POLICY => 'RS-6-3-1024k', MAX_FILESIZE => '10737942528 B (10GB 512KB)', " - + "MEMSTORE_FLUSHSIZE => '268435456 B (256MB)'}}, " + + "MAX_FILESIZE => '10737942528 B (10GB 512KB)', " + + "MEMSTORE_FLUSHSIZE => '268435456 B (256MB)', " + + "METADATA => {'ERASURE_CODING_POLICY' => 'RS-6-3-1024k'}}}, " + "{NAME => 'cf', BLOCKSIZE => '131072 B (128KB)'}", htd.toStringCustomizedValues()); } From bd904b6546d39c9c3ae8e853e651adcb9eefe275 Mon Sep 17 00:00:00 2001 From: Nirdosh Kumar Yadav Date: Mon, 5 Feb 2024 17:38:02 +0530 Subject: [PATCH 3/3] Reverting the change --- .../apache/hadoop/hbase/client/TableDescriptorBuilder.java | 3 +++ .../hadoop/hbase/client/TestTableDescriptorBuilder.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java index 3f80677a412b..fcdbe4e4ae64 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java @@ -150,6 +150,7 @@ public class TableDescriptorBuilder { private static final Bytes ERASURE_CODING_POLICY_KEY = new Bytes(Bytes.toBytes(ERASURE_CODING_POLICY)); + private static final String DEFAULT_ERASURE_CODING_POLICY = null; /** * Used by shell/rest interface to access this metadata attribute which denotes if the table * should be treated by region normalizer. @@ -233,6 +234,8 @@ public class TableDescriptorBuilder { DEFAULT_VALUES.put(DURABILITY, DEFAULT_DURABLITY.name()); // use the enum name DEFAULT_VALUES.put(REGION_REPLICATION, String.valueOf(DEFAULT_REGION_REPLICATION)); DEFAULT_VALUES.put(PRIORITY, String.valueOf(DEFAULT_PRIORITY)); + // Setting ERASURE_CODING_POLICY to NULL so that it is not considered as metadata + DEFAULT_VALUES.put(ERASURE_CODING_POLICY, String.valueOf(DEFAULT_ERASURE_CODING_POLICY)); DEFAULT_VALUES.keySet().stream().map(s -> new Bytes(Bytes.toBytes(s))) .forEach(RESERVED_KEYWORDS::add); RESERVED_KEYWORDS.add(IS_META_KEY); diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java index c9197c6dace7..53f33845ef7d 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.java @@ -365,9 +365,8 @@ public void testStringCustomizedValues() throws HBaseException { .setMemStoreFlushSize("256MB").setErasureCodingPolicy("RS-6-3-1024k").build(); assertEquals( "'testStringCustomizedValues', " + "{TABLE_ATTRIBUTES => {DURABILITY => 'ASYNC_WAL', " - + "MAX_FILESIZE => '10737942528 B (10GB 512KB)', " - + "MEMSTORE_FLUSHSIZE => '268435456 B (256MB)', " - + "METADATA => {'ERASURE_CODING_POLICY' => 'RS-6-3-1024k'}}}, " + + "ERASURE_CODING_POLICY => 'RS-6-3-1024k', MAX_FILESIZE => '10737942528 B (10GB 512KB)', " + + "MEMSTORE_FLUSHSIZE => '268435456 B (256MB)'}}, " + "{NAME => 'cf', BLOCKSIZE => '131072 B (128KB)'}", htd.toStringCustomizedValues()); }