You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/06/12 01:18:26 UTC

svn commit: r1685002 [5/5] - in /phoenix: phoenix-docs/src/tools/org/h2/build/doc/ site/publish/ site/publish/language/ site/publish/presentations/ site/source/src/site/ site/source/src/site/markdown/ site/source/src/site/resources/presentations/

Modified: phoenix/site/publish/update_statistics.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/update_statistics.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/update_statistics.html (original)
+++ phoenix/site/publish/update_statistics.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<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>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li class="active"><a href="" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</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="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li class="active"><a href="" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -306,10 +306,7 @@
 							<a href="http:divider" title=""></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>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -318,7 +315,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -329,49 +329,49 @@
 							<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="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="tracing.html" title="Tracing">Tracing</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>
+							<a href="sequences.html" title="Sequences">Sequences</a>
+						</li>
+						<li class="active">
+							<a href="#" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
-						<li class="active">
-							<a href="#" title="Statistics Collection">Statistics Collection</a>
+						<li >
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/upgrading.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/upgrading.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/upgrading.html (original)
+++ phoenix/site/publish/upgrading.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li class="active"><a href="" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<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>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</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="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -268,10 +268,7 @@
 							<a href="http:divider" title=""></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>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -280,7 +277,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -291,49 +291,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/views.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/views.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/views.html (original)
