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

HBASE-12413 Mismatch in the equals and hashcode methods of KeyValue (Jingcheng Du and Gariel Reid) 

Conflicts:
	hbase-common/src/main/java/org/apache/hadoop/hbase/CellComparator.java
	hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
This commit is contained in:
tedyu 2015-05-01 18:31:16 -07:00 committed by Andrew Purtell
parent 30d1fe2195
commit 9a4ea44d1e
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,6 @@ public class CellComparator implements Comparator<Cell>, Serializable {
/**
* Returns a hash code that is always the same for two Cells having a matching equals(..) result.
* Currently does not guard against nulls, but it could if necessary.
*/
public static int hashCode(Cell cell){
if (cell == null) {// return 0 for empty Cell
@ -258,9 +257,8 @@ public class CellComparator implements Comparator<Cell>, Serializable {
/**
* Returns a hash code that is always the same for two Cells having a matching
* equals(..) result. Currently does not guard against nulls, but it could if
* necessary. Note : Ignore mvcc while calculating the hashcode
*
* equals(..) result. Note : Ignore mvcc while calculating the hashcode
*
* @param cell
* @return hashCode
*/

11
hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
View File

@ -1123,15 +1123,12 @@ public class KeyValue implements Cell, HeapSize, Cloneable, SettableSequenceId,
return CellComparator.equals(this, (Cell)other);
}
/**
* In line with {@link #equals(Object)}, only uses the key portion, not the value.
*/
@Override
public int hashCode() {
byte[] b = getBuffer();
int start = getOffset(), end = getOffset() + getLength();
int h = b[start++];
for (int i = start; i < end; i++) {
h = (h * 13) ^ b[i];
}
return h;
return CellComparator.hashCodeIgnoreMvcc(this);
}
//---------------------------------------------------------------------------

20
hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
View File

@ -39,6 +39,8 @@ import org.apache.hadoop.hbase.KeyValue.MetaComparator;
import org.apache.hadoop.hbase.KeyValue.Type;
import org.apache.hadoop.hbase.util.Bytes;
import static org.junit.Assert.assertNotEquals;
public class TestKeyValue extends TestCase {
private static final Log LOG = LogFactory.getLog(TestKeyValue.class);
@ -829,4 +831,22 @@ public class TestKeyValue extends TestCase {
return this.kv.getTagsArray();
}
}
public void testEqualsAndHashCode() throws Exception {
KeyValue kvA1 = new KeyValue(Bytes.toBytes("key"), Bytes.toBytes("cf"),
Bytes.toBytes("qualA"), Bytes.toBytes("1"));
KeyValue kvA2 = new KeyValue(Bytes.toBytes("key"), Bytes.toBytes("cf"),
Bytes.toBytes("qualA"), Bytes.toBytes("2"));
// We set a different sequence id on kvA2 to demonstrate that the equals and hashCode also
// don't take this into account.
kvA2.setSequenceId(2);
KeyValue kvB = new KeyValue(Bytes.toBytes("key"), Bytes.toBytes("cf"),
Bytes.toBytes("qualB"), Bytes.toBytes("1"));
assertEquals(kvA1, kvA2);
assertNotEquals(kvA1, kvB);
assertEquals(kvA1.hashCode(), kvA2.hashCode());
assertNotEquals(kvA1.hashCode(), kvB.hashCode());
}
}