phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject svn commit: r1583268 [3/4] - in /incubator/phoenix: phoenix-docs/src/docsrc/help/ phoenix-docs/src/docsrc/html/ phoenix-docs/src/tools/org/h2/build/doc/ site/publish/ site/publish/language/ site/source/ site/source/src/site/ site/source/src/site/markdown/
Date Mon, 31 Mar 2014 08:53:55 GMT
Modified: incubator/phoenix/site/publish/mailing_list.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/mailing_list.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/mailing_list.html (original)
+++ incubator/phoenix/site/publish/mailing_list.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -237,6 +239,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -256,6 +261,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -268,7 +276,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/mr_dataload.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/mr_dataload.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/mr_dataload.html (original)
+++ incubator/phoenix/site/publish/mr_dataload.html Mon Mar 31 08:53:54 2014
@@ -1,14 +1,14 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-17
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
 
 	<head>
 		<meta charset="UTF-8" />
-		<title>Bulk CSV Data Load using Map-Reduce | Apache Phoenix</title>
+		<title>Bulk CSV Data Loading | Apache Phoenix</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta name="description" content="" />
 		<meta http-equiv="content-language" content="en" />
@@ -73,12 +73,14 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
@@ -117,96 +119,141 @@
 		<div class="span12">
 			<div class="body-content">
 <div class="page-header">
- <h1>Bulk CSV Data Load using Map-Reduce</h1>
+ <h1>Bulk CSV Data Loading</h1>
 </div> 
-<p>Phoenix v 2.1 provides support for loading CSV data into a new/existing Phoenix table using Hadoop Map-Reduce. This provides a means of bulk loading CSV data in parallel through map-reduce, yielding better performance in comparison with the existing <a href="download.html#Loading-Data">psql csv loader</a>.</p> 
+<p>Phoenix provides two methods for loading CSV data into Phoenix tables – a single-threaded client loading tool via the <a href="download.html#Loading-Data">psql</a> command, and a MapReduce-based bulk load tool. The psql tool is typically appropriate for tens of megabytes, while the MapReduce-based loader is typically better for larger load volumes.</p> 
+<p>Use of both loaders is described below.</p> 
 <div class="section"> 
- <div class="section"> 
-  <div class="section"> 
-   <h4 id="Sample_input_CSV_data:">Sample input CSV data:</h4> 
-   <div class="source"> 
-    <pre>12345, John, Doe
-67890, Mary, Poppins
+ <h2 id="Sample_data">Sample data</h2> 
+ <p>For the following examples, we will assume that we have a CSV file named “data.csv” with the following content:</p> 
+ <div class="source"> 
+  <pre>12345,John,Doe
+67890,Mary,Poppins
 </pre> 
