pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cheol...@apache.org
Subject svn commit: r1601313 - in /pig/trunk: CHANGES.txt build.xml contrib/zebra/ src/org/apache/pig/data/DataReaderWriter.java test/e2e/pig/drivers/TestDriverScript.pm
Date Mon, 09 Jun 2014 05:27:57 GMT
Author: cheolsoo
Date: Mon Jun  9 05:27:57 2014
New Revision: 1601313

URL: http://svn.apache.org/r1601313
Log:
PIG-3996: Delete zebra from svn (cheolsoo)

Removed:
    pig/trunk/contrib/zebra/
Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml
    pig/trunk/src/org/apache/pig/data/DataReaderWriter.java
    pig/trunk/test/e2e/pig/drivers/TestDriverScript.pm

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1601313&r1=1601312&r2=1601313&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jun  9 05:27:57 2014
@@ -177,6 +177,8 @@ PIG-3882: Multiquery off mode execution 
  
 BUG FIXES
 
+PIG-3996: Delete zebra from svn (cheolsoo)
+
 PIG-3991: TestErrorHandling.tesNegative7 is broken in trunk/branch-0.13 (cheolsoo)
 
 PIG-3990: ant docs is broken in trunk/branch-0.13 (cheolsoo)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1601313&r1=1601312&r2=1601313&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Mon Jun  9 05:27:57 2014
@@ -458,10 +458,6 @@
         <ant target="clean" dir="contrib/piggybank/java" inheritAll="false"/>
     </target>
 
-    <target name="clean-zebra" description="Cleanup Zebra">
-        <ant target="clean" dir="contrib/zebra" inheritAll="false"/>
-    </target>
-
     <target name="clean-tutorial" description="Cleanup Tutorial">
         <ant target="clean" dir="tutorial" inheritAll="false"/>
     </target>
@@ -629,24 +625,19 @@
         </javadoc>
     </target>
 
-    <target name="javadoc-all" depends="jar-withouthadoop, piggybank, zebra, ivy-javadoc"
description="Create documentation including all contrib projects">
+    <target name="javadoc-all" depends="jar-withouthadoop, piggybank, ivy-javadoc" description="Create
documentation including all contrib projects">
         <mkdir dir="${build.javadoc}" />
-        <javadoc overview="${src.dir}/overview.html" packagenames="org.apache.pig*,org.apache.hadoop.zebra*"
destdir="${build.javadoc}" author="true" version="true" use="true" windowtitle="${Name} ${version}
API" doctitle="${Name} ${version} API" bottom="Copyright &amp;copy; ${year} The Apache
Software Foundation">
+        <javadoc overview="${src.dir}/overview.html" packagenames="org.apache.pig*" destdir="${build.javadoc}"
author="true" version="true" use="true" windowtitle="${Name} ${version} API" doctitle="${Name}
${version} API" bottom="Copyright &amp;copy; ${year} The Apache Software Foundation">
             <packageset dir="${src.dir}" />
             <packageset dir="contrib/piggybank/java/src/main/java"/>
-            <packageset dir="contrib/zebra/src/java"/>
             <link href="${javadoc.link.java}" />
             <classpath>
                 <path refid="javadoc-classpath" />
                 <pathelement path="${output.jarfile.withdependencies}" />
                 <pathelement path="${piggybank.jarfile}"/>
-                <fileset dir="build">
-                    <include name="**/zebra-*-dev.jar"/>
-                </fileset>
             </classpath>
             <group title="pig" packages="org.apache.pig*" />
             <group title="contrib: Piggybank" packages="org.apache.pig.piggybank*" />
-            <group title="contrib: Zebra" packages="org.apache.hadoop.zebra*"/>
         </javadoc>
     </target>
 
@@ -920,14 +911,6 @@
         <antcall target="test-core" inheritRefs="true" inheritall="true"/>
     </target>
 
