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

HBASE-16692 Make ByteBufferUtils#equals safer and correct (binlijin)

This commit is contained in:
tedyu 2016-09-25 06:37:40 -07:00
parent 21969f5159
commit 3896d9ed0a
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferUtils.java
View File

@ -17,6 +17,7 @@
package org.apache.hadoop.hbase.util; package org.apache.hadoop.hbase.util;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -573,6 +574,10 @@ public final class ByteBufferUtils {
} }
public static boolean equals(ByteBuffer buf1, int o1, int l1, ByteBuffer buf2, int o2, int l2) { public static boolean equals(ByteBuffer buf1, int o1, int l1, ByteBuffer buf2, int o2, int l2) {
if ((l1 == 0) || (l2 == 0)) {
// both 0 length, return true, or else false
return l1 == l2;
}
// Since we're often comparing adjacent sorted data, // Since we're often comparing adjacent sorted data,
// it's usual to have equal arrays except for the very last byte // it's usual to have equal arrays except for the very last byte
// so check that first // so check that first
@ -627,6 +632,10 @@ public final class ByteBufferUtils {
} }
public static boolean equals(ByteBuffer buf1, int o1, int l1, byte[] buf2, int o2, int l2) { public static boolean equals(ByteBuffer buf1, int o1, int l1, byte[] buf2, int o2, int l2) {
if ((l1 == 0) || (l2 == 0)) {
// both 0 length, return true, or else false
return l1 == l2;
}
// Since we're often comparing adjacent sorted data, // Since we're often comparing adjacent sorted data,
// it's usual to have equal arrays except for the very last byte // it's usual to have equal arrays except for the very last byte
// so check that first // so check that first

29
hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java → hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.io.WritableUtils;
@ -398,6 +399,34 @@ public class TestByteBufferUtils {
assertTrue(result < 0); assertTrue(result < 0);
} }
@Test
public void testEquals() {
byte[] a = Bytes.toBytes("http://A");
ByteBuffer bb = ByteBuffer.wrap(a);
assertTrue(ByteBufferUtils.equals(HConstants.EMPTY_BYTE_BUFFER, 0, 0,
HConstants.EMPTY_BYTE_BUFFER, 0, 0));
assertFalse(ByteBufferUtils.equals(HConstants.EMPTY_BYTE_BUFFER, 0, 0, bb,
0, a.length));
assertFalse(ByteBufferUtils.equals(bb, 0, 0, HConstants.EMPTY_BYTE_BUFFER,
0, a.length));
assertTrue(ByteBufferUtils.equals(bb, 0, a.length, bb, 0, a.length));
assertTrue(ByteBufferUtils.equals(HConstants.EMPTY_BYTE_BUFFER, 0, 0,
HConstants.EMPTY_BYTE_ARRAY, 0, 0));
assertFalse(ByteBufferUtils.equals(HConstants.EMPTY_BYTE_BUFFER, 0, 0, a,
0, a.length));
assertFalse(ByteBufferUtils.equals(bb, 0, a.length,
HConstants.EMPTY_BYTE_ARRAY, 0, 0));
assertTrue(ByteBufferUtils.equals(bb, 0, a.length, a, 0, a.length));
}
private static void fillBB(ByteBuffer bb, byte b) { private static void fillBB(ByteBuffer bb, byte b) {
for (int i = bb.position(); i < bb.limit(); i++) { for (int i = bb.position(); i < bb.limit(); i++) {
bb.put(i, b); bb.put(i, b);