hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: MAPREDUCE-6583. Clarify confusing sentence in MapReduce tutorial document. Contributed by Kai Sasaki.
Date Sun, 20 Dec 2015 15:19:47 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 6f3091933 -> 5f34cbff5


MAPREDUCE-6583. Clarify confusing sentence in MapReduce tutorial document. Contributed by
Kai Sasaki.

(cherry picked from commit 7995a6ea4dc524e5b17606359d09df72d771224a)
(cherry picked from commit 8607cb6074b40733d8990618a44c490f9f303ae3)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f34cbff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f34cbff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f34cbff

Branch: refs/heads/branch-2.8
Commit: 5f34cbff5c49ff0a7da08dc43ef927c6c66ddf14
Parents: 6f30919
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Mon Dec 21 00:16:14 2015 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon Dec 21 00:18:40 2015 +0900

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                           | 3 +++
 .../src/site/markdown/MapReduceTutorial.md                     | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f34cbff/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 7032955..0ec25a9 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -385,6 +385,9 @@ Release 2.7.3 - UNRELEASED
     MAPREDUCE-5883. "Total megabyte-seconds" in job counters is slightly
     misleading (Nathan Roberts via jlowe)
 
+    MAPREDUCE-6583. Clarify confusing sentence in MapReduce tutorial document.
+    (Kai Sasaki via aajisaka)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f34cbff/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
index c9c9d53..a035e96 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
@@ -311,7 +311,7 @@ public void reduce(Text key, Iterable<IntWritable> values,
 }
 ```
 
-The `Reducer` implementation, via the `reduce` method just sums up the values, which are
the occurence counts for each key (i.e. words in this example).
+The `Reducer` implementation, via the `reduce` method just sums up the values, which are
the occurrence counts for each key (i.e. words in this example).
 
 Thus the output of the job is:
 
@@ -348,7 +348,7 @@ Maps are the individual tasks that transform input records into intermediate
rec
 
 The Hadoop MapReduce framework spawns one map task for each `InputSplit` generated by the
`InputFormat` for the job.
 
-Overall, `Mapper` implementations are passed the `Job` for the job via the [Job.setMapperClass(Class)](../../api/org/apache/hadoop/mapreduce/Job.html)
method. The framework then calls [map(WritableComparable, Writable, Context)](../../api/org/apache/hadoop/mapreduce/Mapper.html)
for each key/value pair in the `InputSplit` for that task. Applications can then override
the `cleanup(Context)` method to perform any required cleanup.
+Overall, mapper implementations are passed to the job via [Job.setMapperClass(Class)](../../api/org/apache/hadoop/mapreduce/Job.html)
method. The framework then calls [map(WritableComparable, Writable, Context)](../../api/org/apache/hadoop/mapreduce/Mapper.html)
for each key/value pair in the `InputSplit` for that task. Applications can then override
the `cleanup(Context)` method to perform any required cleanup.
 
 Output pairs do not need to be of the same types as input pairs. A given input pair may map
to zero or many output pairs. Output pairs are collected with calls to context.write(WritableComparable,
Writable).
 
@@ -848,7 +848,7 @@ In the following sections we discuss how to submit a debug script with
a job. Th
 
 ##### How to distribute the script file:
 
-The user needs to use [DistributedCache](#DistributedCache) to *distribute* and *symlink*
thescript file.
+The user needs to use [DistributedCache](#DistributedCache) to *distribute* and *symlink*
to the script file.
 
 ##### How to submit the script:
 


Mime
View raw message