You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2015/07/05 21:23:22 UTC
[1/4] hbase git commit: HBASE-13329 ArrayIndexOutOfBoundsException in
CellComparator#getMinimumMidpointArray.
Repository: hbase
Updated Branches:
refs/heads/branch-1 9e54e195f -> 29969dcf5
refs/heads/branch-1.0 ec4ff44e6 -> 4b934b573
refs/heads/branch-1.1 8392861f3 -> 53a22c9ce
refs/heads/branch-1.2 23d05e60e -> e3f0705f1
HBASE-13329 ArrayIndexOutOfBoundsException in CellComparator#getMinimumMidpointArray.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/29969dcf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/29969dcf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/29969dcf
Branch: refs/heads/branch-1
Commit: 29969dcf5c3f128a89318f55e952e154a2bac26e
Parents: 9e54e19
Author: Lars Hofhansl <la...@apache.org>
Authored: Sun Jul 5 12:18:59 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Sun Jul 5 12:18:59 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/CellComparator.java | 2 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/29969dcf/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
index fc5860a..d8fcfe4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
@@ -486,7 +486,7 @@ public class CellComparator implements Comparator<Cell>, Serializable {
final byte [] rightArray, final int rightOffset, final int rightLength) {
// rows are different
int minLength = leftLength < rightLength ? leftLength : rightLength;
- short diffIdx = 0;
+ int diffIdx = 0;
while (diffIdx < minLength &&
leftArray[leftOffset + diffIdx] == rightArray[rightOffset + diffIdx]) {
diffIdx++;
http://git-wip-us.apache.org/repos/asf/hbase/blob/29969dcf/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 3bc7a12..a6e7293 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -3343,6 +3343,30 @@ public class TestHRegion {
}
}
+ /**
+ * Write an HFile block full with Cells whose qualifier that are identical between
+ * 0 and Short.MAX_VALUE. See HBASE-13329.
+ * @throws Exception
+ */
+ @Test
+ public void testLongQualifier() throws Exception {
+ String method = name.getMethodName();
+ TableName tableName = TableName.valueOf(method);
+ byte[] family = Bytes.toBytes("family");
+ this.region = initHRegion(tableName, method, CONF, family);
+ byte[] q = new byte[Short.MAX_VALUE+2];
+ Arrays.fill(q, 0, q.length-1, (byte)42);
+ for (byte i=0; i<10; i++) {
+ Put p = new Put(Bytes.toBytes("row"));
+ // qualifiers that differ past Short.MAX_VALUE
+ q[q.length-1]=i;
+ p.addColumn(family, q, q);
+ region.put(p);
+ }
+ region.flush(false);
+ HRegion.closeHRegion(this.region);
+ this.region = null;
+ }
// ////////////////////////////////////////////////////////////////////////////
// Split test
// ////////////////////////////////////////////////////////////////////////////
[4/4] hbase git commit: HBASE-13329 ArrayIndexOutOfBoundsException in
CellComparator#getMinimumMidpointArray.
Posted by la...@apache.org.
HBASE-13329 ArrayIndexOutOfBoundsException in CellComparator#getMinimumMidpointArray.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4b934b57
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b934b57
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b934b57
Branch: refs/heads/branch-1.0
Commit: 4b934b5734238675e27aaf426e4236e61c57d538
Parents: ec4ff44
Author: Lars Hofhansl <la...@apache.org>
Authored: Sun Jul 5 12:18:59 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Sun Jul 5 12:22:40 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/CellComparator.java | 2 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4b934b57/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
index 2c1cc09..5f87858 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
@@ -472,7 +472,7 @@ public class CellComparator implements Comparator<Cell>, Serializable {
final byte [] rightArray, final int rightOffset, final int rightLength) {
// rows are different
int minLength = leftLength < rightLength ? leftLength : rightLength;
- short diffIdx = 0;
+ int diffIdx = 0;
while (diffIdx < minLength &&
leftArray[leftOffset + diffIdx] == rightArray[rightOffset + diffIdx]) {
diffIdx++;
http://git-wip-us.apache.org/repos/asf/hbase/blob/4b934b57/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 7bf6802..a20c271 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -3306,6 +3306,30 @@ public class TestHRegion {
}
}
+ /**
+ * Write an HFile block full with Cells whose qualifier that are identical between
+ * 0 and Short.MAX_VALUE. See HBASE-13329.
+ * @throws Exception
+ */
+ @Test
+ public void testLongQualifier() throws Exception {
+ String method = name.getMethodName();
+ TableName tableName = TableName.valueOf(method);
+ byte[] family = Bytes.toBytes("family");
+ this.region = initHRegion(tableName, method, CONF, family);
+ byte[] q = new byte[Short.MAX_VALUE+2];
+ Arrays.fill(q, 0, q.length-1, (byte)42);
+ for (byte i=0; i<10; i++) {
+ Put p = new Put(Bytes.toBytes("row"));
+ // qualifiers that differ past Short.MAX_VALUE
+ q[q.length-1]=i;
+ p.addColumn(family, q, q);
+ region.put(p);
+ }
+ region.flushcache();
+ HRegion.closeHRegion(this.region);
+ this.region = null;
+ }
// ////////////////////////////////////////////////////////////////////////////
// Split test
// ////////////////////////////////////////////////////////////////////////////
[2/4] hbase git commit: HBASE-13329 ArrayIndexOutOfBoundsException in
CellComparator#getMinimumMidpointArray.
Posted by la...@apache.org.
HBASE-13329 ArrayIndexOutOfBoundsException in CellComparator#getMinimumMidpointArray.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e3f0705f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e3f0705f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e3f0705f
Branch: refs/heads/branch-1.2
Commit: e3f0705f19638ff9e98e36b3eaf0c0b2463bcaf6
Parents: 23d05e6
Author: Lars Hofhansl <la...@apache.org>
Authored: Sun Jul 5 12:18:59 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Sun Jul 5 12:19:19 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/CellComparator.java | 2 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e3f0705f/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
index fc5860a..d8fcfe4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
@@ -486,7 +486,7 @@ public class CellComparator implements Comparator<Cell>, Serializable {
final byte [] rightArray, final int rightOffset, final int rightLength) {
// rows are different
int minLength = leftLength < rightLength ? leftLength : rightLength;
- short diffIdx = 0;
+ int diffIdx = 0;
while (diffIdx < minLength &&
leftArray[leftOffset + diffIdx] == rightArray[rightOffset + diffIdx]) {
diffIdx++;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e3f0705f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 3bc7a12..a6e7293 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -3343,6 +3343,30 @@ public class TestHRegion {
}
}
+ /**
+ * Write an HFile block full with Cells whose qualifier that are identical between
+ * 0 and Short.MAX_VALUE. See HBASE-13329.
+ * @throws Exception
+ */
+ @Test
+ public void testLongQualifier() throws Exception {
+ String method = name.getMethodName();
+ TableName tableName = TableName.valueOf(method);
+ byte[] family = Bytes.toBytes("family");
+ this.region = initHRegion(tableName, method, CONF, family);
+ byte[] q = new byte[Short.MAX_VALUE+2];
+ Arrays.fill(q, 0, q.length-1, (byte)42);
+ for (byte i=0; i<10; i++) {
+ Put p = new Put(Bytes.toBytes("row"));
+ // qualifiers that differ past Short.MAX_VALUE
+ q[q.length-1]=i;
+ p.addColumn(family, q, q);
+ region.put(p);
+ }
+ region.flush(false);
+ HRegion.closeHRegion(this.region);
+ this.region = null;
+ }
// ////////////////////////////////////////////////////////////////////////////
// Split test
// ////////////////////////////////////////////////////////////////////////////
[3/4] hbase git commit: HBASE-13329 ArrayIndexOutOfBoundsException in
CellComparator#getMinimumMidpointArray.
Posted by la...@apache.org.
HBASE-13329 ArrayIndexOutOfBoundsException in CellComparator#getMinimumMidpointArray.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/53a22c9c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/53a22c9c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/53a22c9c
Branch: refs/heads/branch-1.1
Commit: 53a22c9ce5f79d36f0943c83fb57fb6165c63d08
Parents: 8392861
Author: Lars Hofhansl <la...@apache.org>
Authored: Sun Jul 5 12:18:59 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Sun Jul 5 12:19:50 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/CellComparator.java | 2 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/53a22c9c/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
index 2c1cc09..5f87858 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
@@ -472,7 +472,7 @@ public class CellComparator implements Comparator<Cell>, Serializable {
final byte [] rightArray, final int rightOffset, final int rightLength) {
// rows are different
int minLength = leftLength < rightLength ? leftLength : rightLength;
- short diffIdx = 0;
+ int diffIdx = 0;
while (diffIdx < minLength &&
leftArray[leftOffset + diffIdx] == rightArray[rightOffset + diffIdx]) {
diffIdx++;
http://git-wip-us.apache.org/repos/asf/hbase/blob/53a22c9c/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 3b023f0..24918ad 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -3314,6 +3314,30 @@ public class TestHRegion {
}
}
+ /**
+ * Write an HFile block full with Cells whose qualifier that are identical between
+ * 0 and Short.MAX_VALUE. See HBASE-13329.
+ * @throws Exception
+ */
+ @Test
+ public void testLongQualifier() throws Exception {
+ String method = name.getMethodName();
+ TableName tableName = TableName.valueOf(method);
+ byte[] family = Bytes.toBytes("family");
+ this.region = initHRegion(tableName, method, CONF, family);
+ byte[] q = new byte[Short.MAX_VALUE+2];
+ Arrays.fill(q, 0, q.length-1, (byte)42);
+ for (byte i=0; i<10; i++) {
+ Put p = new Put(Bytes.toBytes("row"));
+ // qualifiers that differ past Short.MAX_VALUE
+ q[q.length-1]=i;
+ p.addColumn(family, q, q);
+ region.put(p);
+ }
+ region.flush(false);
+ HRegion.closeHRegion(this.region);
+ this.region = null;
+ }
// ////////////////////////////////////////////////////////////////////////////
// Split test
// ////////////////////////////////////////////////////////////////////////////