Repository: hbase Updated Branches: refs/heads/branch-1.2 8d8a7107d -> 8f05f84cc
HBASE-15569 Make Bytes.toStringBinary faster Signed-off-by: stack <st...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8f05f84c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8f05f84c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8f05f84c Branch: refs/heads/branch-1.2 Commit: 8f05f84cc94d39efa232fb3e53f0cffec92581f9 Parents: 8d8a710 Author: Junegunn Choi <junegun...@gmail.com> Authored: Thu Mar 31 13:20:26 2016 +0900 Committer: stack <st...@apache.org> Committed: Thu Mar 31 21:29:18 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/util/Bytes.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8f05f84c/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java index 52150c0..822da6a 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java @@ -367,7 +367,7 @@ public class Bytes { final byte [] b2) { return toString(b1, 0, b1.length) + sep + toString(b2, 0, b2.length); } - + /** * This method will convert utf8 encoded bytes into a string. If the given byte array is null, * this method will return null. @@ -438,6 +438,10 @@ public class Bytes { return toStringBinary(toBytes(buf)); } + private static final char[] HEX_CHARS_UPPER = { + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' + }; + /** * Write a printable representation of a byte array. Non-printable * characters are hex escaped in the format \\x%02X, eg: @@ -455,13 +459,12 @@ public class Bytes { if (off + len > b.length) len = b.length - off; for (int i = off; i < off + len ; ++i ) { int ch = b[i] & 0xFF; - if ((ch >= '0' && ch <= '9') - || (ch >= 'A' && ch <= 'Z') - || (ch >= 'a' && ch <= 'z') - || " `~!@#$%^&*()-_=+[]{}|;:'\",.<>/?".indexOf(ch) >= 0 ) { + if (ch >= ' ' && ch <= '~' && ch != '\\') { result.append((char)ch); } else { - result.append(String.format("\\x%02X", ch)); + result.append("\\x"); + result.append(HEX_CHARS_UPPER[ch / 0x10]); + result.append(HEX_CHARS_UPPER[ch % 0x10]); } } return result.toString();