-    <target name="test-contrib-internal" unless="testcase">
-        <antcall target="test-contrib" inheritRefs="true" inheritall="true"/>
-    </target>
-
-    <target name="test-contrib" depends="compile-test" description="to call contrib tests">
-        <subant target="pigtest" buildpath="contrib/zebra" antfile="build.xml"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- End to end tests                                                   -->
     <!-- ================================================================== -->
@@ -1098,7 +1081,7 @@
     <!-- ================================================================== -->
     <!-- Make release tarball                                               -->
     <!-- ================================================================== -->
-    <target name="src-release" depends="clean, clean-piggybank, clean-zebra, clean-test-e2e,
clean-tutorial" description="Source distribution">
+    <target name="src-release" depends="clean, clean-piggybank, clean-test-e2e, clean-tutorial"
description="Source distribution">
         <mkdir dir="${build.dir}"/>
         <tar compression="gzip" longfile="gnu"
              destfile="${build.dir}/${final.name}-src.tar.gz">
@@ -1704,10 +1687,6 @@
          </ant>
      </target>
 
-     <target name="zebra" depends="jar">
-         <ant antfile="contrib/zebra/build.xml" inheritAll="false"/>
-     </target>
-
      <import file="./build-site.xml" optional="true"/>
 
 </project>

Modified: pig/trunk/src/org/apache/pig/data/DataReaderWriter.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/data/DataReaderWriter.java?rev=1601313&r1=1601312&r2=1601313&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/data/DataReaderWriter.java (original)
+++ pig/trunk/src/org/apache/pig/data/DataReaderWriter.java Mon Jun  9 05:27:57 2014
@@ -37,7 +37,7 @@ import org.joda.time.DateTimeZone;
  * This class was used to handle reading and writing of intermediate
  *  results of data types. Now that functionality is in {@link BinInterSedes}
  *  This class could also be used for storing permanent results, it used
- *  by BinStorage and Zebra through DefaultTuple class.
+ *  by BinStorage through DefaultTuple class.
  */
 @InterfaceAudience.Private
 @InterfaceStability.Stable

Modified: pig/trunk/test/e2e/pig/drivers/TestDriverScript.pm
URL: http://svn.apache.org/viewvc/pig/trunk/test/e2e/pig/drivers/TestDriverScript.pm?rev=1601313&r1=1601312&r2=1601313&view=diff
==============================================================================
--- pig/trunk/test/e2e/pig/drivers/TestDriverScript.pm (original)
+++ pig/trunk/test/e2e/pig/drivers/TestDriverScript.pm Mon Jun  9 05:27:57 2014
@@ -91,13 +91,6 @@ sub runTest
 
         my %result;
 
-        # extract the current zebra.jar file path from the classpath
-        # and enter it in the hash for use in the substitution of :ZEBRAJAR:
-        my $zebrajar = $testCmd->{'cp'};
-        $zebrajar =~ s/zebra.jar.*/zebra.jar/;
-        $zebrajar =~ s/.*://;
-        $testCmd->{'zebrajar'} = $zebrajar;
-
         if(  $testCmd->{'pig'} ){
            return runPig( $self, $testCmd, $log );
         } elsif(  $testCmd->{'pigsql'} ){
@@ -126,7 +119,6 @@ sub runPig
     $pigcmd =~ s/:OUTPATH:/$outfile/g;
     $pigcmd =~ s/:FUNCPATH:/$testCmd->{'funcjarPath'}/g;
     $pigcmd =~ s/:PIGGYBANKPATH:/$testCmd->{'piggybankjarPath'}/g;
-    $pigcmd =~ s/:ZEBRAJAR:/$testCmd->{'zebrajar'}/g;
     $pigcmd =~ s/:RUNID:/$testCmd->{'UID'}/g;
     $pigcmd =~ s/:PIGHARNESS:/$ENV{PIG_HARNESS_ROOT}/g;
     $pigcmd =~ s/:USRHOMEPATH:/$testCmd->{'userhomePath'}/g;



Mime
View raw message