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

HADOOP-7348. svn merge -c 1225192 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229469 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-01-10 05:13:20 +00:00
parent 4175e70020
commit 10c1a416fc
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,9 @@ Release 0.23.1 - Unreleased
HADOOP-7934. Normalize dependencies versions across all modules. (tucu) HADOOP-7934. Normalize dependencies versions across all modules. (tucu)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead.
(XieXianshan via harsh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

4
hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/file_system_shell.xml
View File

@ -260,11 +260,11 @@
<section> <section>
<title> getmerge </title> <title> getmerge </title>
<p> <p>
<code>Usage: hdfs dfs -getmerge &lt;src&gt; &lt;localdst&gt; [addnl]</code> <code>Usage: hdfs dfs -getmerge [-nl] &lt;src&gt; &lt;localdst&gt;</code>
</p> </p>
<p> <p>
Takes a source directory and a destination file as input and concatenates files in src into the destination local file. Takes a source directory and a destination file as input and concatenates files in src into the destination local file.
Optionally <code>addnl</code> can be set to enable adding a newline character at the end of each file. Optionally <code>-nl</code> flag can be set to enable adding a newline character at the end of each file during merge.
</p> </p>
</section> </section>

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CopyCommands.java
View File

@ -45,26 +45,22 @@ class CopyCommands {
/** merge multiple files together */ /** merge multiple files together */
public static class Merge extends FsCommand { public static class Merge extends FsCommand {
public static final String NAME = "getmerge"; public static final String NAME = "getmerge";
public static final String USAGE = "<src> <localdst> [addnl]"; public static final String USAGE = "[-nl] <src> <localdst>";
public static final String DESCRIPTION = public static final String DESCRIPTION =
"Get all the files in the directories that\n" + "Get all the files in the directories that\n" +
"match the source file pattern and merge and sort them to only\n" + "match the source file pattern and merge and sort them to only\n" +
"one file on local fs. <src> is kept."; "one file on local fs. <src> is kept.\n" +
" -nl Add a newline character at the end of each file.";
protected PathData dst = null; protected PathData dst = null;
protected String delimiter = null; protected String delimiter = null;
@Override @Override
protected void processOptions(LinkedList<String> args) throws IOException { protected void processOptions(LinkedList<String> args) throws IOException {
CommandFormat cf = new CommandFormat(2, 3); CommandFormat cf = new CommandFormat(2, 3, "nl");
cf.parse(args); cf.parse(args);
// TODO: this really should be a -nl option delimiter = cf.getOpt("nl") ? "\n" : null;
if ((args.size() > 2) && Boolean.parseBoolean(args.removeLast())) {
delimiter = "\n";
} else {
delimiter = null;
}
dst = new PathData(new File(args.removeLast()), getConf()); dst = new PathData(new File(args.removeLast()), getConf());
} }

6
hadoop-common-project/hadoop-common/src/test/resources/testConf.xml
View File

@ -449,7 +449,7 @@
<comparators> <comparators>
<comparator> <comparator>
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^-getmerge &lt;src&gt; &lt;localdst&gt; \[addnl\]:( |\t)*Get all the files in the directories that( )*</expected-output> <expected-output>^-getmerge \[-nl\] &lt;src&gt; &lt;localdst&gt;:( |\t)*Get all the files in the directories that( )*</expected-output>
</comparator> </comparator>
<comparator> <comparator>
<type>RegexpComparator</type> <type>RegexpComparator</type>
@ -459,6 +459,10 @@
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^( |\t)*one file on local fs. &lt;src&gt; is kept.( )*</expected-output> <expected-output>^( |\t)*one file on local fs. &lt;src&gt; is kept.( )*</expected-output>
</comparator> </comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*-nl Add a newline character at the end of each file.( )*</expected-output>
</comparator>
</comparators> </comparators>
</test> </test>