svn commit: r1488442 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/h...

[vinodkv]

Author: vinodkv
Date: Sat Jun  1 00:33:49 2013
New Revision: 1488442

URL: http://svn.apache.org/r1488442
Log:
MAPREDUCE-5273. Bring back a couple of protected variables in mapred and 
mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. 
Contributed by Mayank Bansal.

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/CombineFileRecordReader.java
    
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1488442&r1=1488441&r2=1488442&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Sat Jun  1 
00:33:49 2013
@@ -259,6 +259,10 @@ Release 2.0.5-beta - UNRELEASED
     DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs.
     (Zhijie Shen via vinodkv)
 
+    MAPREDUCE-5273. Bring back a couple of protected variables in mapred and
+    mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs.
+    (Mayank Bansal via vinodkv)
+
   OPTIMIZATIONS
 
     MAPREDUCE-4974. Optimising the LineRecordReader initialize() method 

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/CombineFileRecordReader.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/CombineFileRecordReader.java?rev=1488442&r1=1488441&r2=1488442&view=diff
==============================================================================
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/CombineFileRecordReader.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/CombineFileRecordReader.java
 Sat Jun  1 00:33:49 2013
@@ -49,7 +49,9 @@ public class CombineFileRecordReader<K, 
   protected CombineFileSplit split;
   protected JobConf jc;
   protected Reporter reporter;
+  protected Class<RecordReader<K, V>> rrClass;
   protected Constructor<RecordReader<K, V>> rrConstructor;
+  protected FileSystem fs;
   
   protected int idx;
   protected long progress;
@@ -104,6 +106,7 @@ public class CombineFileRecordReader<K, 
     throws IOException {
     this.split = split;
     this.jc = job;
+    this.rrClass = rrClass;
     this.reporter = reporter;
     this.idx = 0;
     this.curReader = null;

Modified: 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java?rev=1488442&r1=1488441&r2=1488442&view=diff
==============================================================================
--- 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java
 (original)
+++ 
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java
 Sat Jun  1 00:33:49 2013
@@ -46,7 +46,9 @@ public class CombineFileRecordReader<K, 
                                           Integer.class};
 
   protected CombineFileSplit split;
+  protected Class<? extends RecordReader<K,V>> rrClass;
   protected Constructor<? extends RecordReader<K,V>> rrConstructor;
+  protected FileSystem fs;
   protected TaskAttemptContext context;
   
   protected int idx;
@@ -109,6 +111,7 @@ public class CombineFileRecordReader<K, 
     throws IOException {
     this.split = split;
     this.context = context;
+    this.rrClass = rrClass;
     this.idx = 0;
     this.curReader = null;
     this.progress = 0;