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

HBASE-3387 Pair does not deep check arrays for equality -- REVERTED 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1061082 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-01-20 00:47:29 +00:00
parent 64e6eb33d3
commit 0aade298db
3 changed files with 5 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -25,6 +25,7 @@ Release 0.91.0 - Unreleased
HBASE-3418 Increment operations can break when qualifiers are split
between memstore/snapshot and storefiles
HBASE-3403 Region orphaned after failure during split
HBASE-3387 Pair does not deep check arrays for equality -- REVERT THIS PATCH
IMPROVEMENTS
@ -57,7 +58,7 @@ Release 0.91.0 - Unreleased
HBASE-3256 Coprocessors: Coprocessor host and observer for HMaster
Release 0.90.0 - Unreleased
Release 0.90.0 - January 19th, 2011
INCOMPATIBLE CHANGES
HBASE-1822 Remove the deprecated APIs
HBASE-1848 Fixup shell for HBASE-1822

33
src/main/java/org/apache/hadoop/hbase/util/Pair.java
View File

@ -21,7 +21,6 @@
package org.apache.hadoop.hbase.util;
import java.io.Serializable;
import java.lang.reflect.Array;
/**
* A generic class for pairs.
@ -100,35 +99,9 @@ public class Pair<T1, T2> implements Serializable
return second;
}
private static boolean equals(Object x, Object y) {
if (x == null && y == null)
return true;
if (x != null && y != null) {
if (x.getClass().equals(y.getClass())) {
if (x.getClass().isArray() && y.getClass().isArray()) {
int len = Array.getLength(x) == Array.getLength(y) ? Array
.getLength(x) : -1;
if (len < 0)
return false;
for (int i = 0; i < len; i++) {
Object xi = Array.get(x, i);
Object yi = Array.get(y, i);
if (!xi.equals(yi))
return false;
}
return true;
} else {
return x.equals(y);
}
}
}
return false;
private static boolean equals(Object x, Object y)
{
return (x == null && y == null) || (x != null && x.equals(y));
}
@Override

79
src/test/java/org/apache/hadoop/hbase/util/TestPairEquals.java
View File

@ -1,79 +0,0 @@
/**
* Copyright 2010 The Apache Software Foundation
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.util;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
* Testing Testing {@link Pair#equals(Object)} for deep checking of arrays
*/
public class TestPairEquals {
/**
* Testing {@link Pair#equals(Object)} for deep checking of arrays
*/
@Test
public void testEquals() {
Pair<String, String> p1 = new Pair<String, String>("Hello", "World");
Pair<String, String> p1a = new Pair<String, String>("Hello", "World");
assertTrue(p1.equals(p1a));
Pair<String, byte[]> p2 = new Pair<String, byte[]>("Hello", new byte[] { 1,
0, 5 });
Pair<String, byte[]> p2a = new Pair<String, byte[]>("Hello", new byte[] {
1, 0, 5 });
// Previously this test would fail as they are two different pointers to
// arrays that inherently the same.
assertTrue(p2.equals(p2a));
Pair<char[], String> p3 = new Pair<char[], String>(new char[] { 'h', 'e' },
"world");
assertTrue(p3.equals(p3));
// These kinds of tests will still fail as they have fundamentally different
// elements
Pair<Character[], String> p4 = new Pair<Character[], String>(
new Character[] { new Character('h'), new Character('e') }, "world");
// checking for autoboxing non-equality to the original class
assertFalse(p3.equals(p4));
// still fail for a different autoboxing situation (just to prove that it
// is not just chars)
Pair<String, Integer[]> p5 = new Pair<String, Integer[]>("hello",
new Integer[] { new Integer(1), new Integer(982) });
Pair<String, int[]> p5a = new Pair<String, int[]>("hello", new int[] { 1,
982 });
assertFalse(p5.equals(p5a));
// will still fail for that different things
Pair<String, byte[]> p6 = new Pair<String, byte[]>("Hello", new byte[] { 1,
0, 4 });
assertFalse(p2.equals(p6));
// will still fail for the other predicate being different
Pair<String, byte[]> p7 = new Pair<String, byte[]>("World", new byte[] { 1,
0, 5 });
assertFalse(p2.equals(p7));
}
}