You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/05/01 09:01:34 UTC
[17/50] [abbrv] hadoop git commit: MAPREDUCE-6341. Fix typo in
mapreduce tutorial. Contributed by John Michael Luy.
MAPREDUCE-6341. Fix typo in mapreduce tutorial. Contributed by John Michael Luy.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a3dda3d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a3dda3d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a3dda3d
Branch: refs/heads/HDFS-7240
Commit: 9a3dda3d345b94cf6f9062c00395500596829cf1
Parents: 5e67c4d
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Tue Apr 28 01:47:37 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Tue Apr 28 01:47:37 2015 +0900
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/site/markdown/MapReduceTutorial.md | 12 +++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a3dda3d/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index f9488fb..f1d0493 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -352,6 +352,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6252. JobHistoryServer should not fail when encountering a
missing directory. (Craig Welch via devaraj)
+ MAPREDUCE-6341. Fix typo in mapreduce tutorial. (John Michael Luy
+ via ozawa)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a3dda3d/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 ccc9590..cd087d5 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
@@ -210,7 +210,9 @@ Assuming that:
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
Hello World Bye World
@@ -224,12 +226,12 @@ Run the application:
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
Goodbye 1
Hadoop 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).
@@ -288,13 +290,13 @@ The output of the first map:
< Bye, 1>
< Hello, 1>
- < World, 2>`
+ < World, 2>
The output of the second map:
< Goodbye, 1>
< Hadoop, 2>
- < Hello, 1>`
+ < Hello, 1>
```java
public void reduce(Text key, Iterable<IntWritable> values,