hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1100058 - in /hadoop/common/branches/branch-0.21: ./ CHANGES.txt src/contrib/ec2/ src/docs/ src/java/ src/java/org/apache/hadoop/io/WritableComparator.java src/test/core/
Date Fri, 06 May 2011 05:09:21 GMT
Author: eli
Date: Fri May  6 05:09:21 2011
New Revision: 1100058

URL: http://svn.apache.org/viewvc?rev=1100058&view=rev
Log:
HADOOP-7183. svn merge -c 1100056 from trunk


Modified:
    hadoop/common/branches/branch-0.21/   (props changed)
    hadoop/common/branches/branch-0.21/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-0.21/src/contrib/ec2/   (props changed)
    hadoop/common/branches/branch-0.21/src/docs/   (props changed)
    hadoop/common/branches/branch-0.21/src/java/   (props changed)
    hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/WritableComparator.java
    hadoop/common/branches/branch-0.21/src/test/core/   (props changed)

Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 05:09:21 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797
+/hadoop/common/trunk:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797,1100056
 /hadoop/core/branches/branch-0.19/core:713112

Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=1100058&r1=1100057&r2=1100058&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Fri May  6 05:09:21 2011
@@ -54,6 +54,9 @@ Release 0.21.1 - Unreleased
     HADOOP-7194. Fix resource leak in IOUtils.copyBytes(..).
     (Devaraj K via szetszwo)
 
+    HADOOP-7183. WritableComparator.get should not cache comparator objects.
+    (tomwhite via eli)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 05:09:21 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504,955438,961559,962914,964130,964134,964939,966508,966919,967220,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504,955438,961559,962914,964130,964134,964939,966508,966919,967220,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797,1100056
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278

Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 05:09:21 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797
+/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797,1100056
 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
 /hadoop/core/trunk/src/contrib/ec2:776175-784663

Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 05:09:21 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797
+/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797,1100056
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 05:09:21 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797
+/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797,1100056
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Modified: hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/WritableComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/WritableComparator.java?rev=1100058&r1=1100057&r2=1100058&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/WritableComparator.java
(original)
+++ hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/io/WritableComparator.java
Fri May  6 05:09:21 2011
@@ -53,7 +53,6 @@ public class WritableComparator implemen
       // if not, use the generic one
       if (comparator == null) {
         comparator = new WritableComparator(c, true);
-        comparators.put(c, comparator);
       }
     }
     return comparator;
@@ -75,7 +74,8 @@ public class WritableComparator implemen
   } 
 
   /** Register an optimized comparator for a {@link WritableComparable}
-   * implementation. */
+   * implementation. Comparators registered with this method must be
+   * thread-safe. */
   public static synchronized void define(Class c,
                                          WritableComparator comparator) {
     comparators.put(c, comparator);

Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 05:09:21 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797
+/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508,966919,967220,979485,979942,990681,1004107,1006356,1039952,1040408,1054848,1080797,1100056
 /hadoop/core/branches/branch-0.19/core/src/test/core:713112
 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278



Mime
View raw message