svn commit: r1126600 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java

[st...@apache.org]

Author: stack
Date: Mon May 23 17:13:43 2011
New Revision: 1126600

URL: http://svn.apache.org/viewvc?rev=1126600&view=rev
Log:
HBASE-3908 TableSplit not implementing hashCode problem

Added:
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java
Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1126600&r1=1126599&r2=1126600&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon May 23 17:13:43 2011
@@ -277,6 +277,7 @@ Release 0.90.4 - Unreleased
                cause data-loss (Jieshan Bean)
    HBASE-3905  HBaseAdmin.createTableAsync() should check for invalid split
                keys (Ted Yu)
+   HBASE-3908  TableSplit not implementing "hashCode" problem (Daniel Iancu)
 
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java?rev=1126600&r1=1126599&r2=1126600&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java Mon May 23 17:13:43 2011
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.mapreduc
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.util.Arrays;
 
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -183,4 +184,13 @@ implements Writable, Comparable<TableSpl
       Bytes.equals(endRow, ((TableSplit)o).endRow) &&
       regionLocation.equals(((TableSplit)o).regionLocation);
   }
+
+    @Override
+    public int hashCode() {
+        int result = tableName != null ? Arrays.hashCode(tableName) : 0;
+        result = 31 * result + (startRow != null ? Arrays.hashCode(startRow) : 0);
+        result = 31 * result + (endRow != null ? Arrays.hashCode(endRow) : 0);
+        result = 31 * result + (regionLocation != null ? regionLocation.hashCode() : 0);
+        return result;
+    }
 }

Added: hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java?rev=1126600&view=auto
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java (added)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java Mon May 23 17:13:43 2011
@@ -0,0 +1,39 @@
+/**
+ * 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.mapreduce;
+
+import org.junit.Test;
+
+import java.util.HashSet;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TestTableSplit {
+  @Test
+  public void testHashCode() {
+    TableSplit split1 = new TableSplit("table".getBytes(), "row-start".getBytes(), "row-end".getBytes(), "location");
+    TableSplit split2 = new TableSplit("table".getBytes(), "row-start".getBytes(), "row-end".getBytes(), "location");
+    assertEquals (split1, split2);
+    assertTrue   (split1.hashCode() == split2.hashCode());
+    HashSet<TableSplit> set = new HashSet<TableSplit>(2);
+    set.add(split1);
+    set.add(split2);
+    assertTrue(set.size() == 1);
+  }
+}