-   </div> 
-  </div> 
-  <div class="section"> 
-   <h4 id="Compatible_Phoenix_schema_to_hold_the_above_CSV_data:">Compatible Phoenix schema to hold the above CSV data:</h4> 
-   <div class="source"> 
-    <pre> CREATE TABLE ns.example (
+ </div> 
+ <p>We will use a table with the following structure:</p> 
+ <div class="source"> 
+  <pre> CREATE TABLE example (
     my_pk bigint not null,
     m.first_name varchar(50),
     m.last_name varchar(50) 
     CONSTRAINT pk PRIMARY KEY (my_pk))
 </pre> 
-   </div> 
-   <table border="0" class="bodyTable table table-striped table-hover"> 
-    <tbody> 
-     <tr class="a"> 
-      <td>Row Key</td> 
-      <td colspan="2" bgcolor="#00FF00"> 
-       <center>
-         Column Family (m) 
-       </center></td> 
-     </tr> 
-     <tr class="b"> 
-      <td><b>my_pk</b> BIGINT</td> 
-      <td><b>first_name</b> VARCHAR(50)</td> 
-      <td><b>last_name</b> VARCHAR(50)</td> 
-     </tr> 
-     <tr class="a"> 
-      <td>12345</td> 
-      <td>John</td> 
-      <td>Doe</td> 
-     </tr> 
-     <tr class="b"> 
-      <td>67890</td> 
-      <td>Mary</td> 
-      <td>Poppins</td> 
-     </tr> 
-    </tbody> 
-   </table> 
-  </div> 
-  <div class="section"> 
-   <h4 id="How_to_run">How to run?</h4> 
-   <ol style="list-style-type: decimal"> 
-    <li> <p>Please make sure that Hadoop cluster is working correctly and you are able to run any job like <a class="externalLink" href="http://wiki.apache.org/hadoop/WordCount">this</a>.</p></li> 
-    <li> <p>Copy latest phoenix-[version].jar to hadoop/lib folder on each node or add it to Hadoop classpath.</p></li> 
-    <li> <p>Run the bulk loader job using the script /bin/csv-bulk-loader.py as below:</p></li> 
-   </ol> 
-   <div class="source"> 
-    <pre>./csv-bulk-loader.py &lt;option value&gt;
-
-&lt;option&gt;  &lt;value&gt;
--i        CSV data file path in hdfs (mandatory)
--s        Phoenix schema name (mandatory if not default)
--t        Phoenix table name (mandatory)
--sql      Phoenix create table sql file path (mandatory)
--zk       Zookeeper IP:&lt;port&gt; (mandatory)
--mr       MapReduce Job Tracker IP:&lt;port&gt; (mandatory)
--hd       HDFS NameNode IP:&lt;port&gt; (mandatory)
--o        Output directory path in hdfs (optional)
--idx      Phoenix index table name (optional, not yet supported)
--error    Ignore error while reading rows from CSV ? (1-YES | 0-NO, default-1) (optional)
--help     Print all options (optional)
+ </div> 
+</div> 
+<div class="section"> 
+ <h2 id="Loading_via_PSQL">Loading via PSQL</h2> 
+ <p>The psql command is invoked via <tt>psql.py</tt> in the Phoenix bin directory. In order to use it to load CSV data, it is invoked by providing the connection information for your HBase cluster, the name of the table to load data into, and the path to the CSV file or files.</p> 
+ <p>To load the example data outlined above into HBase running on the local machine, run the following command:</p> 
+ <div class="source"> 
+  <pre>bin/psql.py -t EXAMPLE localhost data.csv
+</pre> 
+ </div> 
+ <p>The following parameters can be used for loading data with PSQL:</p> 
+ <table border="0" class="bodyTable table table-striped table-hover"> 
+  <thead> 
+   <tr class="a"> 
+    <th><i>Parameter</i> </th> 
+    <th><i>Description</i> </th> 
+   </tr> 
+  </thead> 
+  <tbody> 
+   <tr class="b"> 
+    <td>-t </td> 
+    <td>Provide the name of the table in which to load data. By default, the name of the table is taken from the name of the CSV file. </td> 
+   </tr> 
+   <tr class="a"> 
+    <td>-h </td> 
+    <td>Overrides the column names to which the CSV data maps and is case sensitive. A special value of in-line indicating that the first line of the CSV file determines the column to which the data maps. </td> 
+   </tr> 
+   <tr class="b"> 
+    <td>-s </td> 
+    <td>Run in strict mode, throwing an error on CSV parsing errors </td> 
+   </tr> 
+   <tr class="a"> 
+    <td>-d </td> 
+    <td>Supply a custom delimiter or delimiters for CSV parsing </td> 
+   </tr> 
+   <tr class="b"> 
+    <td>-a </td> 
+    <td>Supply an array delimiter (explained in more detail below) </td> 
+   </tr> 
+  </tbody> 
+ </table> 
+</div> 
+<div class="section"> 
+ <h2 id="Loading_via_MapReduce">Loading via MapReduce</h2> 
+ <p>For higher-throughput loading distributed over the cluster, the MapReduce loader can be used. This loader first converts all data into HFiles, and then provides the created HFiles to HBase after the HFile creation is complete. </p> 
+ <p>The MapReduce loader is launched using the <tt>hadoop</tt> command with the Phoenix client jar, as follows:</p> 
+ <div class="source"> 
+  <pre>hadoop jar phoenix-3.0.0-incubating-client.jar org.apache.phoenix.mapreduce.CsvBulkLoadTool --table EXAMPLE --input /data/example.csv
 </pre> 
-   </div> 
-   <p>Example</p> 
-   <div class="source"> 
-    <pre>./csv-bulk-loader.py -i hdfs://server:9000/mydir/data.csv -s ns -t example -sql ~/Documents/createTable.sql -zk server:2181 -hd hdfs://server:9000 -mr server:9001
+ </div> 
+ <p>The input file must be present on HDFS (not the local filesystem where the command is being run). </p> 
+ <p>The following parameters can be used with the MapReduce loader.</p> 
+ <table border="0" class="bodyTable table table-striped table-hover"> 
+  <thead> 
+   <tr class="a"> 
+    <th><i>Parameter</i> </th> 
+    <th><i>Description</i> </th> 
+   </tr> 
+  </thead> 
+  <tbody> 
+   <tr class="b"> 
+    <td>-i,–input </td> 
+    <td>Input CSV path (mandatory) </td> 
+   </tr> 
+   <tr class="a"> 
+    <td>-t,–table </td> 
+    <td>Phoenix table name (mandatory) </td> 
+   </tr> 
+   <tr class="b"> 
+    <td>-a,–array-delimiter </td> 
+    <td>Array element delimiter (optional) </td> 
+   </tr> 
+   <tr class="a"> 
+    <td>-c,–import-columns </td> 
+    <td>Comma-separated list of columns to be imported </td> 
+   </tr> 
+   <tr class="b"> 
+    <td>-d,–delimiter </td> 
+    <td>Input delimiter, defaults to comma </td> 
+   </tr> 
+   <tr class="a"> 
+    <td>-g,–ignore-errors </td> 
+    <td>Ignore input errors </td> 
+   </tr> 
+   <tr class="b"> 
+    <td>-o,–output </td> 
+    <td>Output path for temporary HFiles (optional) </td> 
+   </tr> 
+   <tr class="a"> 
+    <td>-s,–schema </td> 
+    <td>Phoenix schema name (optional) </td> 
+   </tr> 
+   <tr class="b"> 
+    <td>-z,–zookeeper </td> 
+    <td>Zookeeper quorum to connect to (optional) </td> 
+   </tr> 
+  </tbody> 
+ </table> 
+ <div class="section"> 
+  <h3 id="Notes_on_the_MapReduce_importer">Notes on the MapReduce importer</h3> 
+  <ol style="list-style-type: decimal"> 
+   <li>You must provide an explicit column family name in your CREATE TABLE statement for your non primary key columns, as the default column family used by Phoenix is treated specially by HBase because it starts with an underscore.</li> 
+   <li>The current bulk loader does not support the migration of index related data yet. So, if you have created your phoenix table with index, please use the <a href="download.html#Loading-Data">psql CSV loader</a>.</li> 
+  </ol> 
+ </div> 
+</div> 
+<div class="section"> 
+ <h2 id="Loading_array_data">Loading array data</h2> 
+ <p>Both the PSQL loader and MapReduce loader support loading array values with the <tt>-a</tt> flag. Arrays in a CSV file are represented by a field that uses a different delimiter than the main CSV delimiter. For example, the following file would represent an id field and an array of integers:</p> 
+ <div class="source"> 
+  <pre>1,2:3:4
+2,3:4,5
 </pre> 
-   </div> 
-   <p>This would create the phoenix table “ns.example” as specified in createTable.sql and will then load the CSV data from the file “data.csv” located in HDFS into the table.</p> 
-   <div class="section"> 
-    <h5 id="Notes">Notes</h5> 
-    <ol style="list-style-type: decimal"> 
-     <li>You must provide an explicit column family name in your CREATE TABLE statement for your non primary key columns, as the default column family used by Phoenix is treated specially by HBase because it starts with an underscore.</li> 
-     <li>The current bulk loader does not support the migration of index related data yet. So, if you have created your phoenix table with index, please use the <a href="download.html#Loading-Data">psql CSV loader</a>.</li> 
-     <li>In case you want to further optimize the map-reduce performance, please refer to the current map-reduce optimization params in the file “src/main/config/csv-bulk-load-config.properties”. In case you modify this list, please re-build the phoenix jar and re-run the job as described above.</li> 
-    </ol> 
-   </div> 
-  </div> 
  </div> 
+ <p>To load this file, the default delimiter (comma) would be used, and the array delimiter (colon) would be supplied with the parametr <tt>-a ':'</tt>.</p> 
 </div>
 			</div>
 		</div>
@@ -282,6 +329,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -301,6 +351,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >

Modified: incubator/phoenix/site/publish/multi-tenancy.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/multi-tenancy.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/multi-tenancy.html (original)
+++ incubator/phoenix/site/publish/multi-tenancy.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li class="active"><a href="" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -245,6 +247,9 @@ WHERE event_type='L';
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -264,6 +269,9 @@ WHERE event_type='L';
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -276,7 +284,7 @@ WHERE event_type='L';
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/paged.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/paged.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/paged.html (original)
+++ incubator/phoenix/site/publish/paged.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li class="active"><a href="" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -229,6 +231,9 @@ LIMIT 20
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -248,6 +253,9 @@ LIMIT 20
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li class="active">
@@ -260,7 +268,7 @@ LIMIT 20
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/performance.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/performance.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/performance.html (original)
+++ incubator/phoenix/site/publish/performance.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -254,6 +256,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -273,6 +278,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -285,7 +293,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/phoenix_on_emr.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/phoenix_on_emr.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/phoenix_on_emr.html (original)
+++ incubator/phoenix/site/publish/phoenix_on_emr.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li class="active"><a href="" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -233,6 +235,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -252,6 +257,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -264,7 +272,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/pig_integration.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/pig_integration.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/pig_integration.html (original)
+++ incubator/phoenix/site/publish/pig_integration.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -216,6 +218,9 @@ STORE A into 'hbase://CORE.ENTITY_HISTOR
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -235,6 +240,9 @@ STORE A into 'hbase://CORE.ENTITY_HISTOR
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -247,7 +255,7 @@ STORE A into 'hbase://CORE.ENTITY_HISTOR
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/recent.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/recent.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/recent.html (original)
+++ incubator/phoenix/site/publish/recent.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -121,14 +123,14 @@
 </div> 
 <p>As items are implemented from our road map, they are moved here to track the progress we’ve made:</p> 
 <ol style="list-style-type: decimal"> 
- <li><b><a href="joins.html">Joins</a></b>. Join support through hash joins (where one side of the query is small enough to fit into memory). <b>Available in our 3.0 branch and will be in our 3.0 release</b></li> 
- <li><b><a href="views.html">Views</a></b>. Allows the creation of multiple tables using the same physical HBase table. <b>Available in master branch and will be in our 3.0 release</b></li> 
- <li><b><a href="multi_tenancy.html">Multi-tenancy</a></b>. Allows independent views to be created by different tenants on a per-connection basis that all share the same physical HBase table. <b>Available in master branchand will be available in our 3.0 release</b></li> 
- <li><b><a href="sequences.html">Sequences</a></b>. Support for CREATE/DROP SEQUENCE, NEXT VALUE FOR, and CURRENT VALUE FOR has been implemented. <b>Available in our master branch and will be available in our 3.0 release</b></li> 
- <li><b>ARRAY support</b>. ARRAY support through the standard SQL syntax. <b>Available in our master branch and will be available in our 3.0 release</b></li> 
+ <li><b><a href="joins.html">Joins</a></b>. Join support through hash joins (where one side of the query is small enough to fit into memory). <b>Available in our 3.0/4.0 release</b></li> 
+ <li><b><a href="views.html">Views</a></b>. Allows the creation of multiple tables using the same physical HBase table. <b>Available in our 3.0/4.0 release</b></li> 
+ <li><b><a href="multi_tenancy.html">Multi-tenancy</a></b>. Allows independent views to be created by different tenants on a per-connection basis that all share the same physical HBase table. <b>Available in our 3.0/4.0 release</b></li> 
+ <li><b><a href="sequences.html">Sequences</a></b>. Support for CREATE/DROP SEQUENCE, NEXT VALUE FOR, and CURRENT VALUE FOR has been implemented. <b>Available in our 3.0/4.0 release</b></li> 
+ <li><b><a href="array_type.html">ARRAY Type</a></b>. Suppport for the standard JDBC ARRAY type. <b>Available in our 3.0/4.0 release</b></li> 
  <li><b><a href="secondary_indexing.html">Secondary Indexes</a></b>. Allows users to create indexes over mutable or immutable data through a new <tt>CREATE INDEX</tt> DDL command. Behind the scenes, Phoenix creates a separate HBase table with a different row key for the index. At query time, Phoenix takes care of choosing the best table to use based on how much of the row key can be formed. We support getting at the uncommitted <tt>List&lt;KeyValue&gt;</tt> for both the data and the index tables to allow an HFile to be built without needing an HBase connection using the “connectionless” of our JDBC driver.</li> 
- <li><b>Row Value Constructors</b>. A standard SQL construct to efficiently locate the row at or after a composite key value. Enables a query-more capability to efficiently step through your data and optimizes IN list of composite key values to be point gets.</li> 
- <li><b><a href="mr_dataload.html">Map-reduce-based CSV Bulk Loader</a></b> Builds Phoenix-compliant HFiles and load them into HBase.</li> 
+ <li><b><a href="paged.html">Paged Queries</a></b>. Paged queries through row value constructors, a standard SQL construct to efficiently locate the row at or after a composite key value. Enables a query-more capability to efficiently step through your data and optimizes IN list of composite key values to be point gets.</li> 
+ <li><b><a href="bulk_dataload.html">Map-reduce-based CSV Bulk Loader</a></b> Builds Phoenix-compliant HFiles and load them into HBase.</li> 
  <li><b>Aggregation Enhancements</b>. <tt>COUNT DISTINCT</tt>, <tt>PERCENTILE</tt>, and <tt>STDDEV</tt> are now supported.</li> 
  <li><b>Type Additions</b>. The <tt>FLOAT</tt>, <tt>DOUBLE</tt>, <tt>TINYINT</tt>, and <tt>SMALLINT</tt> are now supported.</li> 
  <li><b>IN/OR/LIKE Optimizations</b>. When an IN (or the equivalent OR) and a LIKE appears in a query using the leading row key columns, compile it into a skip scanning filter to more efficiently retrieve the query results.</li> 
@@ -212,6 +214,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -231,6 +236,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -243,7 +251,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/roadmap.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/roadmap.html (original)
+++ incubator/phoenix/site/publish/roadmap.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -121,26 +123,39 @@
 </div> 
 <p>Our roadmap is driven by our user community. Below, in prioritized order, is the current plan for Phoenix:</p> 
 <ol style="list-style-type: decimal"> 
- <li><b>Hash Joins</b>. Provide the ability to join together multiple tables, through a phased approach: <br /><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-151">Equi-join</a></b>. Support left, right, inner, outer equi-joins where one side of the join is small enough to fit into memory. <b>Available in 3.0 branch</b> <br /><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-167">Semi/anti-join</a></b>. Support correlated sub queries for exists and in where one side of the join is small enough to fit into memory.</li> 
- <li><b><a href="views.html">Views</a></b>. Allows the creation of multiple tables using the same physical HBase table. <b>Available in 3.0 branch</b></li> 
- <li><b><a href="multi_tenancy.html">Multi-tenancy</a></b>. Allows independent views to be created by different tenants on a per-connection basis that all share the same physical HBase table. <b>Available in 3.0 branch</b></li> 
- <li><b><a href="sequences.html">Sequences</a></b>. Support the atomic increment of sequence values through the CREATE SEQUENCE and the NEXT VALUE FOR statements.</li> 
- <li><b>Type Enhancements</b>. Additional work includes support for <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-476">DEFAULT declaration</a> when creating a table, for <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-309">ARRAY</a> (<b>available in 3.0 branch</b>), <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-477">STRUCT</a>, and <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-628">JSON</a> data types.</li> 
- <li><b>Third Party Integration</b>. There are a number of open source projects with which interop with Phoenix could be added or improved: <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-356">Flume sink</a></b>. Support a Flume sink that writes Phoenix-compliant HBase data. <b>Available in 3.0 branch</b> <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-355">Hue integration</a></b>. Add Phoenix as an HBase service layer in Hue. <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-643">Pentaho Mondrian support</a></b>. Allow Phoenix to be used as the JDBC driver for Pentaho Mondrian. <b>This effort is pretty far along already, with the Pentaho FoodMart demo running through Phoenix now</b> <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-630">Cleanup Pig support</a></b> . Commonize the functions we use across Map-reduce and Pig processing. We
  should also upgrade our pom to reference the 0.12 version of Pig and map our DECIMAL type to their new decimal type. <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-687">Improve Map-reduce integration</a></b>. It’s possible that we could provide a processing model where the map and reduce functions can invoke Phoenix queries (though this needs some more thought).</li> 
+ <li><b>Hash Joins</b>. Provide the ability to join together multiple tables, through a phased approach: <br /><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-151">Equi-join</a></b>. Support left, right, inner, outer equi-joins where one side of the join is small enough to fit into memory. <b>Available in 3.0/4.0 release</b> <br /><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-167">Semi/anti-join</a></b>. Support correlated sub queries for exists and in where one side of the join is small enough to fit into memory.</li> 
+ <li><b><a href="views.html">Views</a></b>. Allows the creation of multiple tables using the same physical HBase table. <b>Available in 3.0/4.0 release</b></li> 
+ <li><b><a href="multi_tenancy.html">Multi-tenancy</a></b>. Allows independent views to be created by different tenants on a per-connection basis that all share the same physical HBase table. <b>Available in 3.0/4.0 release</b></li> 
+ <li><b><a href="sequences.html">Sequences</a></b>. Support the atomic increment of sequence values through the CREATE SEQUENCE, the NEXT VALUE FOR, and the CURRENT VALUE FOR statements. <b>Available in 3.0/4.0 release</b></li> 
+ <li><b><a href="array_type.html">ARRAY Type</a></b>. Support for the standard JDBC ARRAY type. <b>Available in 3.0/4.0 release</b></li> 
+ <li><b>Type Enhancements</b>. Additional work includes support for <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-476">DEFAULT declaration</a> when creating a table, and for <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-477">STRUCT</a> and <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-628">JSON</a> data types.</li> 
+ <li><b>Third Party Integration</b>. There are a number of open source projects with which interop with Phoenix could be added or improved: 
+  <ul> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-356">Flume sink</a></b>. Support a Flume sink that writes Phoenix-compliant HBase data. <b>Available in 3.0/4.0 release</b></li> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-11">Pig Loader support</a></b> . Add support for a Pig loader and commonize the functions we use across Map-reduce and Pig processing.</li> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-355">Hue integration</a></b>. Add Phoenix as an HBase service layer in Hue.</li> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-643">Pentaho Mondrian support</a></b>. Allow Phoenix to be used as the JDBC driver for Pentaho Mondrian. <b>This effort is pretty far along already, with the Pentaho FoodMart demo running through Phoenix now</b></li> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-687">Improve Map-reduce integration</a></b>. It’s possible that we could provide a processing model where the map and reduce functions can invoke Phoenix queries (though this needs some more thought).</li> 
+  </ul></li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-136">Derived Tables</a></b>. Allow a <tt>SELECT</tt> clause to be used in the FROM clause to define a derived table. This would include support for pipelining queries when necessary.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-514">Functional Indexes</a></b>. Enables an index to contain the evaluation of an expression as opposed to just a column value.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-177">Monitoring and Management</a></b>. Provide visibility into cpu, physical io, logical io, wait time, blocking time, and transmission time spent for each thread of execution across the HBase cluster, within coprocessors, and within the client-side thread pools for each query. On top of this, we should exposing things like active sessions and currently running queries. The <a class="externalLink" href="http://phoenix.incubator.apache.org/language/index.html#/explain">EXPLAIN PLAN</a> gives an idea of how a query will be executed, but we need more information to help users debug and tune their queries.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-150">Parent/child Join</a></b>. Unlike with standard relational databases, HBase allows you the flexibility of dynamically creating as many key values in a row as you’d like. Phoenix could leverage this by providing a way to model child rows inside of a parent row. The child row would be comprised of the set of key values whose column qualifier is prefixed with a known name and appended with the primary key of the child row. Phoenix could hide all this complexity, and allow querying over the nested children through joining to the parent row. Essentially, this would be an optimization of the general join case, but could support cases where both sides of the join are bigger than would fit into memory.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-716">Intra-row secondary indexes</a></b>. Once we support putting multiple “virtual” rows inside of a HBase row as prefixed KeyValues, we can support intra-row secondary indexes without much more effort.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-480">Port to HBase 0.96</a></b>. Currently Phoenix only works on the 0.94 branch of HBase. The latest branch of HBase is now 0.96, which has many breaking, non backward compatible changes (for example requiring that EndPoint coprocessors use protobufs). Ideally, we should create a shim that’ll allow Phoenix to work with both 0.94 and 0.96, but barring that, we should have a branch of Phoenix that works under 0.96. Additional work includes replacing our type system with the new HBase type system in 0.96, but that would be significantly more work.</li> 
- <li><b>Security Features</b>. A number of existing HBase security features in 0.94 could be leverage and new security features being added to 0.98 could be leveraged in the future. <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-672">Support GRANT and REVOKE</a></b>. Support the standard GRANT and REVOKE SQL commands through an HBase AccessController. <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-673">Surface support for encryption</a></b>. In HBase 0.98, transparent encryption will be possible. We should surface this in Phoenix. <br /> <b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-684">Support Cell-level security</a></b>. In HBase 0.98, it will be possible to apply labels at a per-cell granularity. We should surface this in Phoenix.</li> 
+ <li><b>Security Features</b>. A number of existing HBase security features in 0.94 could be leverage and new security features being added to 0.98 could be leveraged in the future. 
+  <ul> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-672">Support GRANT and REVOKE</a></b>. Support the standard GRANT and REVOKE SQL commands through an HBase AccessController.</li> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-673">Surface support for encryption</a></b>. In HBase 0.98, transparent encryption will be possible. We should surface this in Phoenix.</li> 
+   <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-684">Support Cell-level security</a></b>. In HBase 0.98, it will be possible to apply labels at a per-cell granularity. We should surface this in Phoenix.</li> 
+  </ul></li> 
  <li><b>Cost-based Optimizer</b>. Once secondary indexing and joins are implemented, we’ll need to <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-195">collect and maintains stats</a> and <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-180">drive query optimization decisions based on them</a> to produce the most efficient query plan.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-590">Query over Multiple Row Versions</a></b>. Expose the time dimension of rows through a built-in function to allow aggregation and trending over multiple row versions.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-154">OLAP Extensions</a></b>. Support the <tt>WINDOW</tt>, <tt>PARTITION OVER</tt>, <tt>RANK</tt>, etc. functionality.</li> 
  <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-153">Table Sampling</a></b>. Support the <tt>TABLESAMPLE</tt> clause by implementing a filter that uses the guideposts established by stats gathering to only return n rows per region.</li> 
  <li><b>Nested-loop Join</b>. Support joins where both sides are big enough that they wouldn’t fit into memory. As projects like <a class="externalLink" href="http://incubator.apache.org/drill/">Apache Drill</a> progress, the need for this may lessen, since these systems will be able to decompose the query and perform the join efficiently without Phoenix needing to as described <a class="externalLink" href="http://www.cloudera.com/content/cloudera/en/resources/library/hbasecon/hbasecon-2013--apache-drill---a-community-driven-initiative-to-deliver-ansi-sql-capabilities-for-apa.html">here</a>.</li> 
  <li><b>Schema Evolution</b>. Phoenix supports adding and removing columns through the <a href="language/index.html#alter_table">ALTER TABLE</a> DDL command, but changing the data type of, or renaming, an existing column is not yet supported.</li> 
- <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-400">Transactions</a></b>. Support transactions by integrating a system that controls time stamps like <a class="externalLink" href="https://github.com/yahoo/omid">OMID</a>. For some ideas on how this might be done, see <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-400">here</a>.</li> 
+ <li><b><a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-400">Transactions</a></b>. Support transactions through snapshot isolation or through integrating a system that controls time stamps like <a class="externalLink" href="https://github.com/yahoo/omid">OMID</a>. For some ideas on how this might be done, see <a class="externalLink" href="https://issues.apache.org/jira/browse/PHOENIX-400">here</a>.</li> 
 </ol>
 			</div>
 		</div>
@@ -216,6 +231,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -235,6 +253,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -247,7 +268,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/salted.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/salted.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/salted.html (original)
+++ incubator/phoenix/site/publish/salted.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li class="active"><a href="" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -217,6 +219,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -235,6 +240,9 @@
 						<li >
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
+						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
 						<li class="active">
 							<a href="#" title="Salted Tables">Salted Tables</a>
 						</li>
@@ -248,7 +256,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/secondary_indexing.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/secondary_indexing.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/secondary_indexing.html (original)
+++ incubator/phoenix/site/publish/secondary_indexing.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li class="active"><a href="" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -339,6 +341,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -358,6 +363,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -370,7 +378,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/sequences.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/sequences.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/sequences.html (original)
+++ incubator/phoenix/site/publish/sequences.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li class="active"><a href="" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -241,6 +243,9 @@ VALUES( NEXT VALUE FOR my_schema.my_sequ
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -260,6 +265,9 @@ VALUES( NEXT VALUE FOR my_schema.my_sequ
 							<a href="#" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -272,7 +280,7 @@ VALUES( NEXT VALUE FOR my_schema.my_sequ
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/skip_scan.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/skip_scan.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/skip_scan.html (original)
+++ incubator/phoenix/site/publish/skip_scan.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li class="active"><a href="" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -206,6 +208,9 @@ AND KEY2 IN (1, 2)
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -225,6 +230,9 @@ AND KEY2 IN (1, 2)
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -237,7 +245,7 @@ AND KEY2 IN (1, 2)
 							<a href="#" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/source.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/source.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/source.html (original)
+++ incubator/phoenix/site/publish/source.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-14
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -209,6 +211,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -228,6 +233,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -240,7 +248,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>

Modified: incubator/phoenix/site/publish/team.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/team.html?rev=1583268&r1=1583267&r2=1583268&view=diff
==============================================================================
--- incubator/phoenix/site/publish/team.html (original)
+++ incubator/phoenix/site/publish/team.html Mon Mar 31 08:53:54 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-30
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -73,17 +73,19 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="views.html" title="Views">Views</a></li>
 									<li ><a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a></li>
 									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
 									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 									<li ><a href="paged.html" title="Paged Queries">Paged Queries</a></li>
 									<li ><a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a></li>
 									<li ><a href="skip_scan.html" title="Skip Scan">Skip Scan</a></li>
-									<li ><a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
 									<li class="divider"><a>${name}</a></li>
 									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
@@ -308,6 +310,9 @@
 						<li >
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
+						<li >
+							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+						</li>
 						<li class="divider">
 							<a>${name}</a>
 						</li>
@@ -327,6 +332,9 @@
 							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+						</li>
+						<li >
 							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 						<li >
@@ -339,7 +347,7 @@
 							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="mr_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li class="divider">
 							<a>${name}</a>



Mime
View raw message