Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-20928 Rewrite calculation of midpoint in binarySearch functions to prevent overflow 

Signed-off-by: tedyu <yuzhihong@gmail.com>
This commit is contained in:
Saurabh Singh 2018-07-24 11:23:22 +05:30 committed by tedyu
parent 99701968c8
commit 097ae55708
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/RowIndexSeekerV1.java
View File

@ -126,10 +126,10 @@ public class RowIndexSeekerV1 extends AbstractEncodedSeeker {
private int binarySearch(Cell seekCell, boolean seekBefore) {
int low = 0;
int high = rowNumber - 1;
int mid = (low + high) >>> 1;
int mid = low + ((high - low) >> 1);
int comp = 0;
while (low <= high) {
mid = (low + high) >>> 1;
mid = low + ((high - low) >> 1);
ByteBuffer row = getRow(mid);
comp = compareRows(row, seekCell);
if (comp < 0) {

2
hbase-common/src/main/java/org/apache/hadoop/hbase/nio/ByteBuff.java
View File

@ -527,7 +527,7 @@ public abstract class ByteBuff {
int high = toIndex - 1;
while (low <= high) {
int mid = (low + high) >>> 1;
int mid = low + ((high - low) >> 1);
int midVal = a.get(mid) & 0xff;
if (midVal < unsignedKey) {

6
hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
View File

@ -2029,7 +2029,7 @@ public class Bytes implements Comparable<Bytes> {
int high = arr.length - 1;
while (low <= high) {
int mid = (low + high) >>> 1;
int mid = low + ((high - low) >> 1);
// we have to compare in this order, because the comparator order
// has special logic when the 'left side' is a special key.
int cmp = Bytes.BYTES_RAWCOMPARATOR
@ -2104,7 +2104,7 @@ public class Bytes implements Comparable<Bytes> {
int low = 0;
int high = arr.length - 1;
while (low <= high) {
int mid = (low+high) >>> 1;
int mid = low + ((high - low) >> 1);
// we have to compare in this order, because the comparator order
// has special logic when the 'left side' is a special key.
int cmp = comparator.compare(key, arr[mid]);
@ -2278,7 +2278,7 @@ public class Bytes implements Comparable<Bytes> {
int high = toIndex - 1;
while (low <= high) {
int mid = (low + high) >>> 1;
int mid = low + ((high - low) >> 1);
int midVal = a[mid] & 0xff;
if (midVal < unsignedKey) {

2
hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlockIndex.java
View File

@ -745,7 +745,7 @@ public class HFileBlockIndex {
ByteBufferKeyOnlyKeyValue nonRootIndexkeyOnlyKV = new ByteBufferKeyOnlyKeyValue();
ObjectIntPair<ByteBuffer> pair = new ObjectIntPair<>();
while (low <= high) {
mid = (low + high) >>> 1;
mid = low + ((high - low) >> 1);
// Midkey's offset relative to the end of secondary index
int midKeyRelOffset = nonRootIndex.getIntAfterPosition(Bytes.SIZEOF_INT * (mid + 1));

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CellFlatMap.java
View File

@ -83,7 +83,7 @@ public abstract class CellFlatMap implements NavigableMap<Cell,Cell> {
int end = maxCellIdx - 1;
while (begin <= end) {
int mid = (begin + end) >>> 1;
int mid = begin + ((end - begin) >> 1);
Cell midCell = getCell(mid);
int compareRes = comparator.compare(midCell, needle);

2
hbase-server/src/main/java/org/apache/hadoop/hbase/util/BoundedPriorityBlockingQueue.java
View File

@ -119,7 +119,7 @@ public class BoundedPriorityBlockingQueue<E> extends AbstractQueue<E> implements
private int upperBound(int start, int end, E key) {
while (start < end) {
int mid = (start + end) >>> 1;
int mid = start + ((end - start) >> 1);
E mitem = objects[mid];
int cmp = comparator.compare(mitem, key);
if (cmp > 0) {