HIVE-1475. .gitignore files being placed in test warehouse directories causing build failure (Joydeep Sen Sarma via Ning Zhang)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hive/trunk@966909 13f79535-47bb-0310-9956-ffa450edef68

Author: Ning Zhang

Diff for: CHANGES.txt

@@ -79,6 +79,10 @@ Trunk -  Unreleased
     HIVE-1464. improve  test query performance
     (Joydeep Sen Sarma via Ning Zhang)
 
+    HIVE-1475. .gitignore files being placed in test warehouse directories 
+    causing build failure
+    (Joydeep Sen Sarma via Ning Zhang)
+
 Release 0.6.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Diff for: build-common.xml

@@ -58,7 +58,7 @@
   <path id="test.classpath">
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
     <path refid="classpath"/>
@@ -254,11 +254,8 @@
     <mkdir dir="${test.log.dir}/clientnegative"/>
     <mkdir dir="${test.log.dir}/positive"/>
     <mkdir dir="${test.log.dir}/negative"/>
-    <copy todir="${test.data.dir}">
-      <fileset dir="${test.src.data.dir}">
-        <exclude name="**/.svn"/>
-      </fileset>
-    </copy>
+    <mkdir dir="${test.data.dir}/warehouse"/>
+    <mkdir dir="${test.data.dir}/metadb"/>
   </target>
 
   <target name="setup"/>
@@ -407,11 +404,11 @@
       <jvmarg value="-Xdebug"/>
       <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/> -->
       <env key="HADOOP_HOME" value="${hadoop.root}"/>
-      <env key="HADOOP_CLASSPATH" value="${test.data.dir}/conf"/>
+      <env key="HADOOP_CLASSPATH" value="${test.src.data.dir}/conf"/>
       <env key="TZ" value="US/Pacific"/>
       <sysproperty key="test.output.overwrite" value="${overwrite}"/>
       <sysproperty key="test.service.standalone.server" value="${standalone}"/>
-      <sysproperty key="log4j.configuration" value="file://${test.data.dir}/conf/hive-log4j.properties"/>
+      <sysproperty key="log4j.configuration" value="file://${test.src.data.dir}/conf/hive-log4j.properties"/>
       <sysproperty key="derby.stream.error.file" value="${test.build.dir}/derby.log"/>
       <sysproperty key="hive.aux.jars.path" value="file://${test.build.dir}/test-udfs.jar"/>
       <sysproperty key="ql.test.query.clientpositive.dir" value="${ql.test.query.clientpositive.dir}"/>

Diff for: contrib/build.xml

@@ -33,7 +33,7 @@
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
     <pathelement location="${hadoop.conf.dir}"/>
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <pathelement location="${hive.root}/cli/lib/jline-0.9.94.jar"/>
     <pathelement location="${hadoop.test.jar}"/>

Diff for: data/warehouse/src/.gitignore

@@ -1 +0,0 @@
-# Dummy file to make Git recognize this empty directory

Diff for: hbase-handler/build.xml

@@ -34,7 +34,7 @@
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
     <pathelement location="${hadoop.conf.dir}"/>
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <pathelement location="${hive.root}/cli/lib/jline-0.9.94.jar"/>
     <pathelement location="${hadoop.test.jar}"/>

Diff for: hwi/build.xml

@@ -34,7 +34,7 @@
   <path id="test.classpath">
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <!-- We are running unit tests like the one inside ql -->
     <pathelement location="${build.dir.hive}/ql/test/classes"/> 

Diff for: jdbc/build.xml

@@ -32,7 +32,7 @@
   <path id="test.classpath">
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <fileset dir="${test.src.data.dir}" includes="files/*.jar"/>
     <fileset dir="${hive.root}" includes="testlibs/*.jar"/>

Diff for: odbc/build.xml

@@ -32,7 +32,7 @@
   <path id="test.classpath">
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <fileset dir="${test.src.data.dir}" includes="files/*.jar"/>
     <fileset dir="${hive.root}" includes="testlibs/*.jar"/>

Diff for: ql/build.xml

@@ -36,7 +36,7 @@
     <pathelement location="${test.build.classes}" />
     <pathelement location="" />
     <pathelement location="${hadoop.conf.dir}"/>
-    <pathelement location="${test.data.dir}/conf"/>
+    <pathelement location="${test.src.data.dir}/conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <pathelement location="${hive.root}/cli/lib/jline-0.9.94.jar"/>
     <pathelement location="${hadoop.test.jar}"/>

