svn commit: r1562082 - in /hive/trunk/ql/src/test: queries/clientnegative/ queries/clientpositive/ results/clientnegative/

[xu...@apache.org]

Author: xuefu
Date: Tue Jan 28 14:44:54 2014
New Revision: 1562082

URL: http://svn.apache.org/r1562082
Log:
HIVE-6310: Fix a few minimr test failures (reviewed by Brock)

Modified:
    hive/trunk/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q
    hive/trunk/ql/src/test/queries/clientpositive/import_exported_table.q
    hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
    hive/trunk/ql/src/test/queries/clientpositive/root_dir_external_table.q
    hive/trunk/ql/src/test/results/clientnegative/file_with_header_footer_negative.q.out

Modified: hive/trunk/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q?rev=1562082&r1=1562081&r2=1562082&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q (original)
+++ hive/trunk/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q Tue Jan 28 14:44:54 2014
@@ -1,13 +1,13 @@
-dfs ${system:test.dfs.mkdir} hdfs:///tmp/test/;
+dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_file_with_header_footer_negative/;
 
-dfs -copyFromLocal ../data/files/header_footer_table_1 hdfs:///tmp/test/header_footer_table_1;
+dfs -copyFromLocal ../data/files/header_footer_table_1 hdfs:///tmp/test_file_with_header_footer_negative/header_footer_table_1;
 
-dfs -copyFromLocal ../data/files/header_footer_table_2 hdfs:///tmp/test/header_footer_table_2;
+dfs -copyFromLocal ../data/files/header_footer_table_2 hdfs:///tmp/test_file_with_header_footer_negative/header_footer_table_2;
 
-CREATE EXTERNAL TABLE header_footer_table_1 (name string, message string, id int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LOCATION 'hdfs:///tmp/test/header_footer_table_1' tblproperties ("skip.header.line.count"="1", "skip.footer.line.count"="200");
+CREATE EXTERNAL TABLE header_footer_table_1 (name string, message string, id int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LOCATION 'hdfs:///tmp/test_file_with_header_footer_negative/header_footer_table_1' tblproperties ("skip.header.line.count"="1", "skip.footer.line.count"="200");
 
 SELECT * FROM header_footer_table_1;
 
 DROP TABLE header_footer_table_1;
 
-dfs -rmr hdfs:///tmp/test;
\ No newline at end of file
+dfs -rmr hdfs:///tmp/test_file_with_header_footer_negative;
\ No newline at end of file

Modified: hive/trunk/ql/src/test/queries/clientpositive/import_exported_table.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/import_exported_table.q?rev=1562082&r1=1562081&r2=1562082&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/import_exported_table.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/import_exported_table.q Tue Jan 28 14:44:54 2014
@@ -1,10 +1,13 @@
-dfs ${system:test.dfs.mkdir} hdfs:///tmp/test/;
+dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_import_exported_table/;
+dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_import_exported_table/exported_table/;
+dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_import_exported_table/exported_table/data/;
 
-dfs -copyFromLocal ../../data/files/exported_table hdfs:///tmp/test/;
+dfs -copyFromLocal ../../data/files/exported_table/_metadata hdfs:///tmp/test_import_exported_table/exported_table;
+dfs -copyFromLocal ../../data/files/exported_table/data/data hdfs:///tmp/test_import_exported_table/exported_table/data;
 
-IMPORT FROM '/tmp/test/exported_table';
+IMPORT FROM '/tmp/test_import_exported_table/exported_table';
 DESCRIBE j1_41;
 SELECT * from j1_41;
 
-dfs -rmr hdfs:///tmp/test;
+dfs -rmr hdfs:///tmp/test_import_exported_table;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q?rev=1562082&r1=1562081&r2=1562082&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/load_hdfs_file_with_space_in_the_name.q Tue Jan 28 14:44:54 2014
@@ -1,10 +1,10 @@
-dfs ${system:test.dfs.mkdir} hdfs:///tmp/test/;
+dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_load_hdfs_file_with_space_in_the_name/;
 
-dfs -copyFromLocal ../../data/files hdfs:///tmp/test/.;
+dfs -copyFromLocal ../../data/files hdfs:///tmp/test_load_hdfs_file_with_space_in_the_name/.;
 
 CREATE TABLE load_file_with_space_in_the_name(name STRING, age INT);
-LOAD DATA INPATH 'hdfs:///tmp/test/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;
-LOAD DATA INPATH 'hdfs:///tmp/test/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name;
+LOAD DATA INPATH 'hdfs:///tmp/test_load_hdfs_file_with_space_in_the_name/files/person age.txt' INTO TABLE load_file_with_space_in_the_name;
+LOAD DATA INPATH 'hdfs:///tmp/test_load_hdfs_file_with_space_in_the_name/files/person+age.txt' INTO TABLE load_file_with_space_in_the_name;
 
-dfs -rmr hdfs:///tmp/test;
+dfs -rmr hdfs:///tmp/test_load_hdfs_file_with_space_in_the_name;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/root_dir_external_table.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/root_dir_external_table.q?rev=1562082&r1=1562081&r2=1562082&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/root_dir_external_table.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/root_dir_external_table.q Tue Jan 28 14:44:54 2014
@@ -1,9 +1,9 @@
-dfs ${system:test.dfs.mkdir} hdfs:///tmp/test;
+dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_root_dir_external_table;
 
-insert overwrite directory "hdfs:///tmp/test" select key from src where (key < 20) order by key;
+insert overwrite directory "hdfs:///tmp/test_root_dir_external_table" select key from src where (key < 20) order by key;
 
-dfs -cp /tmp/test/000000_0 /000000_0;
-dfs -rmr hdfs:///tmp/test;
+dfs -cp /tmp/test_root_dir_external_table/000000_0 /000000_0;
+dfs -rmr hdfs:///tmp/test_root_dir_external_table;
 
 create external table roottable (key string) row format delimited fields terminated by '\\t' stored as textfile location 'hdfs:///';
 select count(*) from roottable;

Modified: hive/trunk/ql/src/test/results/clientnegative/file_with_header_footer_negative.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/file_with_header_footer_negative.q.out?rev=1562082&r1=1562081&r2=1562082&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/file_with_header_footer_negative.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/file_with_header_footer_negative.q.out Tue Jan 28 14:44:54 2014
@@ -1,14 +1,2 @@
-#### A masked pattern was here ####
-PREHOOK: type: CREATETABLE
-#### A masked pattern was here ####
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: default@header_footer_table_1
-PREHOOK: query: SELECT * FROM header_footer_table_1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@header_footer_table_1
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM header_footer_table_1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@header_footer_table_1
-#### A masked pattern was here ####
-Failed with exception java.io.IOException:java.io.IOException: footer number exceeds the limit defined in hive.file.max.footer
+Command failed with exit code = -1
+Query returned non-zero code: -1, cause: null