Author: omalley
Date: Sun Feb 17 10:15:03 2008
New Revision: 628525
URL: http://svn.apache.org/viewvc?rev=628525&view=rev
Log:
Merge -r 628523:628524 from trunk to branch 0.16 to fix HADOOP-2843.
Modified:
hadoop/core/branches/branch-0.16/CHANGES.txt
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/ComposableRecordReader.java
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/WrappedRecordReader.java
Modified: hadoop/core/branches/branch-0.16/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/CHANGES.txt?rev=628525&r1=628524&r2=628525&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.16/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.16/CHANGES.txt Sun Feb 17 10:15:03 2008
@@ -53,6 +53,9 @@
HADOOP-2735. Enables setting TMPDIR for tasks.
(Amareshwari Sri Ramadasu via ddas)
+ HADOOP-2843. Fix protections on map-side join classes to enable derivation.
+ (cdouglas via omalley)
+
Release 0.16.0 - 2008-02-07
INCOMPATIBLE CHANGES
Modified:
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/ComposableRecordReader.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/ComposableRecordReader.java?rev=628525&r1=628524&r2=628525&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/ComposableRecordReader.java
(original)
+++
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/ComposableRecordReader.java
Sun Feb 17 10:15:03 2008
@@ -27,7 +27,7 @@
/**
* Additional operations required of a RecordReader to participate in a join.
*/
-interface ComposableRecordReader<K extends WritableComparable,
+public interface ComposableRecordReader<K extends WritableComparable,
V extends Writable>
extends RecordReader<K,V>, Comparable<ComposableRecordReader<K,?>> {
Modified:
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/WrappedRecordReader.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/WrappedRecordReader.java?rev=628525&r1=628524&r2=628525&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/WrappedRecordReader.java
(original)
+++
hadoop/core/branches/branch-0.16/src/java/org/apache/hadoop/mapred/join/WrappedRecordReader.java
Sun Feb 17 10:15:03 2008
@@ -32,7 +32,7 @@
* provided RecordReader and keeps a store of values matching a key when
* this source is participating in a join.
*/
-class WrappedRecordReader<K extends WritableComparable,
+public class WrappedRecordReader<K extends WritableComparable,
U extends Writable>
implements ComposableRecordReader<K,U> {