You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/05/02 03:18:42 UTC
[2/4] hbase git commit: HBASE-12415 Add add(byte[][] arrays) to Bytes
(Jean-Marc Spaggiari)
HBASE-12415 Add add(byte[][] arrays) to Bytes (Jean-Marc Spaggiari)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7cc85d36
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7cc85d36
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7cc85d36
Branch: refs/heads/branch-1.1
Commit: 7cc85d367f1e61e104977de2f9219a99edfd5f07
Parents: bbcc9c2
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri May 1 18:12:36 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 18:16:25 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/Bytes.java | 18 ++++++++++++++++++
.../org/apache/hadoop/hbase/util/TestBytes.java | 13 +++++++++++++
2 files changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7cc85d36/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 5695b94..c59071c 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
@@ -1617,6 +1617,24 @@ public class Bytes {
}
/**
+ * @param arrays all the arrays to concatenate together.
+ * @return New array made from the concatenation of the given arrays.
+ */
+ public static byte [] add(final byte [][] arrays) {
+ int length = 0;
+ for (int i = 0; i < arrays.length; i++) {
+ length += arrays[i].length;
+ }
+ byte [] result = new byte[length];
+ int index = 0;
+ for (int i = 0; i < arrays.length; i++) {
+ System.arraycopy(arrays[i], 0, result, index, arrays[i].length);
+ index += arrays[i].length;
+ }
+ return result;
+ }
+
+ /**
* @param a array
* @param length amount of bytes to grab
* @return First <code>length</code> bytes from <code>a</code>
http://git-wip-us.apache.org/repos/asf/hbase/blob/7cc85d36/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
index 5c798ac..75baa03 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
@@ -48,6 +48,19 @@ public class TestBytes extends TestCase {
assertNotNull(ee);
}
+ public void testAdd () throws Exception {
+ byte[] a = {0,0,0,0,0,0,0,0,0,0};
+ byte[] b = {1,1,1,1,1,1,1,1,1,1,1};
+ byte[] c = {2,2,2,2,2,2,2,2,2,2,2,2};
+ byte[] d = {3,3,3,3,3,3,3,3,3,3,3,3,3};
+ byte[] result1 = Bytes.add (a, b, c);
+ byte[] result2 = Bytes.add (new byte[][] {a, b, c});
+ assertEquals(0, Bytes.compareTo(result1, result2));
+ byte[] result4 = Bytes.add (result1, d);
+ byte[] result5 = Bytes.add (new byte[][] {result1, d});
+ assertEquals(0, Bytes.compareTo(result1, result2));
+ }
+
public void testSplit() throws Exception {
byte [] lowest = Bytes.toBytes("AAA");
byte [] middle = Bytes.toBytes("CCC");