You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/12 18:38:13 UTC
svn commit: r1531557 [2/20] - in /hive/branches/maven: ./ ant/
ant/src/org/apache/hadoop/hive/ant/ beeline/
beeline/src/java/org/apache/hive/beeline/
beeline/src/test/org/apache/hive/beeline/src/test/ cli/
cli/src/test/org/apache/hadoop/hive/cli/ commo...
Modified: hive/branches/maven/contrib/src/test/queries/clientnegative/serde_regex.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientnegative/serde_regex.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientnegative/serde_regex.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientnegative/serde_regex.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
USE default;
Modified: hive/branches/maven/contrib/src/test/queries/clientnegative/udtf_explode2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientnegative/udtf_explode2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientnegative/udtf_explode2.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientnegative/udtf_explode2.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
Modified: hive/branches/maven/contrib/src/test/queries/clientnegative/url_hook.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientnegative/url_hook.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientnegative/url_hook.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientnegative/url_hook.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/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;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/dboutput.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/dboutput.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/dboutput.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/dboutput.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-ADD JAR ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput';
@@ -7,7 +7,7 @@ set mapred.reduce.tasks.speculative.exec
set mapred.map.tasks=1;
set mapred.reduce.tasks=1;
-ADD JAR ${system:build.ivy.lib.dir}/default/derby-${system:derby.version}.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/derby/derby/${system:derby.version}/derby-${system:derby.version}.jar;
DESCRIBE FUNCTION dboutput;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/fileformat_base64.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/fileformat_base64.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/fileformat_base64.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/fileformat_base64.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
DROP TABLE base64_test;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/java_mr_example.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/java_mr_example.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/java_mr_example.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/java_mr_example.q Sat Oct 12 16:37:47 2013
@@ -1,10 +1,10 @@
FROM (
FROM src
MAP value, key
- USING 'java -cp ${system:build.dir}/hive-contrib-${system:hive.version}.jar org.apache.hadoop.hive.contrib.mr.example.IdentityMapper'
+ USING 'java -cp ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/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 ${system:build.dir}/hive-contrib-${system:hive.version}.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce'
+ USING 'java -cp ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar org.apache.hadoop.hive.contrib.mr.example.WordCountReduce'
AS k, v
;
\ No newline at end of file
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/lateral_view_explode2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/lateral_view_explode2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/lateral_view_explode2.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/lateral_view_explode2.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_regex.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_regex.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_regex.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_regex.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
EXPLAIN
CREATE TABLE serde_regex(
@@ -35,7 +35,7 @@ WITH SERDEPROPERTIES (
)
STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH "../data/files/apache.access.log" INTO TABLE serde_regex;
-LOAD DATA LOCAL INPATH "../data/files/apache.access.2.log" INTO TABLE serde_regex;
+LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex;
+LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex;
SELECT * FROM serde_regex ORDER BY time;
\ No newline at end of file
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_s3.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_s3.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_s3.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_s3.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
DROP TABLE s3log;
CREATE TABLE s3log
@@ -7,7 +7,7 @@ STORED AS TEXTFILE;
DESCRIBE s3log;
-LOAD DATA LOCAL INPATH '../contrib/data/files/s3.log' INTO TABLE s3log;
+LOAD DATA LOCAL INPATH '../../contrib/data/files/s3.log' INTO TABLE s3log;
SELECT a.* FROM s3log a;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes2.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes2.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key SMALLINT, value STRING) STORED AS TEXTFILE;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes3.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes3.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes3.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes3.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes4.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes4.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes4.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes4.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes5.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes5.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes5.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes5.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
drop table dest1;
CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE;
@@ -8,7 +8,7 @@ FROM (
FROM src
SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter'
- USING 'python ../data/scripts/cat.py'
+ USING 'python ../../data/scripts/cat.py'
AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader'
) tmap
@@ -18,7 +18,7 @@ FROM (
FROM src
SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter'
- USING 'python ../data/scripts/cat.py'
+ USING 'python ../../data/scripts/cat.py'
AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader'
) tmap
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes_null.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes_null.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes_null.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/serde_typedbytes_null.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
DROP TABLE table1;
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_avg.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_avg.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_avg.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_avg.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_avg AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleAvg';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_group_concat.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_group_concat AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleGroupConcat';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_max AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMax';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max_n.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max_n.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max_n.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_max_n.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_max_n AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMaxN';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_min AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMin';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min_n.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min_n.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min_n.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udaf_example_min_n.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_min_n AS 'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMinN';
EXPLAIN
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_add.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_add.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_add.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_add.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_add AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_arraymapstruct.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/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';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_format.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_format.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_format.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udf_example_format.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION example_format AS 'org.apache.hadoop.hive.contrib.udf.example.UDFExampleFormat';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udf_row_sequence.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udf_row_sequence.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udf_row_sequence.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udf_row_sequence.q Sat Oct 12 16:37:47 2013
@@ -4,7 +4,7 @@
drop temporary function row_sequence;
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_explode2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_explode2.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_explode2.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_explode2.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
Modified: hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_output_on_close.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_output_on_close.q?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_output_on_close.q (original)
+++ hive/branches/maven/contrib/src/test/queries/clientpositive/udtf_output_on_close.q Sat Oct 12 16:37:47 2013
@@ -1,4 +1,4 @@
-add jar ${system:build.dir}/hive-contrib-${system:hive.version}.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION udtfCount2 AS 'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFCount2';
Modified: hive/branches/maven/contrib/src/test/results/clientpositive/serde_regex.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/results/clientpositive/serde_regex.q.out?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/results/clientpositive/serde_regex.q.out (original)
+++ hive/branches/maven/contrib/src/test/results/clientpositive/serde_regex.q.out Sat Oct 12 16:37:47 2013
@@ -92,16 +92,16 @@ WITH SERDEPROPERTIES (
STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@serde_regex
-PREHOOK: query: LOAD DATA LOCAL INPATH "../data/files/apache.access.log" INTO TABLE serde_regex
+PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex
PREHOOK: type: LOAD
PREHOOK: Output: default@serde_regex
-POSTHOOK: query: LOAD DATA LOCAL INPATH "../data/files/apache.access.log" INTO TABLE serde_regex
+POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex
POSTHOOK: type: LOAD
POSTHOOK: Output: default@serde_regex
-PREHOOK: query: LOAD DATA LOCAL INPATH "../data/files/apache.access.2.log" INTO TABLE serde_regex
+PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex
PREHOOK: type: LOAD
PREHOOK: Output: default@serde_regex
-POSTHOOK: query: LOAD DATA LOCAL INPATH "../data/files/apache.access.2.log" INTO TABLE serde_regex
+POSTHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex
POSTHOOK: type: LOAD
POSTHOOK: Output: default@serde_regex
PREHOOK: query: SELECT * FROM serde_regex ORDER BY time
Modified: hive/branches/maven/contrib/src/test/results/clientpositive/serde_s3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/results/clientpositive/serde_s3.q.out?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/results/clientpositive/serde_s3.q.out (original)
+++ hive/branches/maven/contrib/src/test/results/clientpositive/serde_s3.q.out Sat Oct 12 16:37:47 2013
@@ -32,10 +32,10 @@ totaltime int
turnaroundtime int from deserializer
referer string from deserializer
useragent string from deserializer
-PREHOOK: query: LOAD DATA LOCAL INPATH '../contrib/data/files/s3.log' INTO TABLE s3log
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../contrib/data/files/s3.log' INTO TABLE s3log
PREHOOK: type: LOAD
PREHOOK: Output: default@s3log
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../contrib/data/files/s3.log' INTO TABLE s3log
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../contrib/data/files/s3.log' INTO TABLE s3log
POSTHOOK: type: LOAD
POSTHOOK: Output: default@s3log
PREHOOK: query: SELECT a.* FROM s3log a
Modified: hive/branches/maven/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out (original)
+++ hive/branches/maven/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out Sat Oct 12 16:37:47 2013
@@ -12,7 +12,7 @@ FROM (
FROM src
SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter'
- USING 'python ../data/scripts/cat.py'
+ USING 'python ../../data/scripts/cat.py'
AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader'
) tmap
@@ -23,14 +23,14 @@ FROM (
FROM src
SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter'
- USING 'python ../data/scripts/cat.py'
+ USING 'python ../../data/scripts/cat.py'
AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader'
) tmap
INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
- (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) (TOK_SERDE (TOK_SERDENAME 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe')) (TOK_RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter') 'python ../data/scripts/cat.py' (TOK_SERDE (TOK_SERDENAME 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe')) (TOK_RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader') (TOK_ALIASLIST tkey tvalue)))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL tkey)) (TOK_SELEXPR (TOK_TABLE_OR_COL tvalue)))))
+ (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) (TOK_SERDE (TOK_SERDENAME 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe')) (TOK_RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter') 'python ../../data/scripts/cat.py' (TOK_SERDE (TOK_SERDENAME 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe')) (TOK_RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader') (TOK_ALIASLIST tkey tvalue)))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB (TOK_TABNAME dest1))) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL tkey)) (TOK_SELEXPR (TOK_TABLE_OR_COL tvalue)))))
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -57,7 +57,7 @@ STAGE PLANS:
type: string
outputColumnNames: _col0, _col1
Transform Operator
- command: python ../data/scripts/cat.py
+ command: python ../../data/scripts/cat.py
output info:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -139,7 +139,7 @@ PREHOOK: query: FROM (
FROM src
SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter'
- USING 'python ../data/scripts/cat.py'
+ USING 'python ../../data/scripts/cat.py'
AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader'
) tmap
@@ -151,7 +151,7 @@ POSTHOOK: query: FROM (
FROM src
SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDWRITER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordWriter'
- USING 'python ../data/scripts/cat.py'
+ USING 'python ../../data/scripts/cat.py'
AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
RECORDREADER 'org.apache.hadoop.hive.contrib.util.typedbytes.TypedBytesRecordReader'
) tmap
Modified: hive/branches/maven/data/conf/hive-site-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/data/conf/hive-site-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/data/conf/hive-site-new.xml (original)
+++ hive/branches/maven/data/conf/hive-site-new.xml Sat Oct 12 16:37:47 2013
@@ -54,11 +54,16 @@
<property>
<name>javax.jdo.option.ConnectionURL</name>
- <!-- note: variable substituion not working here because it's loaded by jdo, not Hive -->
<value>jdbc:derby:;databaseName=${test.tmp.dir}/junit_metastore_db;create=true</value>
</property>
<property>
+ <name>hive.stats.dbconnectionstring</name>
+ <value>jdbc:derby:;databaseName=${test.tmp.dir}/TempStatsStore;create=true</value>
+</property>
+
+
+<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
</property>
@@ -76,7 +81,7 @@
<property>
<!-- this should eventually be deprecated since the metastore should supply this -->
<name>hive.metastore.warehouse.dir</name>
- <value>${test.tmp.dir}/warehouse</value>
+ <value>${test.warehouse.dir}</value>
<description></description>
</property>
@@ -96,13 +101,13 @@
<property>
<name>test.data.files</name>
- <value>${user.dir}/../data/files</value>
+ <value>${hive.root}/data/files</value>
<description></description>
</property>
<property>
<name>hive.jar.path</name>
- <value>${user.home}/.m2/repository/org/apache/hive/hive-exec/${project.version}/hive-exec-${project.version}.jar</value>
+ <value>${user.home}/.m2/repository/org/apache/hive/hive-ql/${hive.version}/hive-ql-${hive.version}-exec-bundle.jar</value>
<description></description>
</property>
Modified: hive/branches/maven/hbase-handler/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hbase-handler/pom.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hbase-handler/pom.xml (original)
+++ hive/branches/maven/hbase-handler/pom.xml Sat Oct 12 16:37:47 2013
@@ -27,6 +27,10 @@
<packaging>jar</packaging>
<name>Hive HBase Handler</name>
+ <properties>
+ <hive.path.to.root>..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
Modified: hive/branches/maven/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java (original)
+++ hive/branches/maven/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java Sat Oct 12 16:37:47 2013
@@ -81,7 +81,7 @@ public class HBaseTestSetup extends Test
return;
}
zooKeeperPort = zkPort;
- String tmpdir = System.getProperty("user.dir")+"/../build/ql/tmp";
+ String tmpdir = System.getProperty("test.tmp.dir");
this.tearDown();
conf.set("hbase.master", "local");
Modified: hive/branches/maven/hcatalog/core/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/core/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<name>Hive HCatalog Core</name>
+ <properties>
+ <hive.path.to.root>../..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestHCatMultiOutputFormat.java Sat Oct 12 16:37:47 2013
@@ -163,7 +163,7 @@ public class TestHCatMultiOutputFormat {
@BeforeClass
public static void setup() throws Exception {
- String testDir = System.getProperty("test.data.dir", "./");
+ String testDir = System.getProperty("test.tmp.dir", "./");
testDir = testDir + "/test_multitable_" + Math.abs(new Random().nextLong()) + "/";
workDir = new File(new File(testDir).getCanonicalPath());
FileUtil.fullyDelete(workDir);
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/mapreduce/TestMultiOutputFormat.java Sat Oct 12 16:37:47 2013
@@ -88,7 +88,7 @@ public class TestMultiOutputFormat {
}
private static void createWorkDir() throws IOException {
- String testDir = System.getProperty("test.data.dir", "./");
+ String testDir = System.getProperty("test.tmp.dir", "./");
testDir = testDir + "/test_multiout_" + Math.abs(new Random().nextLong()) + "/";
workDir = new File(new File(testDir).getCanonicalPath());
FileUtil.fullyDelete(workDir);
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java Sat Oct 12 16:37:47 2013
@@ -68,7 +68,7 @@ public class TestRCFileMapReduceInputFor
static {
try {
fs = FileSystem.getLocal(conf);
- Path dir = new Path(System.getProperty("test.data.dir", ".") + "/mapred");
+ Path dir = new Path(System.getProperty("test.tmp.dir", ".") + "/mapred");
file = new Path(dir, "test_rcfile");
fs.delete(dir, true);
// the SerDe part is from TestLazySimpleSerDe
@@ -203,7 +203,7 @@ public class TestRCFileMapReduceInputFor
private void writeThenReadByRecordReader(int intervalRecordCount,
int writeCount, int splitNumber, long maxSplitSize, CompressionCodec codec)
throws IOException, InterruptedException {
- Path testDir = new Path(System.getProperty("test.data.dir", ".")
+ Path testDir = new Path(System.getProperty("test.tmp.dir", ".")
+ "/mapred/testsmallfirstsplit");
Path testFile = new Path(testDir, "test_rcfile");
fs.delete(testFile, true);
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java Sat Oct 12 16:37:47 2013
@@ -160,7 +160,7 @@ public class TestHCatMultiOutputFormat {
@BeforeClass
public static void setup() throws Exception {
- String testDir = System.getProperty("test.data.dir", "./");
+ String testDir = System.getProperty("test.tmp.dir", "./");
testDir = testDir + "/test_multitable_" + Math.abs(new Random().nextLong()) + "/";
workDir = new File(new File(testDir).getCanonicalPath());
FileUtil.fullyDelete(workDir);
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java Sat Oct 12 16:37:47 2013
@@ -77,7 +77,7 @@ public class TestHCatPartitionPublish {
@BeforeClass
public static void setup() throws Exception {
- String testDir = System.getProperty("test.data.dir", "./");
+ String testDir = System.getProperty("test.tmp.dir", "./");
testDir = testDir + "/test_hcat_partitionpublish_" + Math.abs(new Random().nextLong()) + "/";
File workDir = new File(new File(testDir).getCanonicalPath());
FileUtil.fullyDelete(workDir);
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestMultiOutputFormat.java Sat Oct 12 16:37:47 2013
@@ -85,7 +85,7 @@ public class TestMultiOutputFormat {
}
private static void createWorkDir() throws IOException {
- String testDir = System.getProperty("test.data.dir", "./");
+ String testDir = System.getProperty("test.tmp.dir", "./");
testDir = testDir + "/test_multiout_" + Math.abs(new Random().nextLong()) + "/";
workDir = new File(new File(testDir).getCanonicalPath());
FileUtil.fullyDelete(workDir);
Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/rcfile/TestRCFileMapReduceInputFormat.java Sat Oct 12 16:37:47 2013
@@ -68,7 +68,7 @@ public class TestRCFileMapReduceInputFor
static {
try {
fs = FileSystem.getLocal(conf);
- Path dir = new Path(System.getProperty("test.data.dir", ".") + "/mapred");
+ Path dir = new Path(System.getProperty("test.tmp.dir", ".") + "/mapred");
file = new Path(dir, "test_rcfile");
fs.delete(dir, true);
// the SerDe part is from TestLazySimpleSerDe
@@ -203,7 +203,7 @@ public class TestRCFileMapReduceInputFor
private void writeThenReadByRecordReader(int intervalRecordCount,
int writeCount, int splitNumber, long maxSplitSize, CompressionCodec codec)
throws IOException, InterruptedException {
- Path testDir = new Path(System.getProperty("test.data.dir", ".")
+ Path testDir = new Path(System.getProperty("test.tmp.dir", ".")
+ "/mapred/testsmallfirstsplit");
Path testFile = new Path(testDir, "test_rcfile");
fs.delete(testFile, true);
Modified: hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/hcatalog-pig-adapter/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<name>Hive HCatalog Pig Adapter</name>
+ <properties>
+ <hive.path.to.root>../..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
Modified: hive/branches/maven/hcatalog/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>pom</packaging>
<name>Hive HCatalog</name>
+ <properties>
+ <hive.path.to.root>..</hive.path.to.root>
+ </properties>
+
<modules>
<module>core</module>
<module>hcatalog-pig-adapter</module>
Modified: hive/branches/maven/hcatalog/server-extensions/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/server-extensions/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/server-extensions/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/server-extensions/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<name>Hive HCatalog Server Extensions</name>
+ <properties>
+ <hive.path.to.root>../..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
Modified: hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/storage-handlers/hbase/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<name>Hive HCatalog HBase Storage Handler</name>
+ <properties>
+ <hive.path.to.root>../../..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
Modified: hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/webhcat/java-client/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<name>Hive HCatalog Webhcat Java Client</name>
+ <properties>
+ <hive.path.to.root>../../..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
Modified: hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml (original)
+++ hive/branches/maven/hcatalog/webhcat/svr/pom-new.xml Sat Oct 12 16:37:47 2013
@@ -33,6 +33,10 @@
<packaging>jar</packaging>
<name>Hive HCatalog Webhcat</name>
+ <properties>
+ <hive.path.to.root>../../..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
Modified: hive/branches/maven/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java (original)
+++ hive/branches/maven/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTempletonUtils.java Sat Oct 12 16:37:47 2013
@@ -35,7 +35,7 @@ public class TestTempletonUtils {
"2011-12-15 18:12:21,758 [main] INFO org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceLauncher - More information at: http://localhost:50030/jobdetails.jsp?jobid=job_201112140012_0047",
"2011-12-15 18:12:46,907 [main] INFO org.apache.pig.tools.pigstats.SimplePigStats - Script Statistics: "
};
- public static final String testDataDir = System.getProperty("test.data.dir");
+ public static final String testDataDir = System.getProperty("test.tmp.dir");
File tmpFile;
File usrFile;
Modified: hive/branches/maven/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hwi/pom.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/hwi/pom.xml (original)
+++ hive/branches/maven/hwi/pom.xml Sat Oct 12 16:37:47 2013
@@ -27,6 +27,10 @@
<packaging>jar</packaging>
<name>Hive HWI</name>
+ <properties>
+ <hive.path.to.root>..</hive.path.to.root>
+ </properties>
+
<dependencies>
<!-- intra-project -->
<dependency>
@@ -61,6 +65,14 @@
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <!-- test intra-project -->
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-ql</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<!-- test inter-project -->
<dependency>
<groupId>commons-httpclient</groupId>
Modified: hive/branches/maven/itests/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/itests/pom.xml?rev=1531557&r1=1531556&r2=1531557&view=diff
==============================================================================
--- hive/branches/maven/itests/pom.xml (original)
+++ hive/branches/maven/itests/pom.xml Sat Oct 12 16:37:47 2013
@@ -23,508 +23,18 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>hive-itests</artifactId>
- <packaging>jar</packaging>
+ <artifactId>hive-it</artifactId>
+ <packaging>pom</packaging>
<name>Hive Integration Tests</name>
<properties>
- <qfile></qfile>
- <qfile_regex></qfile_regex>
- <run_disabled>false</run_disabled>
- <clustermode></clustermode>
- <execute.beeline.tests>false</execute.beeline.tests>
- <minimr.query.files>list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,scriptfile1_win.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,schemeAuthority2.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q</minimr.query.files>
- <minimr.query.negative.files>cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q</minimr.query.negative.files>
- <beeline.positive.exclude>add_part_exist.q,alter1.q,alter2.q,alter4.q,alter5.q,alter_rename_partition.q,alter_rename_partition_authorization.q,archive.q,archive_corrupt.q,archive_multi.q,archive_mr_1806.q,archive_multi_mr_1806.q,authorization_1.q,authorization_2.q,authorization_4.q,authorization_5.q,authorization_6.q,authorization_7.q,ba_table1.q,ba_table2.q,ba_table3.q,ba_table_udfs.q,binary_table_bincolserde.q,binary_table_colserde.q,cluster.q,columnarserde_create_shortcut.q,combine2.q,constant_prop.q,create_nested_type.q,create_or_replace_view.q,create_struct_table.q,create_union_table.q,database.q,database_location.q,database_properties.q,ddltime.q,describe_database_json.q,drop_database_removes_partition_dirs.q,escape1.q,escape2.q,exim_00_nonpart_empty.q,exim_01_nonpart.q,exim_02_00_part_empty.q,exim_02_part.q,exim_03_nonpart_over_compat.q,exim_04_all_part.q,exim_04_evolved_parts.q,exim_05_some_part.q,exim_06_one_part.q,exim_07_all_part_over_nonoverlap.q,exim_08_nonpart_rena
me.q,exim_09_part_spec_nonoverlap.q,exim_10_external_managed.q,exim_11_managed_external.q,exim_12_external_location.q,exim_13_managed_location.q,exim_14_managed_location_over_existing.q,exim_15_external_part.q,exim_16_part_external.q,exim_17_part_managed.q,exim_18_part_external.q,exim_19_00_part_external_location.q,exim_19_part_external_location.q,exim_20_part_managed_location.q,exim_21_export_authsuccess.q,exim_22_import_exist_authsuccess.q,exim_23_import_part_authsuccess.q,exim_24_import_nonexist_authsuccess.q,global_limit.q,groupby_complex_types.q,groupby_complex_types_multi_single_reducer.q,index_auth.q,index_auto.q,index_auto_empty.q,index_bitmap.q,index_bitmap1.q,index_bitmap2.q,index_bitmap3.q,index_bitmap_auto.q,index_bitmap_rc.q,index_compact.q,index_compact_1.q,index_compact_2.q,index_compact_3.q,index_stale_partitioned.q,init_file.q,input16.q,input16_cc.q,input46.q,input_columnarserde.q,input_dynamicserde.q,input_lazyserde.q,input_testxpath3.q,input_testxpath4.q,insert2_o
verwrite_partitions.q,insertexternal1.q,join_thrift.q,lateral_view.q,load_binary_data.q,load_exist_part_authsuccess.q,load_nonpart_authsuccess.q,load_part_authsuccess.q,loadpart_err.q,lock1.q,lock2.q,lock3.q,lock4.q,merge_dynamic_partition.q,multi_insert.q,multi_insert_move_tasks_share_dependencies.q,null_column.q,ppd_clusterby.q,query_with_semi.q,rename_column.q,sample6.q,sample_islocalmode_hook.q,set_processor_namespaces.q,show_tables.q,source.q,split_sample.q,str_to_map.q,transform1.q,udaf_collect_set.q,udaf_context_ngrams.q,udaf_histogram_numeric.q,udaf_ngrams.q,udaf_percentile_approx.q,udf_array.q,udf_bitmap_and.q,udf_bitmap_or.q,udf_explode.q,udf_format_number.q,udf_map.q,udf_map_keys.q,udf_map_values.q,udf_max.q,udf_min.q,udf_named_struct.q,udf_percentile.q,udf_printf.q,udf_sentences.q,udf_sort_array.q,udf_split.q,udf_struct.q,udf_substr.q,udf_translate.q,udf_union.q,udf_xpath.q,udtf_stack.q,view.q,virtual_column.q</beeline.positive.exclude>
+ <hive.path.to.root>..</hive.path.to.root>
</properties>
- <dependencies>
- <!-- test intra-project -->
- <!-- Note: hive-exec packages common, service, thrift, and ql -->
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ant</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-cli</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-hbase-handler</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-service</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-service</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-thrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-ql</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- test inter-project -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>hadoop-1</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop-20S.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>${hadoop-20S.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop-2</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop-23.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${hadoop-23.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
- <version>${hadoop-23.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${hadoop-23.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-tests-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <target>
- <property name="test.classpath" refid="maven.test.classpath"/>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties"
- classpathref="maven.plugin.classpath" />
- <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
- classpath="${test.classpath}" />
- <mkdir dir="${project.build.directory}/qfile-results/clientpositive/" />
- <mkdir dir="${project.build.directory}/qfile-results/clientnegative/" />
- <mkdir dir="${project.build.directory}/qfile-results/positive/" />
- <mkdir dir="${project.build.directory}/qfile-results/negative/" />
- <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/positive/" />
- <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/negative/" />
- <mkdir dir="${project.build.directory}/qfile-results/hbase-handler/minimrpositive/" />
-
- <!-- Parse -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/ql/parse/"
- templatePath="${basedir}/../ql/src/test/templates/" template="TestParse.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/positive/"
- queryFile="${qfile}"
- queryFileRegex="${qfile_regex}"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/compiler/" className="TestParse"
- logFile="${project.build.directory}/testparsegen.log"
- hadoopVersion="${active.hadoop.version}"
- logDirectory="${project.build.directory}/qfile-results/positive/"/>
-
- <!-- Negative Parse -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/ql/parse/"
- templatePath="${basedir}/../ql/src/test/templates/" template="TestParseNegative.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/negative/"
- queryFile="${qfile}"
- queryFileRegex="${qfile_regex}"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/compiler/errors/" className="TestParseNegative"
- logFile="${project.build.directory}/testparseneggen.log"
- hadoopVersion="${active.hadoop.version}"
- logDirectory="${project.build.directory}/qfile-results/negative/"/>
-
- <!-- Cli -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../ql/src/test/templates/" template="TestCliDriver.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/clientpositive/"
- queryFile="${qfile}"
- excludeQueryFile="${minimr.query.files}"
- queryFileRegex="${qfile_regex}"
- clusterMode="${clustermode}"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/clientpositive/" className="TestCliDriver"
- logFile="${project.build.directory}/testclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/clientpositive/"
- hadoopVersion="${active.hadoop.version}"/>
-
- <!-- Negative Cli -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../ql/src/test/templates/" template="TestNegativeCliDriver.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/clientnegative/"
- queryFile="${qfile}"
- excludeQueryFile="${minimr.query.negative.files}"
- queryFileRegex="${qfile_regex}"
- clusterMode="${clustermode}"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/clientnegative/" className="TestNegativeCliDriver"
- logFile="${project.build.directory}/testnegativeclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/clientnegative/"
- hadoopVersion="${active.hadoop.version}"/>
-
- <!-- Minimr -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../ql/src/test/templates/" template="TestCliDriver.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/clientpositive/"
- queryFile="${qfile}"
- includeQueryFile="${minimr.query.files}"
- queryFileRegex="${qfile_regex}"
- clusterMode="miniMR"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/clientpositive/" className="TestMinimrCliDriver"
- logFile="${project.build.directory}/testminimrclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/clientpositive/"
- hadoopVersion="${hadoopVersion}"
- />
-
- <!-- Negative Minimr -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../ql/src/test/templates/" template="TestNegativeCliDriver.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/clientnegative/"
- queryFile="${qfile}"
- includeQueryFile="${minimr.query.negative.files}"
- queryFileRegex="${qfile_regex}"
- clusterMode="miniMR"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/clientnegative/" className="TestNegativeMinimrCliDriver"
- logFile="${project.build.directory}/testnegativeminimrclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/clientnegative/"
- hadoopVersion="${hadoopVersion}"
- />
-
- <!-- HBase Positive -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../hbase-handler/src/test/templates/" template="TestHBaseCliDriver.vm"
- queryDirectory="${basedir}/../hbase-handler/src/test/queries/positive/"
- queryFile="${qfile}"
- runDisabled="${run_disabled}"
- clusterMode="${clustermode}"
- resultsDirectory="${basedir}/../hbase-handler/src/test/results/positive/" className="TestHBaseCliDriver"
- logFile="${project.build.directory}/testhbaseclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/hbase-handler/positive/"/>
-
- <!-- HBase Minimr -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../hbase-handler/src/test/templates/" template="TestHBaseCliDriver.vm"
- queryDirectory="${basedir}/../hbase-handler/src/test/queries/positive/"
- queryFile="hbase_bulk.m"
- runDisabled="${run_disabled}"
- clusterMode="miniMR"
- resultsDirectory="${basedir}/../hbase-handler/src/test/results/positive/" className="TestHBaseMinimrCliDriver"
- logFile="${project.build.directory}/testhbaseminimrclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/hbase-handler/minimrpositive/"/>
-
- <!-- HBase Negative -->
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/"
- templatePath="${basedir}/../hbase-handler/src/test/templates/" template="TestHBaseNegativeCliDriver.vm"
- queryDirectory="${basedir}/../hbase-handler/src/test/queries/negative/"
- queryFile="${qfile}"
- runDisabled="${run_disabled}"
- clusterMode="${clustermode}"
- resultsDirectory="${basedir}/../hbase-handler/src/test/results/negative/" className="TestHBaseNegativeCliDriver"
- logFile="${project.build.directory}/testhbasenegativeclidrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/hbase-handler/negative"/>
-
-
- <!-- Beeline -->
- <if>
- <equals arg1="${execute.beeline.tests}" arg2="true" />
- <then>
- <qtestgen hiveRootDirectory="${basedir}/../"
- outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hive/beeline/util/"
- templatePath="${ql.test.template.dir}" template="TestBeeLineDriver.vm"
- queryDirectory="${basedir}/../ql/src/test/queries/clientpositive/"
- queryFile="${qfile}"
- excludeQueryFile="${beeline.positive.exclude}"
- queryFileRegex="${qfile_regex}"
- clusterMode="${clustermode}"
- runDisabled="${run_disabled}"
- resultsDirectory="${basedir}/../ql/src/test/results/clientpositive/" className="TestBeeLineDriver"
- logFile="${project.build.directory}/testbeelinedrivergen.log"
- logDirectory="${project.build.directory}/qfile-results/beelinepositive/"
- hadoopVersion="${hadoopVersion}" />
- </then>
- </if>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-test-sources/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>util</module>
+ <module>unit</module>
+ <module>qtest</module>
+ </modules>
</project>