You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2009/04/01 21:24:02 UTC

svn commit: r761019 - in /hadoop/core/trunk: ./ src/core/org/apache/hadoop/io/ src/mapred/org/apache/hadoop/mapred/lib/ src/mapred/org/apache/hadoop/mapreduce/lib/partition/ src/test/org/apache/hadoop/mapred/lib/ src/test/org/apache/hadoop/mapreduce/li...

Author: shv
Date: Wed Apr  1 19:24:01 2009
New Revision: 761019

URL: http://svn.apache.org/viewvc?rev=761019&view=rev
Log:
Revert HADOOP-5528.

Removed:
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/lib/BinaryPartitioner.java
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapred/lib/TestBinaryPartitioner.java
    hadoop/core/trunk/src/test/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java
Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/core/org/apache/hadoop/io/WritableComparator.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=761019&r1=761018&r2=761019&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Apr  1 19:24:01 2009
@@ -68,9 +68,6 @@
     HADOOP-5363. Add support for proxying connections to multiple clusters with
     different versions to hdfsproxy. (Zhiyong Zhang via cdouglas)
 
-    HADOOP-5528. Add a configurable hash partitioner operating on ranges of
-    BinaryComparable keys. (Klaas Bosteels via cdouglas)
-
   IMPROVEMENTS
 
     HADOOP-4565. Added CombineFileInputFormat to use data locality information

Modified: hadoop/core/trunk/src/core/org/apache/hadoop/io/WritableComparator.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/io/WritableComparator.java?rev=761019&r1=761018&r2=761019&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/io/WritableComparator.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/io/WritableComparator.java Wed Apr  1 19:24:01 2009
@@ -135,17 +135,12 @@
   }
 
   /** Compute hash for binary data. */
-  public static int hashBytes(byte[] bytes, int offset, int length) {
+  public static int hashBytes(byte[] bytes, int length) {
     int hash = 1;
-    for (int i = offset; i < offset + length; i++)
+    for (int i = 0; i < length; i++)
       hash = (31 * hash) + (int)bytes[i];
     return hash;
   }
-  
-  /** Compute hash for binary data. */
-  public static int hashBytes(byte[] bytes, int length) {
-    return hashBytes(bytes, 0, length);
-  }
 
   /** Parse an unsigned short from a byte array. */
   public static int readUnsignedShort(byte[] bytes, int start) {