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:43:50 UTC
[3/4] hbase git commit: HBASE-12413 Mismatch in the equals and
hashcode methods of KeyValue (Jingcheng Du and Gariel Reid)
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
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9acaba27
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9acaba27
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9acaba27
Branch: refs/heads/branch-1.1
Commit: 9acaba276e482448c1869d3fd5c04872dc8b17f2
Parents: 7cc85d3
Author: tedyu <yu...@gmail.com>
Authored: Fri May 1 18:31:18 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri May 1 18:31:18 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/CellComparator.java | 6 ++----
.../java/org/apache/hadoop/hbase/KeyValue.java | 11 ++++-------
.../org/apache/hadoop/hbase/TestKeyValue.java | 20 ++++++++++++++++++++
3 files changed, 26 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9acaba27/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 46c0eaf..2c1cc09 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
@@ -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
*/
http://git-wip-us.apache.org/repos/asf/hbase/blob/9acaba27/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
index 48daa83..1275952 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
@@ -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);
}
//---------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9acaba27/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
index b41f692..c6a31b5 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
@@ -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 final Log LOG = LogFactory.getLog(this.getClass().getName());
@@ -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());
+ }
+
}