Updated Branches: refs/heads/trunk db89861c0 -> fa40fcabe
SQOOP-1179: Incorrect warning saying --hive-import was not specified when it was specified (Venkat Ranganathan via Jarek Jarek Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/fa40fcab Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/fa40fcab Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/fa40fcab Branch: refs/heads/trunk Commit: fa40fcabea1dc8bc83bf273cbe49c43da26c83e2 Parents: db89861 Author: Jarek Jarcec Cecho <[email protected]> Authored: Thu Aug 22 12:43:12 2013 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Thu Aug 22 12:43:12 2013 -0700 ---------------------------------------------------------------------- src/java/org/apache/sqoop/tool/BaseSqoopTool.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/fa40fcab/src/java/org/apache/sqoop/tool/BaseSqoopTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/tool/BaseSqoopTool.java b/src/java/org/apache/sqoop/tool/BaseSqoopTool.java index 0eca991..e02a93b 100644 --- a/src/java/org/apache/sqoop/tool/BaseSqoopTool.java +++ b/src/java/org/apache/sqoop/tool/BaseSqoopTool.java @@ -1207,17 +1207,17 @@ public abstract class BaseSqoopTool extends com.cloudera.sqoop.tool.SqoopTool { // Warn about using hive specific arguments without hive import itself // In HCatalog support some of the Hive options are reused if (!options.doHiveImport() - && ((options.getHiveHome() != null + && (((options.getHiveHome() != null && !options.getHiveHome(). equals(SqoopOptions.getHiveHomeDefault()) && hCatTable == null)) - || options.doOverwriteHiveTable() - || options.doFailIfHiveTableExists() - || (options.getHiveTableName() != null - && !options.getHiveTableName().equals(options.getTableName())) + || options.doOverwriteHiveTable() + || options.doFailIfHiveTableExists() + || (options.getHiveTableName() != null + && !options.getHiveTableName().equals(options.getTableName())) || (options.getHivePartitionKey() != null && hCatTable == null) || (options.getHivePartitionValue() != null && hCatTable == null) - || (options.getMapColumnHive().size() > 0 && hCatTable == null)) { + || (options.getMapColumnHive().size() > 0 && hCatTable == null))) { LOG.warn("It seems that you've specified at least one of following:"); LOG.warn("\t--hive-home"); LOG.warn("\t--hive-overwrite");
