diff --git build-common.xml build-common.xml
index 6bf5d3c..dac20d4 100644
--- build-common.xml
+++ build-common.xml
@@ -436,6 +436,7 @@
+
diff --git contrib/build.xml contrib/build.xml
index 67948ca..21c004e 100644
--- contrib/build.xml
+++ contrib/build.xml
@@ -107,23 +107,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git contrib/src/test/queries/clientnegative/serde_regex.q contrib/src/test/queries/clientnegative/serde_regex.q
index 7a92969..944645a 100644
--- contrib/src/test/queries/clientnegative/serde_regex.q
+++ contrib/src/test/queries/clientnegative/serde_regex.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
DROP TABLE serde_regex;
diff --git contrib/src/test/queries/clientnegative/udtf_explode2.q contrib/src/test/queries/clientnegative/udtf_explode2.q
index 33b1dde..7800748 100644
--- contrib/src/test/queries/clientnegative/udtf_explode2.q
+++ contrib/src/test/queries/clientnegative/udtf_explode2.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
diff --git contrib/src/test/queries/clientpositive/dboutput.q contrib/src/test/queries/clientpositive/dboutput.q
index c779a4d..dbbcfcb 100644
--- contrib/src/test/queries/clientpositive/dboutput.q
+++ contrib/src/test/queries/clientpositive/dboutput.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput';
diff --git contrib/src/test/queries/clientpositive/fileformat_base64.q contrib/src/test/queries/clientpositive/fileformat_base64.q
index 69067dc..adf889e 100644
--- contrib/src/test/queries/clientpositive/fileformat_base64.q
+++ contrib/src/test/queries/clientpositive/fileformat_base64.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
DROP TABLE base64_test;
diff --git contrib/src/test/queries/clientpositive/java_mr_example.q contrib/src/test/queries/clientpositive/java_mr_example.q
index dc45f61..6c8a220 100644
--- contrib/src/test/queries/clientpositive/java_mr_example.q
+++ contrib/src/test/queries/clientpositive/java_mr_example.q
@@ -1,10 +1,10 @@
FROM (
FROM src
MAP value, key
- USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper'
+ USING 'java -cp ${system:build.dir}/hive-contrib-${system:hive.version}.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper'
AS k, v
CLUSTER BY k) map_output
REDUCE k, v
- USING 'java -cp ../build/contrib/hive_contrib.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce'
+ USING 'java -cp ${system:build.dir}/hive-contrib-${system:hive.version}.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce'
AS k, v
;
\ No newline at end of file
diff --git contrib/src/test/queries/clientpositive/lateral_view_explode2.q contrib/src/test/queries/clientpositive/lateral_view_explode2.q
index c0588e3..b46c9b2 100644
--- contrib/src/test/queries/clientpositive/lateral_view_explode2.q
+++ contrib/src/test/queries/clientpositive/lateral_view_explode2.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
diff --git contrib/src/test/queries/clientpositive/serde_regex.q contrib/src/test/queries/clientpositive/serde_regex.q
index 8ad3162..702e356 100644
--- contrib/src/test/queries/clientpositive/serde_regex.q
+++ contrib/src/test/queries/clientpositive/serde_regex.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
DROP TABLE serde_regex;
diff --git contrib/src/test/queries/clientpositive/serde_s3.q contrib/src/test/queries/clientpositive/serde_s3.q
index bf3ae24..a0bca81 100644
--- contrib/src/test/queries/clientpositive/serde_s3.q
+++ contrib/src/test/queries/clientpositive/serde_s3.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
DROP TABLE s3log;
CREATE TABLE s3log
diff --git contrib/src/test/queries/clientpositive/serde_typedbytes.q contrib/src/test/queries/clientpositive/serde_typedbytes.q
index 9db34a6..351402a 100644
--- contrib/src/test/queries/clientpositive/serde_typedbytes.q
+++ contrib/src/test/queries/clientpositive/serde_typedbytes.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
diff --git contrib/src/test/queries/clientpositive/serde_typedbytes2.q contrib/src/test/queries/clientpositive/serde_typedbytes2.q
index 97c422b..9d49ce0 100644
--- contrib/src/test/queries/clientpositive/serde_typedbytes2.q
+++ contrib/src/test/queries/clientpositive/serde_typedbytes2.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key SMALLINT, value STRING) STORED AS TEXTFILE;
diff --git contrib/src/test/queries/clientpositive/serde_typedbytes3.q contrib/src/test/queries/clientpositive/serde_typedbytes3.q
index e20c9f5..aa1b391 100644
--- contrib/src/test/queries/clientpositive/serde_typedbytes3.q
+++ contrib/src/test/queries/clientpositive/serde_typedbytes3.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
diff --git contrib/src/test/queries/clientpositive/serde_typedbytes4.q contrib/src/test/queries/clientpositive/serde_typedbytes4.q
index eb558fa..031d07e 100644
--- contrib/src/test/queries/clientpositive/serde_typedbytes4.q
+++ contrib/src/test/queries/clientpositive/serde_typedbytes4.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
diff --git contrib/src/test/queries/clientpositive/serde_typedbytes5.q contrib/src/test/queries/clientpositive/serde_typedbytes5.q
index 5e70bca..99b2cfe 100644
--- contrib/src/test/queries/clientpositive/serde_typedbytes5.q
+++ contrib/src/test/queries/clientpositive/serde_typedbytes5.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
diff --git contrib/src/test/queries/clientpositive/serde_typedbytes_null.q contrib/src/test/queries/clientpositive/serde_typedbytes_null.q
index cbca108..fffee8d 100644
--- contrib/src/test/queries/clientpositive/serde_typedbytes_null.q
+++ contrib/src/test/queries/clientpositive/serde_typedbytes_null.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
DROP TABLE table1;
diff --git contrib/src/test/queries/clientpositive/udaf_example_avg.q contrib/src/test/queries/clientpositive/udaf_example_avg.q
index da729a5..cdfd7aa 100644
--- contrib/src/test/queries/clientpositive/udaf_example_avg.q
+++ contrib/src/test/queries/clientpositive/udaf_example_avg.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_avg AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleAvg';
diff --git contrib/src/test/queries/clientpositive/udaf_example_group_concat.q contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
index ac49ac4..0317f99 100644
--- contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
+++ contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_group_concat AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleGroupConcat';
diff --git contrib/src/test/queries/clientpositive/udaf_example_max.q contrib/src/test/queries/clientpositive/udaf_example_max.q
index c86627e..118b811 100644
--- contrib/src/test/queries/clientpositive/udaf_example_max.q
+++ contrib/src/test/queries/clientpositive/udaf_example_max.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_max AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMax';
diff --git contrib/src/test/queries/clientpositive/udaf_example_max_n.q contrib/src/test/queries/clientpositive/udaf_example_max_n.q
index 73375d9..fb71545 100644
--- contrib/src/test/queries/clientpositive/udaf_example_max_n.q
+++ contrib/src/test/queries/clientpositive/udaf_example_max_n.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_max_n AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMaxN';
diff --git contrib/src/test/queries/clientpositive/udaf_example_min.q contrib/src/test/queries/clientpositive/udaf_example_min.q
index e1ed7ed..e9236de 100644
--- contrib/src/test/queries/clientpositive/udaf_example_min.q
+++ contrib/src/test/queries/clientpositive/udaf_example_min.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_min AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMin';
diff --git contrib/src/test/queries/clientpositive/udaf_example_min_n.q contrib/src/test/queries/clientpositive/udaf_example_min_n.q
index 86142e6..63e5267 100644
--- contrib/src/test/queries/clientpositive/udaf_example_min_n.q
+++ contrib/src/test/queries/clientpositive/udaf_example_min_n.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_min_n AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMinN';
EXPLAIN
diff --git contrib/src/test/queries/clientpositive/udf_example_add.q contrib/src/test/queries/clientpositive/udf_example_add.q
index 68d1ce3..8f10ce2 100644
--- contrib/src/test/queries/clientpositive/udf_example_add.q
+++ contrib/src/test/queries/clientpositive/udf_example_add.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd';
diff --git contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q
index 951006b..5d84533 100644
--- contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q
+++ contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_arraysum AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleArraySum';
CREATE TEMPORARY FUNCTION example_mapconcat AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleMapConcat';
diff --git contrib/src/test/queries/clientpositive/udf_example_format.q contrib/src/test/queries/clientpositive/udf_example_format.q
index c9982d2..09c4e69 100644
--- contrib/src/test/queries/clientpositive/udf_example_format.q
+++ contrib/src/test/queries/clientpositive/udf_example_format.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_format AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleFormat';
diff --git contrib/src/test/queries/clientpositive/udf_row_sequence.q contrib/src/test/queries/clientpositive/udf_row_sequence.q
index 67b05df..61e0a42 100644
--- contrib/src/test/queries/clientpositive/udf_row_sequence.q
+++ contrib/src/test/queries/clientpositive/udf_row_sequence.q
@@ -4,7 +4,7 @@
drop temporary function row_sequence;
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence';
diff --git contrib/src/test/queries/clientpositive/udtf_explode2.q contrib/src/test/queries/clientpositive/udtf_explode2.q
index fab9d57..2173eec 100644
--- contrib/src/test/queries/clientpositive/udtf_explode2.q
+++ contrib/src/test/queries/clientpositive/udtf_explode2.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
diff --git contrib/src/test/queries/clientpositive/udtf_output_on_close.q contrib/src/test/queries/clientpositive/udtf_output_on_close.q
index efd905b..c5cdf0a 100644
--- contrib/src/test/queries/clientpositive/udtf_output_on_close.q
+++ contrib/src/test/queries/clientpositive/udtf_output_on_close.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION udtfCount2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFCount2';
diff --git contrib/src/test/queries/clientpositive/url_hook.q contrib/src/test/queries/clientpositive/url_hook.q
index 027e081..d9ffd28 100644
--- contrib/src/test/queries/clientpositive/url_hook.q
+++ contrib/src/test/queries/clientpositive/url_hook.q
@@ -1,4 +1,4 @@
-add jar ../build/contrib/hive_contrib.jar;
+add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
set hive.metastore.force.reload.conf=true;
SHOW TABLES 'src';
set hive.metastore.ds.connection.url.hook=org.apache.hadoop.hive.contrib.metastore.hooks.TestURLHook;
diff --git hbase-handler/build.xml hbase-handler/build.xml
index 88c227a..e0a3ae6 100644
--- hbase-handler/build.xml
+++ hbase-handler/build.xml
@@ -85,22 +85,4 @@
logDirectory="${test.log.dir}/hbase-handler"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
index b5bc8ae..3548533 100644
--- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
+++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -925,6 +925,7 @@ public class QTestUtil {
"-I", "LOCK_QUERYID:",
"-I", "grantTime",
"-I", "[.][.][.] [0-9]* more",
+ "-I", "USING 'java -cp",
(new File(logDir, tname + ".out")).getPath(),
outFileName };