Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6341. Fix typo in mapreduce tutorial. Contributed by John Michael Luy. 

(cherry picked from commit 9a3dda3d34)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
This commit is contained in:
Tsuyoshi Ozawa 2015-04-28 01:47:37 +09:00
parent 84ae26573c
commit fa9def5a2a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -104,6 +104,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6252. JobHistoryServer should not fail when encountering a MAPREDUCE-6252. JobHistoryServer should not fail when encountering a
missing directory. (Craig Welch via devaraj) missing directory. (Craig Welch via devaraj)
MAPREDUCE-6341. Fix typo in mapreduce tutorial. (John Michael Luy
via ozawa)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
View File

@ -210,7 +210,9 @@ Assuming that:
Sample text-files as input: Sample text-files as input:
$ bin/hadoop fs -ls /user/joe/wordcount/input/ /user/joe/wordcount/input/file01 /user/joe/wordcount/input/file02 $ bin/hadoop fs -ls /user/joe/wordcount/input/
/user/joe/wordcount/input/file01
/user/joe/wordcount/input/file02
$ bin/hadoop fs -cat /user/joe/wordcount/input/file01 $ bin/hadoop fs -cat /user/joe/wordcount/input/file01
Hello World Bye World Hello World Bye World
@ -224,12 +226,12 @@ Run the application:
Output: Output:
$ bin/hadoop fs -cat /user/joe/wordcount/output/part-r-00000` $ bin/hadoop fs -cat /user/joe/wordcount/output/part-r-00000
Bye 1 Bye 1
Goodbye 1 Goodbye 1
Hadoop 2 Hadoop 2
Hello 2 Hello 2
World 2` World 2
Applications can specify a comma separated list of paths which would be present in the current working directory of the task using the option `-files`. The `-libjars` option allows applications to add jars to the classpaths of the maps and reduces. The option `-archives` allows them to pass comma separated list of archives as arguments. These archives are unarchived and a link with name of the archive is created in the current working directory of tasks. More details about the command line options are available at [Commands Guide](../../hadoop-project-dist/hadoop-common/CommandsManual.html). Applications can specify a comma separated list of paths which would be present in the current working directory of the task using the option `-files`. The `-libjars` option allows applications to add jars to the classpaths of the maps and reduces. The option `-archives` allows them to pass comma separated list of archives as arguments. These archives are unarchived and a link with name of the archive is created in the current working directory of tasks. More details about the command line options are available at [Commands Guide](../../hadoop-project-dist/hadoop-common/CommandsManual.html).
@ -288,13 +290,13 @@ The output of the first map:
< Bye, 1> < Bye, 1>
< Hello, 1> < Hello, 1>
< World, 2>` < World, 2>
The output of the second map: The output of the second map:
< Goodbye, 1> < Goodbye, 1>
< Hadoop, 2> < Hadoop, 2>
< Hello, 1>` < Hello, 1>
```java ```java
public void reduce(Text key, Iterable<IntWritable> values, public void reduce(Text key, Iterable<IntWritable> values,