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

SQOOP-1271: Sqoop hcatalog location should support older bigtop default location also

Browse Source 
(Venkat Ranganathan via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2014-01-23 09:58:47 -08:00
parent 55c5f27f9e
commit da5ab302e9
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/configure-sqoop
View File

@ -82,8 +82,13 @@ fi
if [ -z "${HCAT_HOME}" ]; then if [ -z "${HCAT_HOME}" ]; then
if [ -d "/usr/lib/hive-hcatalog" ]; then if [ -d "/usr/lib/hive-hcatalog" ]; then
HCAT_HOME=/usr/lib/hive-hcatalog HCAT_HOME=/usr/lib/hive-hcatalog
elif [ -d "/usr/lib/hcatalog" ]; then
HCAT_HOME=/usr/lib/hcatalog
else else
HCAT_HOME=${SQOOP_HOME}/../hive-hcatalog HCAT_HOME=${SQOOP_HOME}/../hive-hcatalog
if [ ! -d ${HCAT_HOME} ]; then
HCAT_HOME=${SQOOP_HOME}/../hcatalog
fi
fi fi
fi fi
if [ -z "${ACCUMULO_HOME}" ]; then if [ -z "${ACCUMULO_HOME}" ]; then

28
src/java/org/apache/sqoop/SqoopOptions.java
View File

@ -18,9 +18,6 @@
package org.apache.sqoop; package org.apache.sqoop;
import com.cloudera.sqoop.SqoopOptions.FileLayout;
import com.cloudera.sqoop.SqoopOptions.IncrementalMode;
import com.cloudera.sqoop.SqoopOptions.UpdateMode;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -33,12 +30,6 @@
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import com.cloudera.sqoop.lib.DelimiterSet;
import com.cloudera.sqoop.lib.LargeObjectLoader;
import com.cloudera.sqoop.tool.SqoopTool;
import com.cloudera.sqoop.util.RandomHash;
import com.cloudera.sqoop.util.StoredAsProperty;
import org.apache.sqoop.accumulo.AccumuloConstants; import org.apache.sqoop.accumulo.AccumuloConstants;
import org.apache.sqoop.util.CredentialsUtil; import org.apache.sqoop.util.CredentialsUtil;
import org.apache.sqoop.util.LoggingUtils; import org.apache.sqoop.util.LoggingUtils;
@ -46,6 +37,15 @@
import org.apache.sqoop.validation.AbsoluteValidationThreshold; import org.apache.sqoop.validation.AbsoluteValidationThreshold;
import org.apache.sqoop.validation.RowCountValidator; import org.apache.sqoop.validation.RowCountValidator;
import com.cloudera.sqoop.SqoopOptions.FileLayout;
import com.cloudera.sqoop.SqoopOptions.IncrementalMode;
import com.cloudera.sqoop.SqoopOptions.UpdateMode;
import com.cloudera.sqoop.lib.DelimiterSet;
import com.cloudera.sqoop.lib.LargeObjectLoader;
import com.cloudera.sqoop.tool.SqoopTool;
import com.cloudera.sqoop.util.RandomHash;
import com.cloudera.sqoop.util.StoredAsProperty;
/** /**
* Configurable state used by Sqoop tools. * Configurable state used by Sqoop tools.
*/ */
@ -62,7 +62,8 @@ public class SqoopOptions implements Cloneable {
// Default hive and hcat locations. // Default hive and hcat locations.
public static final String DEF_HIVE_HOME = "/usr/lib/hive"; public static final String DEF_HIVE_HOME = "/usr/lib/hive";
public static final String DEF_HCAT_HOME = "/usr/lib/hcatalog"; public static final String DEF_HCAT_HOME = "/usr/lib/hive-hcatalog";
public static final String DEF_HCAT_HOME_OLD = "/usr/lib/hcatalog";
public static final boolean METASTORE_PASSWORD_DEFAULT = false; public static final boolean METASTORE_PASSWORD_DEFAULT = false;
@ -877,7 +878,12 @@ public static String getHCatHomeDefault() {
String hcatHome = System.getenv("HCAT_HOME"); String hcatHome = System.getenv("HCAT_HOME");
hcatHome = System.getProperty("hcat.home", hcatHome); hcatHome = System.getProperty("hcat.home", hcatHome);
if (hcatHome == null) { if (hcatHome == null) {
hcatHome = DEF_HCAT_HOME; File file = new File(DEF_HCAT_HOME);
if (file.exists()) {
hcatHome = DEF_HCAT_HOME;
} else {
hcatHome = DEF_HCAT_HOME_OLD;
}
} }
return hcatHome; return hcatHome;
} }