Author: olga
Date: Thu Feb 4 01:45:13 2010
New Revision: 906321
URL: http://svn.apache.org/viewvc?rev=906321&view=rev
Log:
PIG-1214: Pig 0.6 Docs fixes (chandec via olgan)
Modified:
hadoop/pig/branches/branch-0.6/CHANGES.txt
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/piglatin_ref2.xml
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/zebra_pig.xml
Modified: hadoop/pig/branches/branch-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/CHANGES.txt?rev=906321&r1=906320&r2=906321&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.6/CHANGES.txt Thu Feb 4 01:45:13 2010
@@ -26,6 +26,8 @@
IMPROVEMENTS
+PIG-1214: Pig 0.6 Docs fixes (chandec via olgan)
+
PIG-1197: TextLoader updated to match changes to PigStorage (gates)
PIG-1192: Pig 0.6 Docs fixes (chandec via olgan)
Modified:
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/piglatin_ref2.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/piglatin_ref2.xml?rev=906321&r1=906320&r2=906321&view=diff
==============================================================================
---
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/piglatin_ref2.xml
(original)
+++
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/piglatin_ref2.xml
Thu Feb 4 01:45:13 2010
@@ -8710,7 +8710,7 @@
<informaltable frame="all">
<tgroup cols="1"><tbody><row>
<entry>
- <para>PigStorage(field_delimiter)Â Â Â Â </para>
+ <para>PigStorage(field_delimiter)Â </para>
</entry>
</row></tbody></tgroup>
</informaltable></section>
@@ -8732,16 +8732,15 @@
<section>
<title>Usage</title>
- <para>PigStorage works with structured text files in human-readable UTF-8
format. PigStorage also works with simple and complex data types and is the
default function for the LOAD and STORE operators.</para>
- <itemizedlist>
- <listitem>
- <para>For load statements, PigStorage expects data to be formatted as
delimiter-separated fields and newline-separated records ('\n'). </para>
- </listitem>
- <listitem>
- <para>For store statements, PigStorage outputs data as
delimiter-separated fields and newline-separated records ('\n'). </para>
- </listitem>
- </itemizedlist>
- <para>For both load and store statements the default field delimiter is the
tab character ('\t'). You can use other characters as field delimiters, but
separators such as ^A or Ctrl-A should be represented in Unicode (\u0001) using
UTF-16 encoding (see Wikipedia <ulink
url="http://en.wikipedia.org/wiki/ASCII";>ASCII</ulink>, <ulink
url="http://en.wikipedia.org/wiki/Unicode";>Unicode</ulink>, and <ulink
url="http://en.wikipedia.org/wiki/UTF-16";>UTF-16</ulink>).</para>
+ <para>PigStorage is the default function for the LOAD and STORE operators.
PigStorage works with structured text files (in human-readable UTF-8 format)
and bzip compressed text files. PigStorage also works with simple and complex
data types.</para>
+
+ <para>Load statements â PigStorage expects data to be formatted using
field delimiters, either the tab character ('\t') or other specified
character.</para>
+
+ <para>Store statements â PigStorage outputs data using field deliminters,
either the tab character ('\t') or other specified character, and the line
feed record delimiter ('\n'). </para>
+
+ <para>Field Deliminters â For load and store statements the default field
delimiter is the tab character ('\t'). You can use other characters as field
delimiters, but separators such as ^A or Ctrl-A should be represented in
Unicode (\u0001) using UTF-16 encoding (see Wikipedia <ulink
url="http://en.wikipedia.org/wiki/ASCII";>ASCII</ulink>, <ulink
url="http://en.wikipedia.org/wiki/Unicode";>Unicode</ulink>, and <ulink
url="http://en.wikipedia.org/wiki/UTF-16";>UTF-16</ulink>).</para>
+
+ <para>Record Deliminters â For load statements Pig interprets the line
feed ( '\n' ), carriage return ( '\r' or CTRL-M) and combined CR + LF ( '\r\n'
) characters as record delimiters (do not use these characters as field
delimiters). For store statements Pig uses the line feed ('\n') character as
the record delimiter. For load and store statements, if the input file is a
bzip file (ending in .bz or .bz2), Pig uses the line feed ('\n') character as
the record delimiter.</para>
</section>
<section>
Modified:
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/zebra_pig.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/zebra_pig.xml?rev=906321&r1=906320&r2=906321&view=diff
==============================================================================
---
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/zebra_pig.xml
(original)
+++
hadoop/pig/branches/branch-0.6/src/docs/src/documentation/content/xdocs/zebra_pig.xml
Thu Feb 4 01:45:13 2010
@@ -102,8 +102,14 @@
</section>
<!--end example: map-side data-->
-
-
+ <!--sorting data-->
+ <section>
+ <title>Sorting Data</title>
+ <p>
+ Pig allows you to sort data by ascending (ASC) or descending (DESC) order
(for more information, see <a href="piglatin_ref2.html#ORDER">ORDER</a>).
Currently, Zebra supports tables that are sorted in ascending order. Zebra does
not support tables that are sorted in descending order; if Zebra encounters a
table to be stored that is sorted in descending order, Zebra will issue a
warning and store the table as an unsorted table.</p>
+ </section>
+ <!--end sorting data-->
+
<!--example: storing data-->
<section>
<title>Storing Data</title>
