github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-17 01:11:07 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-981: The --hadoop-home command line parameter is no longer accepted

Browse Source 
(Venkat Ranganathan via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2013-04-15 10:10:01 -07:00
parent f5006b6005
commit 2d3341488f
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/apache/sqoop/tool/BaseSqoopTool.java
View File

@ -401,6 +401,11 @@ protected RelatedOptions getCommonOptions() {
.withLongOpt(HADOOP_MAPRED_HOME_ARG)
.create());
commonOpts.addOption(OptionBuilder.withArgName("hdir")
.hasArg().withDescription("Override $HADOOP_MAPRED_HOME_ARG")
.withLongOpt(HADOOP_HOME_ARG)
.create());
// misc (common)
commonOpts.addOption(OptionBuilder
.withDescription("Print more information while working")
@ -749,11 +754,12 @@ protected void applyCommonOptions(CommandLine in, SqoopOptions out)
applyCredentialsOptions(in, out);
if (in.hasOption(HADOOP_HOME_ARG)) {
out.setHadoopMapRedHome(in.getOptionValue(HADOOP_HOME_ARG));
}
if (in.hasOption(HADOOP_MAPRED_HOME_ARG)) {
out.setHadoopMapRedHome(in.getOptionValue(HADOOP_MAPRED_HOME_ARG));
// Only consider HADOOP_HOME if HADOOP_MAPRED_HOME is not set
} else if (in.hasOption(HADOOP_HOME_ARG)) {
out.setHadoopMapRedHome(in.getOptionValue(HADOOP_HOME_ARG));
}
}

21
src/test/com/cloudera/sqoop/TestSqoopOptions.java
View File

@ -357,4 +357,25 @@ public void testPropertySerialization2() {
connParams, in.getConnectionParams());
}
// test that hadoop-home is accepted as an option
public void testHadoopHome() throws Exception {
String [] args = {
"--hadoop-home",
"/usr/lib/hadoop",
};
SqoopOptions opts = parse(args);
assertEquals("/usr/lib/hadoop", opts.getHadoopMapRedHome());
}
// test that hadoop-home is accepted as an option
public void testHadoopMapRedOverridesHadoopHome() throws Exception {
String[] args = { "--hadoop-home", "/usr/lib/hadoop-ignored",
"--hadoop-mapred-home", "/usr/lib/hadoop", };
SqoopOptions opts = parse(args);
assertEquals("/usr/lib/hadoop", opts.getHadoopMapRedHome());
}
}