hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1536493 - in /hive/branches/maven: ./ ql/src/test/queries/clientnegative/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientnegative/ ql/src/test/results/clientpositive/
Date Mon, 28 Oct 2013 19:40:10 GMT
Author: brock
Date: Mon Oct 28 19:40:09 2013
New Revision: 1536493

URL: http://svn.apache.org/r1536493
Log:
HIVE-5674 - Merge latest trunk into branch and fix resulting tests

Added:
    hive/branches/maven/maven-delete-ant.sh
Removed:
    hive/branches/maven/maven-delete-ant.xml
Modified:
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_5.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_6.q
    hive/branches/maven/ql/src/test/queries/clientpositive/split.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_in.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notin.q
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_5.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_6.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/split.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_in.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_notin.q.out

Added: hive/branches/maven/maven-delete-ant.sh
URL: http://svn.apache.org/viewvc/hive/branches/maven/maven-delete-ant.sh?rev=1536493&view=auto
==============================================================================
--- hive/branches/maven/maven-delete-ant.sh (added)
+++ hive/branches/maven/maven-delete-ant.sh Mon Oct 28 19:40:09 2013
@@ -0,0 +1,48 @@
+#!/bin/bash
+function delete() {
+  rm -rf "$@"
+}
+delete build.properties
+delete build.xml
+delete build-common.xml
+delete build-offline.xml
+delete ant/build.xml
+delete beeline/build.xml
+delete cli/build.xml
+delete common/build.xml
+delete contrib/build.xml
+delete hbase-handler/build.xml
+delete hcatalog/build.xml
+delete hcatalog/core/build.xml
+delete hcatalog/hcatalog-pig-adapter/build.xml
+delete hcatalog/server-extensions/build.xml
+delete hcatalog/src/test/e2e/hcatalog/build.xml
+delete hcatalog/src/test/e2e/hcatalog/tools/generate/java/build.xml
+delete hcatalog/src/test/e2e/hcatalog/udfs/java/build.xml
+delete hcatalog/src/test/e2e/templeton/build.xml
+delete hcatalog/storage-handlers/hbase/build.xml
+delete hcatalog/webhcat/java-client/build.xml
+delete hcatalog/webhcat/svr/build.xml
+delete hwi/build.xml
+delete jdbc/build.xml
+delete metastore/build.xml
+delete odbc/build.xml
+delete ql/build.xml
+delete serde/build.xml
+delete service/build.xml
+delete shims/build.xml
+delete testutils/build.xml
+delete hcatalog/core/pom-old.xml
+delete hcatalog/hcatalog-pig-adapter/pom-old.xml
+delete hcatalog/pom-old.xml
+delete hcatalog/server-extensions/pom-old.xml
+delete hcatalog/storage-handlers/hbase/pom-old.xml
+delete hcatalog/webhcat/java-client/pom-old.xml
+delete hcatalog/webhcat/svr/pom-old.xml
+delete hcatalog/build-support/ant/build-command.xml
+delete hcatalog/build-support/ant/deploy.xml
+delete hcatalog/build-support/ant/test.xml
+delete ivy
+delete maven-rollback.sh
+delete maven-rollforward.sh
+delete maven-delete-ant.sh

Modified: hive/branches/maven/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientnegative/subquery_windowing_corr.q?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientnegative/subquery_windowing_corr.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientnegative/subquery_windowing_corr.q Mon Oct
28 19:40:09 2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 
 -- corr and windowing 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/decimal_5.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/decimal_5.q?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/decimal_5.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/decimal_5.q Mon Oct 28 19:40:09
2013
@@ -5,7 +5,7 @@ ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_5;
+LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5;
 
 SELECT key FROM DECIMAL_5 ORDER BY key;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/decimal_6.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/decimal_6.q?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/decimal_6.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/decimal_6.q Mon Oct 28 19:40:09
