svn commit: r1475773 - in /avro/trunk: CHANGES.txt lang/java/mapred/src/main/java/org/apache/avro/mapred/package.html

[ma...@apache.org]

Author: martinkl
Date: Thu Apr 25 13:51:01 2013
New Revision: 1475773

URL: http://svn.apache.org/r1475773
Log:
AVRO-1306. Java mapred: Fix incorrect documentation for combiners.  Contributed by Mina Naguib.

Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/package.html

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1475773&r1=1475772&r2=1475773&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Thu Apr 25 13:51:01 2013
@@ -53,6 +53,9 @@ Trunk (not yet released)
     AVRO-1308. Java: Fix repeated protobuf messages & enums.
     (Steve Zesch & cutting)
 
+    AVRO-1306. Java mapred: Fix incorrect documentation for combiners.
+    (Mina Naguib via martinkl)
+
 Avro 1.7.4 (22 February 2012)
 
   NEW FEATURES

Modified: avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/package.html
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/package.html?rev=1475773&r1=1475772&r2=1475773&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/package.html (original)
+++ avro/trunk/lang/java/mapred/src/main/java/org/apache/avro/mapred/package.html Thu Apr 25 13:51:01 2013
@@ -62,11 +62,16 @@ Avro data, with map and reduce functions
    this as your job's mapper with {@link
    org.apache.avro.mapred.AvroJob#setMapperClass}</li>
    <li>Implement {@link org.apache.hadoop.mapred.Reducer} and specify
-   your job's reducer and combiner with {@link
-   org.apache.hadoop.mapred.JobConf#setReducerClass} and {@link
-   org.apache.hadoop.mapred.JobConf#setCombinerClass}.  The input key
+   your job's reducer with {@link
+   org.apache.hadoop.mapred.JobConf#setReducerClass}.  The input key
    and value types should be {@link org.apache.avro.mapred.AvroKey} and {@link
    org.apache.avro.mapred.AvroValue}.</li>
+   <li>Optionally implement {@link org.apache.hadoop.mapred.Reducer} and
+   specify your job's combiner with {@link
+   org.apache.hadoop.mapred.JobConf#setCombinerClass}.  You will be unable to
+   re-use the same Reducer class as the Combiner, as the Combiner will need
+   input and output key to be {@link org.apache.avro.mapred.AvroKey}, and
+   input and output value to be {@link org.apache.avro.mapred.AvroValue}.</li>
    <li>Specify your job's output key and value types {@link
    org.apache.hadoop.mapred.JobConf#setOutputKeyClass} and {@link
    org.apache.hadoop.mapred.JobConf#setOutputValueClass}.</li>