Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 822A7200AF1 for ; Wed, 11 May 2016 17:56:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 812CA160A1B; Wed, 11 May 2016 15:56:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4FDA4160A19 for ; Wed, 11 May 2016 17:56:34 +0200 (CEST) Received: (qmail 94782 invoked by uid 500); 11 May 2016 15:56:30 -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 92466 invoked by uid 99); 11 May 2016 15:56:28 -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; Wed, 11 May 2016 15:56:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D3FBE0D64; Wed, 11 May 2016 15:56:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: misty@apache.org To: commits@hbase.apache.org Date: Wed, 11 May 2016 15:57:11 -0000 Message-Id: <7d2d87ceeed44c47b95d6858ece475e5@git.apache.org> In-Reply-To: <3a47684a6dc14a199cf6c9ebe39ae819@git.apache.org> References: <3a47684a6dc14a199cf6c9ebe39ae819@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/51] [partial] hbase-site git commit: Published site at c9ebcd4e296a31e0da43f513db3f5a8c3929c191. archived-at: Wed, 11 May 2016 15:56:35 -0000 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/apidocs/overview-tree.html ---------------------------------------------------------------------- diff --git a/apidocs/overview-tree.html b/apidocs/overview-tree.html index 82e8d15..d487383 100644 --- a/apidocs/overview-tree.html +++ b/apidocs/overview-tree.html @@ -850,24 +850,24 @@
  • org.apache.hadoop.hbase.util.Order
  • org.apache.hadoop.hbase.KeepDeletedCells
  • org.apache.hadoop.hbase.ProcedureState
  • +
  • org.apache.hadoop.hbase.io.encoding.DataBlockEncoding
  • org.apache.hadoop.hbase.filter.RegexStringComparator.EngineType
  • -
  • org.apache.hadoop.hbase.filter.Filter.ReturnCode
  • -
  • org.apache.hadoop.hbase.filter.CompareFilter.CompareOp
  • org.apache.hadoop.hbase.filter.BitComparator.BitwiseOp
  • +
  • org.apache.hadoop.hbase.filter.CompareFilter.CompareOp
  • +
  • org.apache.hadoop.hbase.filter.Filter.ReturnCode
  • org.apache.hadoop.hbase.filter.FilterList.Operator
  • -
  • org.apache.hadoop.hbase.io.encoding.DataBlockEncoding
  • +
  • org.apache.hadoop.hbase.regionserver.BloomType
  • org.apache.hadoop.hbase.quotas.ThrottlingException.Type
  • -
  • org.apache.hadoop.hbase.quotas.ThrottleType
  • org.apache.hadoop.hbase.quotas.QuotaScope
  • org.apache.hadoop.hbase.quotas.QuotaType
  • -
  • org.apache.hadoop.hbase.regionserver.BloomType
  • -
  • org.apache.hadoop.hbase.client.CompactionState
  • +
  • org.apache.hadoop.hbase.quotas.ThrottleType
  • +
  • org.apache.hadoop.hbase.client.Consistency
  • +
  • org.apache.hadoop.hbase.client.IsolationLevel
  • org.apache.hadoop.hbase.client.MasterSwitchType
  • +
  • org.apache.hadoop.hbase.client.CompactionState
  • org.apache.hadoop.hbase.client.CompactType
  • -
  • org.apache.hadoop.hbase.client.SnapshotType
  • -
  • org.apache.hadoop.hbase.client.IsolationLevel
  • org.apache.hadoop.hbase.client.Durability
  • -
  • org.apache.hadoop.hbase.client.Consistency
  • +
  • org.apache.hadoop.hbase.client.SnapshotType
  • org.apache.hadoop.hbase.client.security.SecurityCapability
  • http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/apidocs/src-html/org/apache/hadoop/hbase/util/ByteBufferUtils.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/util/ByteBufferUtils.html b/apidocs/src-html/org/apache/hadoop/hbase/util/ByteBufferUtils.html index 28fb3d5..ac98ffb 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/util/ByteBufferUtils.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/util/ByteBufferUtils.html @@ -948,52 +948,74 @@ 940 } 941 942 /** -943 * Copies specified number of bytes from given offset of 'in' ByteBuffer to -944 * the array. +943 * Copies bytes from given array's offset to length part into the given buffer. Puts the bytes +944 * to buffer's given position. 945 * @param out 946 * @param in -947 * @param sourceOffset -948 * @param destinationOffset -949 * @param length -950 */ -951 public static void copyFromBufferToArray(byte[] out, ByteBuffer in, int sourceOffset, -952 int destinationOffset, int length) { -953 if (in.hasArray()) { -954 System.arraycopy(in.array(), sourceOffset + in.arrayOffset(), out, destinationOffset, length); -955 } else if (UNSAFE_AVAIL) { -956 UnsafeAccess.copy(in, sourceOffset, out, destinationOffset, length); -957 } else { -958 int oldPos = in.position(); -959 in.position(sourceOffset); -960 in.get(out, destinationOffset, length); -961 in.position(oldPos); -962 } -963 } -964 -965 // For testing purpose -966 public static String toStringBinary(final ByteBuffer b, int off, int len) { -967 StringBuilder result = new StringBuilder(); -968 // Just in case we are passed a 'len' that is > buffer length... -969 if (off >= b.capacity()) -970 return result.toString(); -971 if (off + len > b.capacity()) -972 len = b.capacity() - off; -973 for (int i = off; i < off + len; ++i) { -974 int ch = b.get(i) & 0xFF; -975 if ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') -976 || " `~!@#$%^&*()-_=+[]{}|;:'\",.<>/?".indexOf(ch) >= 0) { -977 result.append((char) ch); -978 } else { -979 result.append(String.format("\\x%02X", ch)); -980 } -981 } -982 return result.toString(); -983 } -984 -985 public static String toStringBinary(final ByteBuffer b) { -986 return toStringBinary(b, 0, b.capacity()); -987 } -988} +947 * @param inOffset +948 * @param length +949 */ +950 public static void copyFromArrayToBuffer(ByteBuffer out, int outOffset, byte[] in, int inOffset, +951 int length) { +952 if (out.hasArray()) { +953 System.arraycopy(in, inOffset, out.array(), out.arrayOffset() + outOffset, length); +954 } else if (UNSAFE_AVAIL) { +955 UnsafeAccess.copy(in, inOffset, out, outOffset, length); +956 } else { +957 int oldPos = out.position(); +958 out.position(outOffset); +959 out.put(in, inOffset, length); +960 out.position(oldPos); +961 } +962 } +963 +964 /** +965 * Copies specified number of bytes from given offset of 'in' ByteBuffer to +966 * the array. +967 * @param out +968 * @param in +969 * @param sourceOffset +970 * @param destinationOffset +971 * @param length +972 */ +973 public static void copyFromBufferToArray(byte[] out, ByteBuffer in, int sourceOffset, +974 int destinationOffset, int length) { +975 if (in.hasArray()) { +976 System.arraycopy(in.array(), sourceOffset + in.arrayOffset(), out, destinationOffset, length); +977 } else if (UNSAFE_AVAIL) { +978 UnsafeAccess.copy(in, sourceOffset, out, destinationOffset, length); +979 } else { +980 int oldPos = in.position(); +981 in.position(sourceOffset); +982 in.get(out, destinationOffset, length); +983 in.position(oldPos); +984 } +985 } +986 +987 // For testing purpose +988 public static String toStringBinary(final ByteBuffer b, int off, int len) { +989 StringBuilder result = new StringBuilder(); +990 // Just in case we are passed a 'len' that is > buffer length... +991 if (off >= b.capacity()) +992 return result.toString(); +993 if (off + len > b.capacity()) +994 len = b.capacity() - off; +995 for (int i = off; i < off + len; ++i) { +996 int ch = b.get(i) & 0xFF; +997 if ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') +998 || " `~!@#$%^&*()-_=+[]{}|;:'\",.<>/?".indexOf(ch) >= 0) { +999 result.append((char) ch); +1000 } else { +1001 result.append(String.format("\\x%02X", ch)); +1002 } +1003 } +1004 return result.toString(); +1005 } +1006 +1007 public static String toStringBinary(final ByteBuffer b) { +1008 return toStringBinary(b, 0, b.capacity()); +1009 } +1010} http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 5c8b97b..1a4468f 100644 --- a/book.html +++ b/book.html @@ -33482,7 +33482,7 @@ The server will return cellblocks compressed using this same compressor as long http://git-wip-us.apache.org/repos/asf/hbase-site/blob/84ec2568/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index 5a946bb..499bdde 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ - + Apache HBase – Bulk Loads in Apache HBase (TM) @@ -305,7 +305,7 @@ under the License. --> <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2016-05-10</li> + <li id="publishDate" class="pull-right">Last Published: 2016-05-11</li> </p> </div>