Diff for: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java

@@ -528,7 +528,7 @@ public void cliInit(String tname, boolean recreate) throws Exception {
       createSources();
     }
 
-    CliSessionState ss = new CliSessionState(new HiveConf(Driver.class));
+    CliSessionState ss = new CliSessionState(conf);
     assert ss != null;
     ss.in = System.in;
 

Diff for: ql/src/test/queries/clientnegative/addpart1.q

@@ -1,4 +1,4 @@
-drop table addpart1;
+
 create table addpart1 (a int) partitioned by (b string, c string);
 
 alter table addpart1 add partition (b='f', c='s');
@@ -9,4 +9,3 @@ alter table addpart1 add partition (b='f', c='');
 
 show prtitions addpart1;
 
-drop table addpart1;

Diff for: ql/src/test/queries/clientnegative/alter_non_native.q

@@ -1,4 +1,4 @@
-DROP TABLE non_native1;
+
 CREATE TABLE non_native1(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
 

Diff for: ql/src/test/queries/clientnegative/altern1.q

@@ -1,4 +1,4 @@
-drop table altern1;
+
 create table altern1(a int, b int) partitioned by (ds string);
 alter table altern1 replace columns(a int, b int, ds string);
-drop table altern1;
+

Diff for: ql/src/test/queries/clientnegative/create_insert_outputformat.q

@@ -1,4 +1,4 @@
-DROP TABLE table_test_output_fomat;
+
 
 CREATE TABLE table_test_output_format(key INT, value STRING) STORED AS
   INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
@@ -8,4 +8,4 @@ FROM src
 INSERT OVERWRITE TABLE table_test_output_format SELECT src.key, src.value LIMIT 10;
 
 describe table_test_output_format;
-DROP TABLE table_test_output_format;
+

Diff for: ql/src/test/queries/clientnegative/create_view_failure1.q

@@ -1,4 +1,4 @@
-DROP TABLE xxx12;
+
 DROP VIEW xxx12;
 
 -- views and tables share the same namespace

Diff for: ql/src/test/queries/clientnegative/create_view_failure2.q

@@ -1,4 +1,4 @@
-DROP TABLE xxx4;
+
 DROP VIEW xxx4;
 
 -- views and tables share the same namespace

Diff for: ql/src/test/queries/clientnegative/ctas.q

@@ -1,5 +1,5 @@
-drop table nzhang_ctas4;
+
 
 create external table nzhang_ctas4 as select key, value from src;
 
-drop table nzhang_ctas4;
+

Diff for: ql/src/test/queries/clientnegative/ddltime.q

@@ -1,6 +1,6 @@
-drop table T2;
+
 create table T2 like srcpart;
 
 insert overwrite table T2 partition (ds = '2010-06-21', hr='1') select /*+ HOLD_DDLTIME */ key, value from src where key > 10;
 
-drop table T2;
+

Diff for: ql/src/test/queries/clientnegative/deletejar.q

@@ -1,4 +1,4 @@
-DROP TABLE DELETEJAR;
+
 ADD JAR ../data/files/TestSerDe.jar;
 DELETE JAR ../data/files/TestSerDe.jar;
 CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE;

Diff for: ql/src/test/queries/clientnegative/drop_view_failure1.q

@@ -1,4 +1,4 @@
-DROP TABLE xxx1;
+
 
 CREATE TABLE xxx1(key int);
 

Diff for: ql/src/test/queries/clientnegative/dyn_part1.q

@@ -2,10 +2,10 @@ set hive.exec.dynamic.partition=true;
 set hive.exec.dynamic.partition.mode=nostrict;
 set hive.exec.max.dynamic.partitions=2;
 
-drop table dynamic_partition;
+
 create table dynamic_partition (key string) partitioned by (value string);
 
 insert overwrite table dynamic_partition partition(hr) select key, value from src;
 
-drop table dynamic_partition;
+
 

Diff for: ql/src/test/queries/clientnegative/dyn_part2.q

@@ -1,4 +1,4 @@
-drop table nzhang_part1;
+
 create table nzhang_part1 (key string, value string) partitioned by (ds string, hr string);
 
 set hive.exec.dynamic.partition=true;
@@ -7,5 +7,5 @@ insert overwrite table nzhang_part1 partition(ds='11', hr) select key, value fro
 
 show partitions nzhang_part1;
 
-drop table nzhang_part1;
+
 

Diff for: ql/src/test/queries/clientnegative/external1.q

@@ -1,4 +1,4 @@
 set hive.cli.errors.ignore=true;
-drop table external1;
+
 create external table external1(a int, b int) location 'invalidscheme://data.s3ndemo.hive/kv';
 describe external1;

Diff for: ql/src/test/queries/clientnegative/external2.q

@@ -1,5 +1,5 @@
 set hive.cli.errors.ignore=true;
-drop table external2;
+
 create external table external2(a int, b int) partitioned by (ds string);
 alter table external2 add partition (ds='2008-01-01') location 'invalidscheme://data.s3ndemo.hive/pkv/2008-01-01';
 describe external2 partition (ds='2008-01-01');

Diff for: ql/src/test/queries/clientnegative/invalid_create_tbl1.q

@@ -1,4 +1,4 @@
-DROP TABLE inv_valid_tbl1;
+
 CREATE TABLE inv_valid_tbl1 COMMENT 'This is a thrift based table'
     PARTITIONED BY(aint DATETIME, country STRING)
     CLUSTERED BY(aint) SORTED BY(lint) INTO 32 BUCKETS

Diff for: ql/src/test/queries/clientnegative/invalidate_view1.q

@@ -1,6 +1,6 @@
 DROP VIEW xxx8;
 DROP VIEW xxx9;
-DROP TABLE xxx10;
+
 -- create two levels of view reference, then invalidate intermediate view
 -- by dropping a column from underlying table, and verify that
 -- querying outermost view results in full error context

Diff for: ql/src/test/queries/clientnegative/load_non_native.q

@@ -1,4 +1,4 @@
-DROP TABLE non_native2;
+
 CREATE TABLE non_native2(key int, value string) 
 STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
 

Diff for: ql/src/test/queries/clientnegative/load_wrong_fileformat.q

@@ -1,6 +1,6 @@
 -- test for loading into tables with the correct file format
 -- test for loading into partitions with the correct file format
 
-DROP TABLE load_wrong_fileformat_T1;
+
 CREATE TABLE load_wrong_fileformat_T1(name STRING) STORED AS SEQUENCEFILE;
 LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE load_wrong_fileformat_T1;

Diff for: ql/src/test/queries/clientnegative/load_wrong_fileformat_rc_seq.q

@@ -1,6 +1,6 @@
 -- test for loading into tables with the correct file format
 -- test for loading into partitions with the correct file format
 
-DROP TABLE T1;
+
 CREATE TABLE T1(name STRING) STORED AS RCFILE;
 LOAD DATA LOCAL INPATH '../data/files/kv1.seq' INTO TABLE T1;

Diff for: ql/src/test/queries/clientnegative/load_wrong_fileformat_txt_seq.q

@@ -1,6 +1,6 @@
 -- test for loading into tables with the correct file format
 -- test for loading into partitions with the correct file format
 
-DROP TABLE T1;
+
 CREATE TABLE T1(name STRING) STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../data/files/kv1.seq' INTO TABLE T1;

Diff for: ql/src/test/queries/clientnegative/nopart_insert.q

@@ -1,8 +1,7 @@
-DROP TABLE nopart_insert;
+
 CREATE TABLE nopart_insert(a STRING, b STRING) PARTITIONED BY (ds STRING);
 
 INSERT OVERWRITE TABLE nopart_insert 
 SELECT TRANSFORM(src.key, src.value) USING '../data/scripts/error_script' AS (tkey, tvalue)
 FROM src;
 
-DROP TABLE nopart_insert;

Diff for: ql/src/test/queries/clientnegative/nopart_load.q

@@ -1,6 +1,5 @@
-DROP TABLE nopart_load;
+
 CREATE TABLE nopart_load(a STRING, b STRING) PARTITIONED BY (ds STRING);
 
 load data local inpath '../data/files/kv1.txt' overwrite into table nopart_load ;
 
-DROP TABLE nopart_load;

Diff for: ql/src/test/queries/clientnegative/smb_bucketmapjoin.q

@@ -2,10 +2,10 @@ set hive.enforce.bucketing = true;
 set hive.enforce.sorting = true;
 set hive.exec.reducers.max = 1;
 
-drop table smb_bucket4_1;
+
 CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS;
 
-drop table smb_bucket4_2;
+
 CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS;
 
 insert overwrite table smb_bucket4_1
@@ -19,5 +19,5 @@ set hive.optimize.bucketmapjoin.sortedmerge = true;
 
 select /*+mapjoin(a)*/ * from smb_bucket4_1 a left outer join smb_bucket4_2 b on a.key = b.key;
 
-drop table smb_bucket4_1;
-drop table smb_bucket4_2;
+
+

Diff for: ql/src/test/queries/clientnegative/union2.q

@@ -1,5 +1,5 @@
-drop table union2_t1;
-drop table union2_t2;
+
+
 create table if not exists union2_t1(r string, c string, v string);
 create table if not exists union2_t2(s string, c string, v string);
 

Diff for: ql/src/test/queries/clientpositive/add_part_exist.q

@@ -12,5 +12,3 @@ SHOW PARTITIONS add_part_test;
 
 ALTER TABLE add_part_test ADD IF NOT EXISTS PARTITION (ds='2010-01-01') PARTITION (ds='2010-01-02') PARTITION (ds='2010-01-03');
 SHOW PARTITIONS add_part_test;
-
-DROP TABLE add_part_test;

Diff for: ql/src/test/queries/clientpositive/alter1.q

@@ -1,4 +1,3 @@
-drop table alter1;
 create table alter1(a int, b int);
 describe extended alter1;
 alter table alter1 set tblproperties ('a'='1', 'c'='3');
@@ -25,5 +24,3 @@ describe extended alter1;
 
 alter table alter1 replace columns (a int, b int, c string);
 describe alter1;
-
-drop table alter1;

Diff for: ql/src/test/queries/clientpositive/alter2.q

@@ -1,4 +1,3 @@
-drop table alter2;
 create table alter2(a int, b int) partitioned by (insertdate string);
 describe extended alter2;
 show partitions alter2;
@@ -19,4 +18,3 @@ show partitions alter2;
 alter table alter2 add partition (insertdate='2008-01-02') location '2008/01/02';
 describe extended alter2;
 show partitions alter2;
-drop table alter2;

Diff for: ql/src/test/queries/clientpositive/alter3.q

@@ -1,8 +1,3 @@
-drop table alter3_src;
-drop table alter3;
-drop table alter3_renamed;
-drop table alter3_like_renamed;
-
 create table alter3_src ( col1 string ) stored as textfile ;
 load data local inpath '../data/files/test.dat' overwrite into table alter3_src ;
 
@@ -24,8 +19,3 @@ select col1 from alter3_src;
 alter table alter3_like rename to alter3_like_renamed;
 
 describe extended alter3_like_renamed;
-
-drop table alter3_src;
-drop table alter3;
-drop table alter3_renamed;
-drop table alter3_like_renamed;

Diff for: ql/src/test/queries/clientpositive/alter4.q

@@ -1,9 +1,5 @@
-DROP TABLE set_bucketing_test;
-
 CREATE TABLE set_bucketing_test (key INT, value STRING) CLUSTERED BY (key) INTO 10 BUCKETS;
 DESCRIBE EXTENDED set_bucketing_test;
 
 ALTER TABLE set_bucketing_test NOT CLUSTERED;
 DESCRIBE EXTENDED set_bucketing_test;
-
-DROP TABLE set_bucketing_test;

Diff for: ql/src/test/queries/clientpositive/archive.q

@@ -33,7 +33,6 @@ SELECT key FROM harbucket TABLESAMPLE(BUCKET 1 OUT OF 10) SORT BY key;
 ALTER TABLE srcpart UNARCHIVE PARTITION (ds='2008-04-08', hr='12');
 SELECT key FROM harbucket TABLESAMPLE(BUCKET 1 OUT OF 10) SORT BY key;
 
-DROP TABLE harbucket;
 
 CREATE TABLE old_name(key INT) 
 PARTITIONED by (ds STRING);
@@ -45,5 +44,3 @@ FROM (SELECT * FROM old_name WHERE ds='1') subq1) subq2;
 ALTER TABLE old_name RENAME TO new_name;
 SELECT SUM(hash(col)) FROM (SELECT transform(*) using 'tr "\t" "_"' AS col 
 FROM (SELECT * FROM new_name WHERE ds='1') subq1) subq2;
-
-DROP TABLE new_name;