You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/09/27 19:53:26 UTC
svn commit: r1527004 - in /hive/trunk: ./ data/files/ ql/src/test/queries/clientnegative/ ql/src/test/queries/clientpositive/

Author: hashutosh
Date: Fri Sep 27 17:53:25 2013
New Revision: 1527004

URL: http://svn.apache.org/r1527004
Log:
HIVE-5231 : Remove TestSerDe.jar from data/files (Hari Sankar via Ashutosh Chauhan)

Removed:
    hive/trunk/data/files/TestSerDe.jar
Modified:
    hive/trunk/build-common.xml
    hive/trunk/ql/src/test/queries/clientnegative/deletejar.q
    hive/trunk/ql/src/test/queries/clientnegative/invalid_columns.q
    hive/trunk/ql/src/test/queries/clientpositive/alter1.q
    hive/trunk/ql/src/test/queries/clientpositive/input16.q
    hive/trunk/ql/src/test/queries/clientpositive/input16_cc.q

Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1527004&r1=1527003&r2=1527004&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Fri Sep 27 17:53:25 2013
@@ -294,7 +294,6 @@
      encoding="${build.encoding}"
      srcdir="${test.src.dir}"
      includes="org/apache/**/hive/**/*.java"
-     excludes="**/TestSerDe.java"
      destdir="${test.build.classes}"
      debug="${javac.debug}"
      optimize="${javac.optimize}"
@@ -329,8 +328,13 @@
     </jar>
     <delete file="${test.build.dir}/test-serdes.jar"/>
     <jar jarfile="${test.build.dir}/test-serdes.jar">
-        <fileset dir="${test.build.classes}" includes="**/serde2/*.class"/>
+        <fileset dir="${test.build.classes}" includes="**/serde2/*.class" excludes="**/serde2/TestSerDe.class"/>
     </jar>  	
+    <delete file="${test.build.dir}/TestSerDe.jar"/>
+    <jar jarfile="${test.build.dir}/TestSerDe.jar">
+        <fileset dir="${test.build.classes}" includes="**/serde2/TestSerDe.class"/>
+    </jar>
+    <delete file="${test.build.classes}/org/apache/hadoop/hive/serde2/TestSerDe.class"/> 
   </target>
 
   <target name="test-conditions">

Modified: hive/trunk/ql/src/test/queries/clientnegative/deletejar.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/deletejar.q?rev=1527004&r1=1527003&r2=1527004&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/deletejar.q (original)
+++ hive/trunk/ql/src/test/queries/clientnegative/deletejar.q Fri Sep 27 17:53:25 2013
@@ -1,4 +1,4 @@
 
-ADD JAR ../data/files/TestSerDe.jar;
-DELETE JAR ../data/files/TestSerDe.jar;
+ADD JAR ../build/ql/test/TestSerDe.jar;
+DELETE JAR ../build/ql/test/TestSerDe.jar;
 CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE;

Modified: hive/trunk/ql/src/test/queries/clientnegative/invalid_columns.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/invalid_columns.q?rev=1527004&r1=1527003&r2=1527004&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/invalid_columns.q (original)
+++ hive/trunk/ql/src/test/queries/clientnegative/invalid_columns.q Fri Sep 27 17:53:25 2013
@@ -1,4 +1,4 @@
-ADD JAR ../data/files/TestSerDe.jar;
+ADD JAR ../build/ql/test/TestSerDe.jar;
 CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' 
 STORED AS TEXTFILE
 TBLPROPERTIES('columns'='valid_colname,invalid.colname');

Modified: hive/trunk/ql/src/test/queries/clientpositive/alter1.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/alter1.q?rev=1527004&r1=1527003&r2=1527004&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/alter1.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/alter1.q Fri Sep 27 17:53:25 2013
@@ -15,7 +15,7 @@ describe extended alter1;
 alter table alter1 set serdeproperties('s1'='10', 's2' ='20');
 describe extended alter1;
 
-add jar ../data/files/TestSerDe.jar;
+add jar ../build/ql/test/TestSerDe.jar;
 alter table alter1 set serde 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties('s1'='9');
 describe extended alter1;
 
@@ -56,7 +56,7 @@ DESCRIBE EXTENDED alter1;
 ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20');
 DESCRIBE EXTENDED alter1;
 
-add jar ../data/files/TestSerDe.jar;
+add jar ../build/ql/test/TestSerDe.jar;
 ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9');
 DESCRIBE EXTENDED alter1;
 

Modified: hive/trunk/ql/src/test/queries/clientpositive/input16.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input16.q?rev=1527004&r1=1527003&r2=1527004&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input16.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input16.q Fri Sep 27 17:53:25 2013
@@ -1,6 +1,6 @@
 -- TestSerDe is a user defined serde where the default delimiter is Ctrl-B
 DROP TABLE INPUT16;
-ADD JAR ../data/files/TestSerDe.jar;
+ADD JAR ../build/ql/test/TestSerDe.jar;
 CREATE TABLE INPUT16(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../data/files/kv1_cb.txt' INTO TABLE INPUT16;
 SELECT INPUT16.VALUE, INPUT16.KEY FROM INPUT16;

Modified: hive/trunk/ql/src/test/queries/clientpositive/input16_cc.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/input16_cc.q?rev=1527004&r1=1527003&r2=1527004&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/input16_cc.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/input16_cc.q Fri Sep 27 17:53:25 2013
@@ -4,7 +4,7 @@ set hive.input.format=org.apache.hadoop.
 -- the user is overwriting it with ctrlC
 
 DROP TABLE INPUT16_CC;
-ADD JAR ../data/files/TestSerDe.jar;
+ADD JAR ../build/ql/test/TestSerDe.jar;
 CREATE TABLE INPUT16_CC(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe'  with serdeproperties ('testserde.default.serialization.format'='\003', 'dummy.prop.not.used'='dummyy.val') STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../data/files/kv1_cc.txt' INTO TABLE INPUT16_CC;
 SELECT INPUT16_CC.VALUE, INPUT16_CC.KEY FROM INPUT16_CC;