You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2021/01/15 05:45:41 UTC

[hbase] branch master updated: HBASE-25439 Add BYTE unit in PrettyPrinter.Unit (addendum) (#2841)

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d34623  HBASE-25439 Add BYTE unit in PrettyPrinter.Unit (addendum) (#2841)
3d34623 is described below

commit 3d34623163a71db55757347ef8e1e57a48ac0e56
Author: Baiqiang Zhao <zb...@gmail.com>
AuthorDate: Fri Jan 15 13:45:08 2021 +0800

    HBASE-25439 Add BYTE unit in PrettyPrinter.Unit (addendum) (#2841)
    
    Signed-off-by: stack <st...@apache.org>
---
 .../org/apache/hadoop/hbase/client/TableDescriptorBuilder.java    | 1 +
 .../apache/hadoop/hbase/client/TestTableDescriptorBuilder.java    | 8 ++++++--
 2 files changed, 7 insertions(+), 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 fd46665..d983868 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
@@ -251,6 +251,7 @@ public class TableDescriptorBuilder {
   public static PrettyPrinter.Unit getUnit(String key) {
     switch (key) {
       case MAX_FILESIZE:
+      case MEMSTORE_FLUSHSIZE:
         return PrettyPrinter.Unit.BYTE;
       default:
         return PrettyPrinter.Unit.NONE;
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 425d590..43824af 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
@@ -348,11 +348,15 @@ public class TestTableDescriptorBuilder {
         "{TABLE_ATTRIBUTES => {DURABILITY => 'ASYNC_WAL'}}, {NAME => 'cf', BLOCKSIZE => '1000'}",
       htd.toStringCustomizedValues());
 
-    htd = TableDescriptorBuilder.newBuilder(htd).setMaxFileSize("10737942528").build();
+    htd = TableDescriptorBuilder.newBuilder(htd)
+      .setMaxFileSize("10737942528")
+      .setMemStoreFlushSize("256MB")
+      .build();
     assertEquals(
       "'testStringCustomizedValues', " +
         "{TABLE_ATTRIBUTES => {DURABILITY => 'ASYNC_WAL', "
-        + "MAX_FILESIZE => '10737942528 B (10GB 512KB)'}}, {NAME => 'cf', BLOCKSIZE => '1000'}",
+        + "MAX_FILESIZE => '10737942528 B (10GB 512KB)', "
+        + "MEMSTORE_FLUSHSIZE => '268435456 B (256MB)'}}, {NAME => 'cf', BLOCKSIZE => '1000'}",
       htd.toStringCustomizedValues());
   }