You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/01/21 16:59:06 UTC
svn commit: r1436434 - in /hbase/trunk:
hbase-common/src/main/java/org/apache/hadoop/hbase/
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/
Author: tedyu
Date: Mon Jan 21 15:59:06 2013
New Revision: 1436434
URL: http://svn.apache.org/viewvc?rev=1436434&view=rev
Log:
HBASE-6907 KeyValue equals and compareTo methods should match (Ted Yu)
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java?rev=1436434&r1=1436433&r2=1436434&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java Mon Jan 21 15:59:06 2013
@@ -842,16 +842,13 @@ public class KeyValue implements Cell, H
/**
* Needed doing 'contains' on List. Only compares the key portion, not the value.
- *
- * For temporary backwards compatibility with the original KeyValue.equals method, we ignore the
- * mvccVersion.
*/
@Override
public boolean equals(Object other) {
if (!(other instanceof Cell)) {
return false;
}
- return CellComparator.equalsIgnoreMvccVersion(this, (Cell)other);
+ return CellComparator.equals(this, (Cell)other);
}
@Override
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java?rev=1436434&r1=1436433&r2=1436434&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValueTestUtil.java Mon Jan 21 15:59:06 2013
@@ -23,10 +23,10 @@ import java.util.Collection;
import java.util.List;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.IterableUtils;
import org.apache.hadoop.hbase.util.Strings;
+import org.apache.hbase.cell.CellComparator;
import com.google.common.collect.Lists;
@@ -61,7 +61,6 @@ public class KeyValueTestUtil {
);
}
-
public static ByteBuffer toByteBufferAndRewind(final Iterable<? extends KeyValue> kvs,
boolean includeMemstoreTS) {
int totalBytes = KeyValueTool.totalLengthWithMvccVersion(kvs, includeMemstoreTS);
@@ -73,6 +72,27 @@ public class KeyValueTestUtil {
return bb;
}
+ /**
+ * Checks whether KeyValues from kvCollection2 are contained in kvCollection1.
+ *
+ * The comparison is made without distinguishing MVCC version of the KeyValues
+ *
+ * @param kvCollection1
+ * @param kvCollection2
+ * @return true if KeyValues from kvCollection2 are contained in kvCollection1
+ */
+ public static boolean containsIgnoreMvccVersion(Collection<KeyValue> kvCollection1,
+ Collection<KeyValue> kvCollection2) {
+ for (KeyValue kv1 : kvCollection1) {
+ boolean found = false;
+ for (KeyValue kv2 : kvCollection2) {
+ if (CellComparator.equalsIgnoreMvccVersion(kv1, kv2)) found = true;
+ }
+ if (!found) return false;
+ }
+ return true;
+ }
+
public static List<KeyValue> rewindThenToList(final ByteBuffer bb,
final boolean includesMemstoreTS) {
bb.rewind();
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java?rev=1436434&r1=1436433&r2=1436434&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java Mon Jan 21 15:59:06 2013
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hbase.cell.CellComparator;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -149,7 +150,7 @@ public class TestColumnSeeking {
while (scanner.next(results))
;
assertEquals(kvSet.size(), results.size());
- assertTrue(results.containsAll(kvSet));
+ assertTrue(KeyValueTestUtil.containsIgnoreMvccVersion(results, kvSet));
}
} finally {
HRegion.closeHRegion(region);
@@ -260,7 +261,7 @@ public class TestColumnSeeking {
while (scanner.next(results))
;
assertEquals(kvSet.size(), results.size());
- assertTrue(results.containsAll(kvSet));
+ assertTrue(KeyValueTestUtil.containsIgnoreMvccVersion(results, kvSet));
}
HRegion.closeHRegion(region);
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=1436434&r1=1436433&r2=1436434&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java Mon Jan 21 15:59:06 2013
@@ -90,6 +90,7 @@ import org.apache.hadoop.hbase.util.Incr
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.PairOfSameType;
import org.apache.hadoop.hbase.util.Threads;
+import org.apache.hbase.cell.CellComparator;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -1910,8 +1911,8 @@ public class TestHRegion extends HBaseTe
res = new ArrayList<KeyValue>();
is.next(res);
- for(int i=0; i<res.size(); i++) {
- assertEquals(expected1.get(i), res.get(i));
+ for (int i = 0; i < res.size(); i++) {
+ assertTrue(CellComparator.equalsIgnoreMvccVersion(expected1.get(i), res.get(i)));
}
//Result 2
@@ -1922,7 +1923,7 @@ public class TestHRegion extends HBaseTe
res = new ArrayList<KeyValue>();
is.next(res);
for(int i=0; i<res.size(); i++) {
- assertEquals(expected2.get(i), res.get(i));
+ assertTrue(CellComparator.equalsIgnoreMvccVersion(expected2.get(i), res.get(i)));
}
} finally {
HRegion.closeHRegion(this.region);
@@ -2046,7 +2047,7 @@ public class TestHRegion extends HBaseTe
//Verify result
for(int i=0; i<expected.size(); i++) {
- assertEquals(expected.get(i), actual.get(i));
+ assertTrue(CellComparator.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));
}
} finally {
HRegion.closeHRegion(this.region);
@@ -2129,7 +2130,7 @@ public class TestHRegion extends HBaseTe
//Verify result
for(int i=0; i<expected.size(); i++) {
- assertEquals(expected.get(i), actual.get(i));
+ assertTrue(CellComparator.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));
}
} finally {
HRegion.closeHRegion(this.region);
@@ -2253,7 +2254,7 @@ public class TestHRegion extends HBaseTe
//Verify result
for(int i=0; i<expected.size(); i++) {
- assertEquals(expected.get(i), actual.get(i));
+ assertTrue(CellComparator.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));
}
} finally {
HRegion.closeHRegion(this.region);
@@ -2412,7 +2413,7 @@ public class TestHRegion extends HBaseTe
//Verify result
for(int i=0; i<expected.size(); i++) {
- assertEquals(expected.get(i), actual.get(i));
+ assertTrue(CellComparator.equalsIgnoreMvccVersion(expected.get(i), actual.get(i)));
}
} finally {
HRegion.closeHRegion(this.region);
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java?rev=1436434&r1=1436433&r2=1436434&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java Mon Jan 21 15:59:06 2013
@@ -48,7 +48,7 @@ import org.apache.hadoop.hbase.client.Sc
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.util.Bytes;
-import org.junit.Before;
+import org.apache.hbase.cell.CellComparator;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -262,8 +262,8 @@ public class TestMultiColumnScanner {
}
assertTrue("Scanner returned additional key/value: " + kv + ", "
+ queryInfo + deleteInfo + ";", kvPos < kvs.size());
- assertEquals("Scanner returned wrong key/value; " + queryInfo
- + deleteInfo + ";", kvs.get(kvPos), kv);
+ assertTrue("Scanner returned wrong key/value; " + queryInfo
+ + deleteInfo + ";", CellComparator.equalsIgnoreMvccVersion(kvs.get(kvPos), (kv)));
++kvPos;
++numResults;
}