hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1463730 - in /hadoop/common/branches/branch-1-win: ./ CHANGES.txt src/mapred/ src/mapred/org/apache/hadoop/mapred/SpillRecord.java
Date Tue, 02 Apr 2013 20:12:47 GMT
Author: suresh
Date: Tue Apr  2 20:12:47 2013
New Revision: 1463730

URL: http://svn.apache.org/r1463730
Log:
MAPREDUCE-782. Merging change r1366280 from branch-1

Modified:
    hadoop/common/branches/branch-1-win/   (props changed)
    hadoop/common/branches/branch-1-win/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1-win/src/mapred/   (props changed)
    hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/SpillRecord.java

Propchange: hadoop/common/branches/branch-1-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1:r1366280

Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1463730&r1=1463729&r2=1463730&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Tue Apr  2 20:12:47 2013
@@ -4,6 +4,8 @@ Release 1.1.0 - (partial upto at r129350
 
     HDFS-496. Backport: Use PureJavaCrc32 in HDFS.  (Brandon Li via szetszwo)
 
+    MAPREDUCE-782. Use PureJavaCrc32 in mapreduce spills. (Todd Lipcon, backport by Brandon
Li via sseth)
+
   BUG FIXES
 
     HDFS-2305. Running multiple 2NNs can result in corrupt file system. (atm)

Propchange: hadoop/common/branches/branch-1-win/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1366280

Propchange: hadoop/common/branches/branch-1-win/src/mapred/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/src/mapred:r1366280

Modified: hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/SpillRecord.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/SpillRecord.java?rev=1463730&r1=1463729&r2=1463730&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/SpillRecord.java
(original)
+++ hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/SpillRecord.java
Tue Apr  2 20:12:47 2013
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.LongBuffer;
-import java.util.zip.CRC32;
 import java.util.zip.CheckedInputStream;
 import java.util.zip.CheckedOutputStream;
 import java.util.zip.Checksum;
@@ -33,6 +32,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.SecureIOUtils;
+import org.apache.hadoop.util.PureJavaCrc32;
 
 import static org.apache.hadoop.mapred.MapTask.MAP_OUTPUT_INDEX_RECORD_LENGTH;
 
@@ -51,7 +51,7 @@ class SpillRecord {
 
   public SpillRecord(Path indexFileName, JobConf job, String expectedIndexOwner)
   throws IOException {
-    this(indexFileName, job, new CRC32(), expectedIndexOwner);
+    this(indexFileName, job, new PureJavaCrc32(), expectedIndexOwner);
   }
 
   public SpillRecord(Path indexFileName, JobConf job, Checksum crc, 
@@ -115,7 +115,7 @@ class SpillRecord {
    */
   public void writeToFile(Path loc, JobConf job)
       throws IOException {
-    writeToFile(loc, job, new CRC32());
+    writeToFile(loc, job, new PureJavaCrc32());
   }
 
   public void writeToFile(Path loc, JobConf job, Checksum crc)



Mime
View raw message