+++ phoenix/site/publish/views.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-21
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<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>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</a></li>
 									<li class="active"><a href="" 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="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -307,10 +307,7 @@ VALUES('John Doe', CURRENT_DATE(), NEXT
 							<a href="http:divider" title=""></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>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -319,7 +316,10 @@ VALUES('John Doe', CURRENT_DATE(), NEXT
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -330,49 +330,49 @@ VALUES('John Doe', CURRENT_DATE(), NEXT
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
-						</li>
-						<li class="active">
-							<a href="#" title="Views">Views</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="tracing.html" title="Tracing">Tracing</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>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+						</li>
+						<li class="active">
+							<a href="#" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/publish/who_is_using.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/who_is_using.html?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/publish/who_is_using.html (original)
+++ phoenix/site/publish/who_is_using.html Thu Jun 11 23:18:24 2015
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2015-05-19
+ Generated by Apache Maven Doxia at 2015-06-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -84,32 +84,32 @@
 									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
 									<li class="divider"/>
-									<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>
+									<li ><a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a></li>
 									<li ><a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a></li>
 									<li ><a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a></li>
-									<li ><a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a></li>
+									<li ><a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a></li>
+									<li ><a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown">Features <b class="caret"></b></a>
 								<ul class="dropdown-menu">
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
+									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
+									<li ><a href="server.html" title="Query Server">Query Server</a></li>
+									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
+									<li ><a href="array_type.html" title="ARRAY type">ARRAY type</a></li>
+									<li ><a href="sequences.html" title="Sequences">Sequences</a></li>
+									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
 									<li ><a href="subqueries.html" title="Subqueries">Subqueries</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="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a></li>
-									<li ><a href="tracing.html" title="Tracing">Tracing</a></li>
-									<li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li>
-									<li ><a href="server.html" title="Query Server">Query Server</a></li>
-									<li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
+									<li ><a href="salted.html" title="Salted Tables">Salted Tables</a></li>
 								</ul>
 							</li>
 							<li class="dropdown">
@@ -335,10 +335,7 @@
 							<a href="http:divider" title=""></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>
+							<a href="phoenix_spark.html" title="Apache Spark Integration">Apache Spark Integration</a>
 						</li>
 						<li >
 							<a href="pig_integration.html" title="Apache Pig Integration">Apache Pig Integration</a>
@@ -347,7 +344,10 @@
 							<a href="phoenix_mr.html" title="Map Reduce Integration">Map Reduce Integration</a>
 						</li>
 						<li >
-							<a href="phoenix_spark.html" title="Phoenix Spark Integration">Phoenix Spark Integration</a>
+							<a href="flume.html" title="Apache Flume Plugin">Apache Flume Plugin</a>
+						</li>
+						<li >
+							<a href="phoenix_on_emr.html" title="Amazon EMR Support">Amazon EMR Support</a>
 						</li>
 					</ul>
 				</div>
@@ -358,49 +358,49 @@
 							<a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
 						</li>
 						<li >
-							<a href="joins.html" title="Joins">Joins</a>
+							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
 						</li>
 						<li >
-							<a href="subqueries.html" title="Subqueries">Subqueries</a>
+							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
 						</li>
 						<li >
-							<a href="views.html" title="Views">Views</a>
+							<a href="server.html" title="Query Server">Query Server</a>
 						</li>
 						<li >
-							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
+							<a href="tracing.html" title="Tracing">Tracing</a>
 						</li>
 						<li >
-							<a href="sequences.html" title="Sequences">Sequences</a>
+							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
 						</li>
 						<li >
-							<a href="array_type.html" title="ARRAY type">ARRAY type</a>
+							<a href="sequences.html" title="Sequences">Sequences</a>
 						</li>
 						<li >
-							<a href="salted.html" title="Salted Tables">Salted Tables</a>
+							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
 						</li>
 						<li >
-							<a href="paged.html" title="Paged Queries">Paged Queries</a>
+							<a href="joins.html" title="Joins">Joins</a>
 						</li>
 						<li >
-							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
+							<a href="subqueries.html" title="Subqueries">Subqueries</a>
 						</li>
 						<li >
-							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
+							<a href="views.html" title="Views">Views</a>
 						</li>
 						<li >
-							<a href="bulk_dataload.html" title="Bulk Loading">Bulk Loading</a>
+							<a href="multi-tenancy.html" title="Multi tenancy">Multi tenancy</a>
 						</li>
 						<li >
-							<a href="tracing.html" title="Tracing">Tracing</a>
+							<a href="paged.html" title="Paged Queries">Paged Queries</a>
 						</li>
 						<li >
-							<a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a>
+							<a href="dynamic_columns.html" title="Dynamic Columns">Dynamic Columns</a>
 						</li>
 						<li >
-							<a href="server.html" title="Query Server">Query Server</a>
+							<a href="skip_scan.html" title="Skip Scan">Skip Scan</a>
 						</li>
 						<li >
-							<a href="udf.html" title="User-defined Functions">User-defined Functions</a>
+							<a href="salted.html" title="Salted Tables">Salted Tables</a>
 						</li>
 					</ul>
 				</div>

Modified: phoenix/site/source/src/site/markdown/phoenix_spark.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/phoenix_spark.md?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/phoenix_spark.md (original)
+++ phoenix/site/source/src/site/markdown/phoenix_spark.md Thu Jun 11 23:18:24 2015
@@ -1,15 +1,31 @@
+# Apache Spark Plugin
 
-#Apache Spark Integration
+The phoenix-spark plugin extends Phoenix's MapReduce support to allow Spark to load Phoenix tables
+as RDDs or DataFrames, and enables persisting them back to Phoenix.
 
-phoenix-spark extends Phoenix's MapReduce support to allow Spark to load Phoenix tables as RDDs or
-DataFrames and enables persisting RDDs of Tuples back to Phoenix.
+#### Prerequisites
 
-## Prerequisites
-	Phoenix v4.4.0 and above
-	Spark 1.3.0
+* Phoenix 4.4.0-SNAPSHOT +
+* Spark 1.3.0 +
 
+#### Spark setup
 
-## Reading Phoenix Tables
+1. Ensure that all requisite Phoenix / HBase platform dependencies are available on the classpath for the Spark executors and drivers
+2. One method is to add the phoenix-4.4.0-SNAPSHOT-client.jar to 'SPARK_CLASSPATH' in spark-env.sh,
+or setting both 'spark.executor.extraClassPath' and 'spark.driver.extraClassPath' in
+spark-defaults.conf
+3. To help your IDE, you may want to add the following 'provided' dependency: 
+
+```
+<dependency>
+  <groupId>org.apache.phoenix</groupId>
+  <artifactId>phoenix-spark</artifactId>
+  <version>${phoenix.version}</version>
+  <scope>provided</scope>
+</dependency>
+```
+
+### Reading Phoenix Tables
 
 Given a Phoenix table with the following DDL
 
@@ -19,7 +35,7 @@ UPSERT INTO TABLE1 (ID, COL1) VALUES (1,
 UPSERT INTO TABLE1 (ID, COL1) VALUES (2, 'test_row_2');
 ```
 
-### Load as a DataFrame using the Data Source API
+#### Load as a DataFrame using the Data Source API
 ```scala
 import org.apache.spark.SparkContext
 import org.apache.spark.sql.SQLContext
@@ -39,7 +55,7 @@ df
   .show
 ```
 
-### Load as a DataFrame directly using a Configuration object
+#### Load as a DataFrame directly using a Configuration object
 ```scala
 import org.apache.hadoop.conf.Configuration
 import org.apache.spark.SparkContext
@@ -60,7 +76,7 @@ val df = sqlContext.phoenixTableAsDataFr
 df.show
 ```
 
-### Load as an RDD, using a Zookeeper URL
+#### Load as an RDD, using a Zookeeper URL
 ```scala
 import org.apache.spark.SparkContext
 import org.apache.spark.sql.SQLContext
@@ -79,10 +95,7 @@ val firstId = rdd1.first()("ID").asInsta
 val firstCol = rdd1.first()("COL1").asInstanceOf[String]
 ```
 
-## Saving RDDs to Phoenix 
-
-`saveToPhoenix` is an implicit method on RDD[Product], or an RDD of Tuples. The data types must
-correspond to the Java types Phoenix supports (http://phoenix.apache.org/language/datatypes.html)
+### Saving Phoenix
 
 Given a Phoenix table with the following DDL
 
@@ -90,6 +103,12 @@ Given a Phoenix table with the following
 CREATE TABLE OUTPUT_TEST_TABLE (id BIGINT NOT NULL PRIMARY KEY, col1 VARCHAR, col2 INTEGER);
 ```
 
+#### Saving RDDs
+
+The `saveToPhoenix` method is an implicit method on RDD[Product], or an RDD of Tuples. The data types must
+correspond to one of [the Java types supported by Phoenix](language/datatypes.html).
+
+
 ```scala
 import org.apache.spark.SparkContext
 import org.apache.phoenix.spark._
@@ -106,7 +125,7 @@ sc
   )
 ```
 
-## Saving DataFrames to Phoenix
+#### Saving DataFrames
 
 The `save` is method on DataFrame allows passing in a data source type. You can use
 `org.apache.phoenix.spark`, and must also pass in a `table` and `zkUrl` parameter to
@@ -138,7 +157,7 @@ df.save("org.apache.phoenix.spark", Save
   "zkUrl" -> hbaseConnectionString))
 ```
 
-## Notes
+### Notes
 
 The functions `phoenixTableAsDataFrame`, `phoenixTableAsRDD` and `saveToPhoenix` all support
 optionally specifying a `conf` Hadoop configuration parameter with custom Phoenix client settings,
@@ -147,9 +166,10 @@ as well as an optional `zkUrl` parameter
 If `zkUrl` isn't specified, it's assumed that the "hbase.zookeeper.quorum" property has been set
 in the `conf` parameter. Similarly, if no configuration is passed in, `zkUrl` must be specified.
 
-## Limitations
+### Limitations
 
 - Basic support for column and predicate pushdown using the Data Source API
 - The Data Source API does not support passing custom Phoenix settings in configuration, you must
 create the DataFrame or RDD directly if you need fine-grained configuration.
-- No support for aggregate or distinct functions (http://phoenix.apache.org/phoenix_mr.html)
+- No support for aggregate or distinct queries as explained in our [Map Reduce Integration](phoenix_mr.html) documentation.
+

Added: phoenix/site/source/src/site/resources/presentations/HBaseCon2015-final.pptx
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/presentations/HBaseCon2015-final.pptx?rev=1685002&view=auto
==============================================================================
Binary file - no diff available.

Propchange: phoenix/site/source/src/site/resources/presentations/HBaseCon2015-final.pptx
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: phoenix/site/source/src/site/site.xml
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/site.xml?rev=1685002&r1=1685001&r2=1685002&view=diff
==============================================================================
--- phoenix/site/source/src/site/site.xml (original)
+++ phoenix/site/source/src/site/site.xml Thu Jun 11 23:18:24 2015
@@ -87,29 +87,29 @@
             <item href="upgrading.html" name="Upgrading"/>
             <item href="pherf.html" name="Performance Testing"/>
             <item href="http:divider" name=""/>
-            <item href="phoenix_on_emr.html" name="Amazon EMR Support"/>
-            <item href="flume.html" name="Apache Flume Plugin"/>
+            <item href="phoenix_spark.html" name="Apache Spark Integration"/>
             <item href="pig_integration.html" name="Apache Pig Integration"/>
             <item href="phoenix_mr.html" name="Map Reduce Integration"/>
-            <item href="phoenix_spark.html" name="Phoenix Spark Integration"/>
+            <item href="flume.html" name="Apache Flume Plugin"/>
+            <item href="phoenix_on_emr.html" name="Amazon EMR Support"/>
         </menu>
         <menu name="Features">
             <item href="secondary_indexing.html" name="Secondary Indexes"/>
+            <item href="udf.html" name="User-defined Functions"/>
+            <item href="bulk_dataload.html" name="Bulk Loading"/>
+            <item href="server.html" name="Query Server"/>
+            <item href="tracing.html" name="Tracing"/>
+            <item href="array_type.html" name="ARRAY type"/>
+            <item href="sequences.html" name="Sequences"/>
+            <item href="update_statistics.html" name="Statistics Collection"/>
             <item href="joins.html" name="Joins"/>
             <item href="subqueries.html" name="Subqueries"/>
             <item href="views.html" name="Views"/>
             <item href="multi-tenancy.html" name="Multi tenancy"/>
-            <item href="sequences.html" name="Sequences"/>
-            <item href="array_type.html" name="ARRAY type"/>
-            <item href="salted.html" name="Salted Tables"/>
             <item href="paged.html" name="Paged Queries"/>
             <item href="dynamic_columns.html" name="Dynamic Columns"/>
             <item href="skip_scan.html" name="Skip Scan"/>
-            <item href="bulk_dataload.html" name="Bulk Loading"/>
-            <item href="tracing.html" name="Tracing"/>
-            <item href="update_statistics.html" name="Statistics Collection"/>
-            <item href="server.html" name="Query Server"/>
-            <item href="udf.html" name="User-defined Functions"/>
+            <item href="salted.html" name="Salted Tables"/>
         </menu>
         <menu name="Reference">
             <item href="language/index.html" name="Grammar"/>