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 cd...@apache.org on 2008/06/19 00:49:55 UTC

svn commit: r669325 - in /hadoop/core/branches/branch-0.17: CHANGES.txt src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java

Author: cdouglas
Date: Wed Jun 18 15:49:55 2008
New Revision: 669325

URL: http://svn.apache.org/viewvc?rev=669325&view=rev
Log:
HADOOP-3526. Fix contrib/data_join framework by cloning values retained in the
reduce. Contributed by Spyros Blanas.


Modified:
    hadoop/core/branches/branch-0.17/CHANGES.txt
    hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java

Modified: hadoop/core/branches/branch-0.17/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/CHANGES.txt?rev=669325&r1=669324&r2=669325&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.17/CHANGES.txt Wed Jun 18 15:49:55 2008
@@ -23,6 +23,9 @@
     HADOOP-3550. Fix the serialization data structures in MapTask where the
     value lengths are incorrectly calculated. (cdouglas)
 
+    HADOOP-3526. Fix contrib/data_join framework by cloning values retained
+    in the reduce. (Spyros Blanas via cdouglas)
+
 Release 0.17.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java?rev=669325&r1=669324&r2=669325&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java (original)
+++ hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java Wed Jun 18 15:49:55 2008
@@ -24,6 +24,7 @@
 import java.util.TreeMap;
 
 import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.WritableUtils;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
@@ -103,13 +104,13 @@
       if (this.numOfValues > this.maxNumOfValuesPerGroup) {
         continue;
       }
-      Object tag = aRecord.getTag();
+      Text tag = new Text((Text)aRecord.getTag());
       ResetableIterator data = retv.get(tag);
       if (data == null) {
         data = createResetableIterator();
         retv.put(tag, data);
       }
-      data.add(aRecord);
+      data.add(WritableUtils.clone(aRecord, job));
     }
     if (this.numOfValues > this.largestNumOfValues) {
       this.largestNumOfValues = numOfValues;