2013
@@ -12,8 +12,8 @@ ROW FORMAT DELIMITED
    FIELDS TERMINATED BY ' '
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_1;
-LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_2;
+LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1;
+LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2;
 
 SELECT T.key from (
   SELECT key, value from DECIMAL_6_1

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/split.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/split.q?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/split.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/split.q Mon Oct 28 19:40:09 2013
@@ -2,7 +2,7 @@ DROP TABLE tmp_jo_tab_test;
 CREATE table tmp_jo_tab_test (message_line STRING)
 STORED AS TEXTFILE;
 
-LOAD DATA LOCAL INPATH '../data/files/input.txt'
+LOAD DATA LOCAL INPATH '../../data/files/input.txt'
 OVERWRITE INTO TABLE tmp_jo_tab_test;
 
 select size(split(message_line, '\t')) from tmp_jo_tab_test;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/subquery_in.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/subquery_in.q?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/subquery_in.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/subquery_in.q Mon Oct 28 19:40:09
2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 DROP TABLE lineitem;
 CREATE TABLE lineitem (L_ORDERKEY      INT,
@@ -35,7 +35,7 @@ CREATE TABLE lineitem (L_ORDERKEY      I
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '|';
 
-LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem;
+LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem;
 
 -- non agg, non corr
 explain

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notin.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notin.q?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notin.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notin.q Mon Oct 28 19:40:09
2013
@@ -13,7 +13,7 @@ CREATE TABLE part( 
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 DROP TABLE lineitem;
 CREATE TABLE lineitem (L_ORDERKEY      INT,
@@ -35,7 +35,7 @@ CREATE TABLE lineitem (L_ORDERKEY      I
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '|';
 
-LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem;
+LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE lineitem;
 
 -- non agg, non corr
 explain

Modified: hive/branches/maven/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out (original)
+++ hive/branches/maven/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out Mon
Oct 28 19:40:09 2013
@@ -29,10 +29,10 @@ CREATE TABLE part( 
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@part
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table
part
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table
part
 PREHOOK: type: LOAD
 PREHOOK: Output: default@part
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table
part
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table
part
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@part
 FAILED: SemanticException Line 9:8 Unsupported SubQuery Expression '1' in definition of SubQuery
sq_1 [

Modified: hive/branches/maven/ql/src/test/results/clientpositive/decimal_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/results/clientpositive/decimal_5.q.out?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/results/clientpositive/decimal_5.q.out (original)
+++ hive/branches/maven/ql/src/test/results/clientpositive/decimal_5.q.out Mon Oct 28 19:40:09
2013
@@ -13,10 +13,10 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@DECIMAL_5
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_5
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5
 PREHOOK: type: LOAD
 PREHOOK: Output: default@decimal_5
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_5
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv7.txt' INTO TABLE DECIMAL_5
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@decimal_5
 PREHOOK: query: SELECT key FROM DECIMAL_5 ORDER BY key

Modified: hive/branches/maven/ql/src/test/results/clientpositive/decimal_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/results/clientpositive/decimal_6.q.out?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/results/clientpositive/decimal_6.q.out (original)
+++ hive/branches/maven/ql/src/test/results/clientpositive/decimal_6.q.out Mon Oct 28 19:40:09
2013
@@ -32,16 +32,16 @@ ROW FORMAT DELIMITED
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@DECIMAL_6_2
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
 PREHOOK: type: LOAD
 PREHOOK: Output: default@decimal_6_1
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_1
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@decimal_6_1
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
 PREHOOK: type: LOAD
 PREHOOK: Output: default@decimal_6_2
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv9.txt' INTO TABLE DECIMAL_6_2
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@decimal_6_2
 PREHOOK: query: SELECT T.key from (

Modified: hive/branches/maven/ql/src/test/results/clientpositive/split.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/results/clientpositive/split.q.out?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/results/clientpositive/split.q.out (original)
+++ hive/branches/maven/ql/src/test/results/clientpositive/split.q.out Mon Oct 28 19:40:09
2013
@@ -9,11 +9,11 @@ POSTHOOK: query: CREATE table tmp_jo_tab
 STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmp_jo_tab_test
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/input.txt'
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/input.txt'
 OVERWRITE INTO TABLE tmp_jo_tab_test
 PREHOOK: type: LOAD
 PREHOOK: Output: default@tmp_jo_tab_test
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/input.txt'
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/input.txt'
 OVERWRITE INTO TABLE tmp_jo_tab_test
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@tmp_jo_tab_test

Modified: hive/branches/maven/ql/src/test/results/clientpositive/subquery_in.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/results/clientpositive/subquery_in.q.out?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/results/clientpositive/subquery_in.q.out (original)
+++ hive/branches/maven/ql/src/test/results/clientpositive/subquery_in.q.out Mon Oct 28 19:40:09
2013
@@ -29,10 +29,10 @@ CREATE TABLE part( 
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@part
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table
part
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table
part
 PREHOOK: type: LOAD
 PREHOOK: Output: default@part
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table
part
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table
part
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@part
 PREHOOK: query: DROP TABLE lineitem
@@ -78,10 +78,10 @@ ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '|'
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@lineitem
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
 PREHOOK: type: LOAD
 PREHOOK: Output: default@lineitem
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@lineitem
 PREHOOK: query: -- non agg, non corr

Modified: hive/branches/maven/ql/src/test/results/clientpositive/subquery_notin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/results/clientpositive/subquery_notin.q.out?rev=1536493&r1=1536492&r2=1536493&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/results/clientpositive/subquery_notin.q.out (original)
+++ hive/branches/maven/ql/src/test/results/clientpositive/subquery_notin.q.out Mon Oct 28
19:40:09 2013
@@ -29,10 +29,10 @@ CREATE TABLE part( 
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@part
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table
part
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table
part
 PREHOOK: type: LOAD
 PREHOOK: Output: default@part
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table
part
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table
part
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@part
 PREHOOK: query: DROP TABLE lineitem
@@ -78,10 +78,10 @@ ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '|'
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@lineitem
-PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
+PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
 PREHOOK: type: LOAD
 PREHOOK: Output: default@lineitem
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE
lineitem
 POSTHOOK: type: LOAD
 POSTHOOK: Output: default@lineitem
 PREHOOK: query: -- non agg, non corr



Mime
View raw message