You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ol...@apache.org on 2010/12/09 23:42:55 UTC
svn commit: r1044156 - in /pig/trunk: CHANGES.txt KEYS build.xml
src/docs/src/documentation/content/xdocs/tutorial.xml
src/docs/src/documentation/content/xdocs/udf.xml
src/docs/src/documentation/content/xdocs/zebra_overview.xml
Author: olga
Date: Thu Dec 9 22:42:54 2010
New Revision: 1044156
URL: http://svn.apache.org/viewvc?rev=1044156&view=rev
Log:
PIG-1728: doc updates (chandec via olgan)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/KEYS
pig/trunk/build.xml
pig/trunk/src/docs/src/documentation/content/xdocs/tutorial.xml
pig/trunk/src/docs/src/documentation/content/xdocs/udf.xml
pig/trunk/src/docs/src/documentation/content/xdocs/zebra_overview.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1044156&r1=1044155&r2=1044156&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Dec 9 22:42:54 2010
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-1728: doc updates (chandec via olgan)
+
PIG-1752: Enable UDFs to indicate files to load into the Distributed Cache
(gates)
Modified: pig/trunk/KEYS
URL: http://svn.apache.org/viewvc/pig/trunk/KEYS?rev=1044156&r1=1044155&r2=1044156&view=diff
==============================================================================
--- pig/trunk/KEYS (original)
+++ pig/trunk/KEYS Thu Dec 9 22:42:54 2010
@@ -6,27 +6,28 @@ sig 06687D96 2008-07-14 Olga N
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.2.6 (GNU/Linux)
-mQGiBEh7rwMRBACRWYBxkUT3jICHIbgSxCpPkEzr8aXwWlRu0dAKXxj9nklyfqz8
-R5XGaD7W1HfyvmQzO1g0oQ15JFXPIhgNJ5ZbZptq/YaQf0qWAK2RRjFZNyQIg9KF
-nfFX6zdU2e5YIrx/aTQezOw6ThIUHE5hOP/vo6xo4IhjDjRBZxqtmFOtDwCgvklj
-b8issjgf0jwFH9mB3qTCDGMD/3cZTjU3gx+M3e+/7g52BK16zbLRCy3FETV2kxAI
-U0ghF032kENuuHzU9l1sGAeTSg9i+927ohg0zx+WP+HPgGZKY8CJLyswWmPWmAge
-ZJmXVlCad84/X7GD5lu1t3Ueibnw9ZWKH+oCG5mKJpBiklyyzk1OIwwIEsdsIeOF
-MrBFA/sF/cRDNWJWFVgb0jx0pLTkTN8SSePvklElIPfuYPmNj0fG95cQlXmooDbF
-5RHHG8WRuECrrzJTSpiqQ/7AFVnRWdY6Mb1IhVudDEyGSlUYCtXC63nbPWomTKOd
-NII92gS2DCBCXU+CWhsmTDsPyxbpA8sPGxzASJgoXvgVP1b4EbQkT2xnYSBOYXRr
-b3ZpY2ggPG9sZ2FuQHlhaG9vLWluYy5jb20+iF4EExECAB4FAkh7rwMCGwMGCwkI
-BwMCAxUCAwMWAgECHgECF4AACgkQ02eP0wZofZZUfQCgp+nujZ+/7uzlgNYecjfp
-nKyxZ6AAoJm9hjNpTYnzCKSmXRKh2Gdo8N8+uQENBEh7rwQQBACqUm8KbPN/a1Yt
-aG6Hlcj1Zx5jnbCZ+PYzkKN4LAvnmBHCgJUsliEiJ5XGVOVIbMyVT9+Ivwei81Px
-F95HeBarD7cISOlnbGHLME7RCpMFx36I5YR0ZFAYtGS8q1YM6nUN8hqmRVlBYC/7
-D7j9PQ/cM6Z/jS1jJ1q7XIFXzPIplwADBQQAgHMMryaVQvN/7zhrgN5E9tLLeCCF
-b7Al3yfZteuqg3hTU2fuHPuw9SwdL8whbglmKsGylZJ7ULdq1EZQztuGbQ1CwVVb
-QWeLnLktB1Q2F0x2YqdtVi3/+uj5rXYOxcKns0iOS3y6mKccpuEk6CUiFMtLh7NB
-+bQz/IDHO3Ql+vGISQQYEQIACQUCSHuvBAIbDAAKCRDTZ4/TBmh9lqZHAJsHomGp
-LMYTpbXVonowdEk4YL45jQCfY2/fXDhD2IwYB+PGmdcsWeEv10Y=
-=WLZG
+mQGiBEz/+9QRBACtgXbyja8lZlYinW6pGW+a7A8jhaEUS1FN7IGTIqJtqwcN7pS3
+jL9x/8DpuMzI2H7/uEElqa3vUqwGsHZy1mK8xJ2IWfvDJkx8KKDBRFc/5gG4KrPz
+zhEtqiYy+UYAyYTIa31G0Yi0tUtl7w4NMrk4SbAXvidWOLlc7fPbnzNwewCg29NA
+d+DhtjMsGISw+9UdXskuK5kD/A2rRkkUGSXMMG3F6t8UxoEFS2hp6LFpjhPpp7bp
+MEx4Dd3SaWYMgv2kX2Lw4GKY/cWMCBuRvSkoGvbUrLbyFk3eUFDxBthc9VudFmga
+JpCXT/hIR1xJ8cqBJmfCc6K/z9U5kjyFfxm4lX/Y+iUL5f3QTvIAmVlawnZARAFu
+H2aPA/4/s+qQDulGGYXRNtNoHzppzfO24mPPvjgfDJ4jupZwOISm3/Jc4zY/dGxi
+x3/61cQIrZXJ+OBlsfIfPnz5zh1e+I4y1XzozZlvBPUaVoMKUZHUXyQsi9UlgvIz
+QdU7iK0MpYEpXC+DC1KQtkXwNSdx63+a40wyh+vW5QZ583Fmz7QkT2xnYSBOYXRr
+b3ZpY2ggPG9sZ2FuQHlhaG9vLWluYy5jb20+iF4EExECAB4FAkz/+9QCGwMGCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQd9QuHGc7InkMSQCeKR0Q2Qst2zc6t/JA7T6y
+X/ukBVIAnR5de4YI3+LsToqZJFUvPDg4uG5TuQENBEz/+9YQBADcTndyZ0Vmh46R
+UjqNRmv27rcsH62fvLIE7vUE2AQaDE1hEMwawjZXhtFa6Bzh6WWRXqkdNUWnx0E8
+HIHhI6jAOJ2Zgc5zickkFOC/zLuipogCt0n1saK0ZXyKOLWOEX/ggxb9QUcHjpT2
+Rih5Sf95XQ8q5jI6kPvv6YwX0rwMhwADBQQAqSbFpnQIb+V1xo6cwqBpjizVSadM
+M5lXmsVngW+QMRp5hrw2bGfzkyDo2eowItUVyleCzTl7npFFFHKtNDS2g40QOB3z
+YzKXLa+dsst2BUzbZryXpHUZLQ0IynsY14m3CTjuhoBe4awQl2bZrl6Yuvad/RNy
+eJYZ4TCJB3/0BnCISQQYEQIACQUCTP/71gIbDAAKCRB31C4cZzsieTujAKCfvkXU
+b6o3+hGaiQ91NNa06K3eOQCffz+zGQJQ4Ab18AVUfjq69TRHEHA=
+=0PGJ
-----END PGP PUBLIC KEY BLOCK-----
+
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.2.6 (GNU/Linux)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1044156&r1=1044155&r2=1044156&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Thu Dec 9 22:42:54 2010
@@ -766,8 +766,7 @@
<fileset dir="${lib.dir}"/>
</copy>
- <copy file="${output.jarfile.backcompat}" tofile="${dist.dir}/${final.name}.jar" />
- <copy file="${output.jarfile.core}" tofile="${dist.dir}/${final.name}-core.jar" />
+ <copy file="${output.jarfile.backcompat}" tofile="${dist.dir}/${final.name}-core.jar" />
<copy todir="${dist.dir}/" file="ivy.xml" />
Modified: pig/trunk/src/docs/src/documentation/content/xdocs/tutorial.xml
URL: http://svn.apache.org/viewvc/pig/trunk/src/docs/src/documentation/content/xdocs/tutorial.xml?rev=1044156&r1=1044155&r2=1044156&view=diff
==============================================================================
--- pig/trunk/src/docs/src/documentation/content/xdocs/tutorial.xml (original)
+++ pig/trunk/src/docs/src/documentation/content/xdocs/tutorial.xml Thu Dec 9 22:42:54 2010
@@ -37,76 +37,49 @@
</ul>
<p>The Pig tutorial file (tutorial/pigtutorial.tar.gz file in the pig distribution) includes the Pig JAR file (pig.jar) and the tutorial files (tutorial.jar, Pigs scripts, log files).
These files work with Hadoop 0.20.2 and include everything you need to run the Pig scripts.</p>
-
-<p>To get started, follow these basic steps: </p>
-<ol>
-<li><p>Install Java </p>
-</li>
-<li><p>Install Pig </p>
-</li>
-<li><p>Run the Pig scripts - in Local or Hadoop mode </p>
-</li>
-</ol>
</section>
<section>
-<title> Java Installation</title>
+<title>Check Your Setup</title>
-<p>Make sure your run-time environment includes the following: </p>
-<ul >
-<li><p>Java 1.6 or higher (preferably from Sun) </p>
-</li>
-<li><p>The JAVA_HOME environment variable is set the root of your Java installation. </p>
-</li>
-</ul>
+<p>Check your run-time environment and do the following preliminary tasks:</p>
-</section>
-
-<section>
-<title> Pig Installation</title>
-
-<p>To install Pig, do the following: </p>
<ol>
-<li><p>Download the Pig tutorial file to your local directory. </p>
+<li>Make sure the JAVA_HOME environment variable is set the root of your Java installation.</li>
+<li>Make sure that bin/pig is in your PATH (this enables you to run the tutorials using the "pig" command).
+<source>
+$ export PATH=/<my-path-to-pig>/pig-n.n.n/bin:$PATH
+</source>
</li>
-<li><p>Unzip the Pig tutorial file (the files are stored in a newly created directory, pigtmp). </p>
+<li>Set the PIG_HOME environment variable:
+<source>
+$ export PIG_HOME=/<my-path-to-pig>/pig-n.n.n
+</source></li>
+<li>Copy the pigtutorial.tar.gz file from the tutorial directory of your Pig installation to your local directory. </li>
+<li>Unzip the Pig tutorial file (the files are stored in a newly created directory, pigtmp).
<source>
$ tar -xzf pigtutorial.tar.gz
</source>
</li>
-<li><p>Move to the pigtmp directory. </p>
-</li>
-<li><p>Review the contents of the Pig tutorial file. </p>
-</li>
-<li><p>Copy the <strong>pig.jar</strong> file to the appropriate directory on your system. For example: /home/me/pig. </p>
-</li>
-<li><p>Create an environment variable, <strong>PIGDIR</strong>, and point it to your directory; for example, export PIGDIR=/home/me/pig (bash, sh) or setenv PIGDIR /home/me/pig (tcsh, csh). </p>
-</li>
+<li>Review Pig Script 1 and Pig Script 2.</li>
</ol>
</section>
+
<section>
<title> Running the Pig Scripts in Local Mode</title>
<p>To run the Pig scripts in local mode, do the following: </p>
<ol>
-<li>
-<p>Set the maximum memory for Java.</p>
-<source>
-java -Xmx256m -cp pig.jar org.apache.pig.Main -x local script1-local.pig
-java -Xmx256m -cp pig.jar org.apache.pig.Main -x local script2-local.pig
-</source>
-</li>
-<li><p>Move to the pigtmp directory. </p></li>
-<li><p>Review Pig Script 1 and Pig Script 2. </p></li>
-<li>
-<p>Execute the following command (using either script1-local.pig or script2-local.pig). </p>
+
+<li>Move to the pigtmp directory.</li>
+<li>Execute the following command (using either script1-local.pig or script2-local.pig).
<source>
-$ java -cp $PIGDIR/pig.jar org.apache.pig.Main -x local script1-local.pig
+$ pig -x local script1-local.pig
</source>
</li>
-<li><p>Review the result files, located in the part-r-00000 directory.</p>
+<li>Review the result files, located in the part-r-00000 directory.
<p>The output may contain a few Hadoop warnings which can be ignored:</p>
<source>
2010-04-08 12:55:33,642 [main] INFO org.apache.hadoop.metrics.jvm.JvmMetrics
@@ -114,8 +87,6 @@ $ java -cp $PIGDIR/pig.jar org.apache.pi
</source>
</li>
</ol>
-
-
</section>
<section>
@@ -123,25 +94,29 @@ $ java -cp $PIGDIR/pig.jar org.apache.pi
<p>To run the Pig scripts in mapreduce mode, do the following: </p>
<ol>
-<li><p>Move to the pigtmp directory. </p>
-</li>
-<li><p>Review Pig Script 1 and Pig Script 2. </p>
-</li>
-<li><p>Copy the excite.log.bz2 file from the pigtmp directory to the HDFS directory. </p>
+<li>Move to the pigtmp directory.</li>
+<li>Copy the excite.log.bz2 file from the pigtmp directory to the HDFS directory.
<source>
$ hadoop fs âcopyFromLocal excite.log.bz2 .
</source>
</li>
-<li><p>Set the HADOOP_CONF_DIR environment variable to the location of your core-site.xml, hdfs-site.xml and mapred-site.xml files. </p>
-</li>
-<li><p>Execute the following command (using either script1-hadoop.pig or script2-hadoop.pig): </p>
+<li>Set the PIG_CLASSPATH environment variable to the location of the cluster configuration directory (the directory that contains the core-site.xml, hdfs-site.xml and mapred-site.xml files):
+<source>
+export PIG_CLASSPATH=/mycluster/conf
+</source></li>
+<li>Set the HADOOP_CONF_DIR environment variable to the location of the cluster configuration directory:
+<source>
+export HADOOP_CONF_DIR=/mycluster/conf
+</source></li>
+
+<li>Execute the following command (using either script1-hadoop.pig or script2-hadoop.pig):
<source>
-$ java -cp $PIGDIR/pig.jar:$HADOOP_CONF_DIR org.apache.pig.Main script1-hadoop.pig
+$ pig script1-hadoop.pig
</source>
</li>
-<li><p>Review the result files, located in the script1-hadoop-results or script2-hadoop-results HDFS directory: </p>
+<li>Review the result files, located in the script1-hadoop-results or script2-hadoop-results HDFS directory:
<source>
$ hadoop fs -ls script1-hadoop-results
$ hadoop fs -cat 'script1-hadoop-results/*' | less
Modified: pig/trunk/src/docs/src/documentation/content/xdocs/udf.xml
URL: http://svn.apache.org/viewvc/pig/trunk/src/docs/src/documentation/content/xdocs/udf.xml?rev=1044156&r1=1044155&r2=1044156&view=diff
==============================================================================
--- pig/trunk/src/docs/src/documentation/content/xdocs/udf.xml (original)
+++ pig/trunk/src/docs/src/documentation/content/xdocs/udf.xml Thu Dec 9 22:42:54 2010
@@ -110,7 +110,7 @@ public class UPPER extends EvalFunc<S
<p>Now that we have the function implemented, it needs to be compiled and included in a jar. You will need to build <code>pig.jar</code> to compile your UDF. You can use the following set of commands to checkout the code from SVN repository and create pig.jar: </p>
<source>
-svn co http://svn.apache.org/repos/asf/hadoop/pig/trunk
+svn co http://svn.apache.org/repos/asf/pig/trunk
cd trunk
ant
</source>
Modified: pig/trunk/src/docs/src/documentation/content/xdocs/zebra_overview.xml
URL: http://svn.apache.org/viewvc/pig/trunk/src/docs/src/documentation/content/xdocs/zebra_overview.xml?rev=1044156&r1=1044155&r2=1044156&view=diff
==============================================================================
--- pig/trunk/src/docs/src/documentation/content/xdocs/zebra_overview.xml (original)
+++ pig/trunk/src/docs/src/documentation/content/xdocs/zebra_overview.xml Thu Dec 9 22:42:54 2010
@@ -58,9 +58,9 @@
<section>
<title>Download Zebra</title>
<p>Zebra is a Pig contrib project and is available at: <br></br>
- <a href="http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/">http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/</a></p>
+ <a href="http://svn.apache.org/viewvc/pig/trunk/contrib/zebra/">http://svn.apache.org/viewvc/pig/trunk/contrib/zebra/</a></p>
<p>To work with Zebra you need to check out the Pig trunk: <br></br>
- <a href="http://svn.apache.org/repos/asf/hadoop/pig/trunk/ ">http://svn.apache.org/repos/asf/hadoop/pig/trunk/</a></p>
+ <a href="http://svn.apache.org/repos/asf/pig/trunk/">http://svn.apache.org/repos/asf/pig/trunk/</a></p>
</section>
<section>