Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63279197D6 for ; Fri, 8 Apr 2016 19:31:57 +0000 (UTC) Received: (qmail 21267 invoked by uid 500); 8 Apr 2016 19:31:55 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 21081 invoked by uid 500); 8 Apr 2016 19:31:55 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 19911 invoked by uid 99); 8 Apr 2016 19:31:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Apr 2016 19:31:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25564E9E99; Fri, 8 Apr 2016 19:31:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Date: Fri, 08 Apr 2016 19:32:12 -0000 Message-Id: <2f46276ba6ca4a65b21b988bc57fbaf9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/52] [abbrv] hbase git commit: HBASE-15569 Make Bytes.toStringBinary faster HBASE-15569 Make Bytes.toStringBinary faster Signed-off-by: stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ff6a3395 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ff6a3395 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ff6a3395 Branch: refs/heads/HBASE-14850 Commit: ff6a3395821fd1a7857b35b11d45b81743a75e61 Parents: 7d3a89c Author: Junegunn Choi Authored: Thu Mar 31 13:20:26 2016 +0900 Committer: stack Committed: Thu Mar 31 21:23:44 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/util/Bytes.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ff6a3395/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 aae6c4c..7b9eb0b 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 @@ -626,6 +626,10 @@ public class Bytes implements Comparable { 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: @@ -643,13 +647,12 @@ public class Bytes implements Comparable { 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();