diff --git a/build-common.xml b/build-common.xml index 1391de7..6c1a920 100644 --- a/build-common.xml +++ b/build-common.xml @@ -18,7 +18,7 @@ --> - + @@ -26,15 +26,19 @@ - - + + + + + + @@ -68,6 +72,21 @@ + + + + + + + + + + + + + + + @@ -104,6 +123,7 @@ + @@ -118,7 +138,7 @@ - + --> + diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index bc6fc8d..8f216d4 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -50,8 +50,8 @@ public class HiveConf extends Configuration { SCRIPTERRORLIMIT("hive.exec.script.maxerrsize", 100000), // hadoop stuff - HADOOPBIN("hadoop.bin.path", System.getProperty("user.dir") + "/../../../bin/hadoop"), - HADOOPCONF("hadoop.config.dir", System.getProperty("user.dir") + "/../../../conf"), + HADOOPBIN("hadoop.bin.path", System.getenv("HADOOP_HOME") + "/bin/hadoop"), + HADOOPCONF("hadoop.config.dir", System.getenv("HADOOP_HOME") + "/conf"), HADOOPFS("fs.default.name", "file:///"), HADOOPMAPFILENAME("map.input.file", null), HADOOPJT("mapred.job.tracker", "local"), diff --git a/conf/hive-default.xml b/conf/hive-default.xml index bac3d9c..fa178f0 100644 --- a/conf/hive-default.xml +++ b/conf/hive-default.xml @@ -9,21 +9,6 @@ - - - hadoop.bin.path - ${user.dir}/../../../bin/hadoop - - Path to hadoop binary. Assumes that by default we are executing from hive - - - - hadoop.config.dir - ${user.dir}/../../../conf - - Path to hadoop configuration. Again assumes that by default we are executing from hive/ - - hive.exec.scratchdir diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml index c6736cf..65051aa 100644 --- a/data/conf/hive-site.xml +++ b/data/conf/hive-site.xml @@ -9,20 +9,6 @@ - - - - hadoop.bin.path - ${user.dir}/../hadoopcore/bin/hadoop - Path to hadoop binary. Assumes that by default we are executing from hive/ - - - - hadoop.config.dir - ${user.dir}/../hadoopcore/conf - Path to hadoop configuration. Again assumes that by default we are executing from hive/ - - hive.exec.scratchdir diff --git a/ql/src/test/queries/clientpositive/input13.q b/ql/src/test/queries/clientpositive/input13.q index 541156f..40fbc84 100644 --- a/ql/src/test/queries/clientpositive/input13.q +++ b/ql/src/test/queries/clientpositive/input13.q @@ -18,4 +18,4 @@ INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/dest4.out' SELECT sr SELECT dest1.* FROM dest1; SELECT dest2.* FROM dest2; SELECT dest3.* FROM dest3; -!../hadoopcore/bin/hadoop dfs -cat ../build/ql/test/data/warehouse/dest4.out/*; +dfs -cat ../build/ql/test/data/warehouse/dest4.out/*; diff --git a/ql/src/test/queries/clientpositive/subq.q b/ql/src/test/queries/clientpositive/subq.q index 445b081..3fb1558 100644 --- a/ql/src/test/queries/clientpositive/subq.q +++ b/ql/src/test/queries/clientpositive/subq.q @@ -9,5 +9,5 @@ FROM ( ) unioninput INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*; -!../hadoopcore/bin/hadoop dfs -cat ../build/ql/test/data/warehouse/union.out/*; +dfs -cat ../build/ql/test/data/warehouse/union.out/*; diff --git a/ql/src/test/queries/clientpositive/union.q b/ql/src/test/queries/clientpositive/union.q index d2c4367..8f95be9 100644 --- a/ql/src/test/queries/clientpositive/union.q +++ b/ql/src/test/queries/clientpositive/union.q @@ -13,4 +13,4 @@ FROM ( ) unioninput INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*; -!../hadoopcore/bin/hadoop dfs -cat ../build/ql/test/data/warehouse/union.out/*; +dfs -cat ../build/ql/test/data/warehouse/union.out/*;