Modified: phoenix/site/publish/phoenix_python.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_python.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_python.html (original)
+++ phoenix/site/publish/phoenix_python.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -299,6 +300,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/phoenix_spark.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_spark.html (original)
+++ phoenix/site/publish/phoenix_spark.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -550,6 +551,9 @@ pr.vertices.saveToPhoenix(&quot;EMAIL_EN
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/pig_integration.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/pig_integration.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/pig_integration.html (original)
+++ phoenix/site/publish/pig_integration.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -367,6 +368,9 @@ DUMP cnt;
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/recent.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/recent.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/recent.html (original)
+++ phoenix/site/publish/recent.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -337,6 +338,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/release.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/release.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/release.html (original)
+++ phoenix/site/publish/release.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -325,6 +326,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/release_notes.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/release_notes.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/release_notes.html (original)
+++ phoenix/site/publish/release_notes.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -352,6 +353,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/resources.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/resources.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/resources.html (original)
+++ phoenix/site/publish/resources.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-11-09
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -394,6 +395,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/roadmap.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/roadmap.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/roadmap.html (original)
+++ phoenix/site/publish/roadmap.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -328,6 +329,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/rowtimestamp.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/rowtimestamp.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/rowtimestamp.html (original)
+++ phoenix/site/publish/rowtimestamp.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li 
class="active"><a href="" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -313,6 +314,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/salted.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/salted.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/salted.html (original)
+++ phoenix/site/publish/salted.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -321,6 +322,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/secondary_indexing.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/secondary_indexing.html (original)
+++ phoenix/site/publish/secondary_indexing.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li 
class="active"><a href="" title="Secondary Indexes">Secondary Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -610,6 +611,9 @@ CREATE LOCAL INDEX my_index ON my_table
                                                        <a href="#" 
title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/sequences.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/sequences.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/sequences.html (original)
+++ phoenix/site/publish/sequences.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -352,6 +353,9 @@ VALUES( NEXT VALUE FOR my_schema.my_sequ
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/server.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/server.html (original)
+++ phoenix/site/publish/server.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -521,6 +522,9 @@ log4j.logger.org.eclipse.jetty.server=IN
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/skip_scan.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/skip_scan.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/skip_scan.html (original)
+++ phoenix/site/publish/skip_scan.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -310,6 +311,9 @@ AND KEY2 IN (1, 2)
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/source.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/source.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/source.html (original)
+++ phoenix/site/publish/source.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -316,6 +317,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/subqueries.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/subqueries.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/subqueries.html (original)
+++ phoenix/site/publish/subqueries.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -454,6 +455,9 @@ ORDER BY count(*) DESC;
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/team.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/team.html (original)
+++ phoenix/site/publish/team.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-11-10
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -485,6 +486,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/tracing.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/tracing.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/tracing.html (original)
+++ phoenix/site/publish/tracing.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -492,6 +493,9 @@ Connection conn = DriverManager.getConne
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/transactions.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/transactions.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/transactions.html (original)
+++ phoenix/site/publish/transactions.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -389,6 +390,9 @@ DELETE FROM my_other_table WHERE k=2;
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/tuning.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/tuning.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/tuning.html (original)
+++ phoenix/site/publish/tuning.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-10-17
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -558,6 +559,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/udf.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/udf.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/udf.html (original)
+++ phoenix/site/publish/udf.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li 
class="active"><a href="" title="User-defined Functions">User-defined 
Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -442,6 +443,9 @@ Connection conn = DriverManager.getConne
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/update_statistics.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/update_statistics.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/update_statistics.html (original)
+++ phoenix/site/publish/update_statistics.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li 
class="active"><a href="" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -155,11 +156,11 @@
 <p>Statistics are also automatically collected during major compactions and 
region splits so manually running this command may not be necessary.</p> 
 <div class="section"> 
  <h2 id="Parallelization">Parallelization</h2> 
- <p>Phoenix breaks up queries into multiple scans and runs them in parallel to 
improve performance. parallelization in Phoenix is driven by the statistics 
related configuration parameters. Each chunk of data between guideposts will be 
run in parallel in a separate scan to improve query performance. The chunk size 
is determined by the server-side <tt>phoenix.stats.guidepost.width</tt> or 
<tt>phoenix.stats.guidepost.per.region</tt> parameters. As the size of the 
chunks decrease, you’ll want to increase <tt>phoenix.query.queueSize</tt> as 
more work will be queued in that case. Note that at a minimum, separate scans 
will be run for each table region. Beyond the statistics collection 
configuration parameters, the client-side <tt>phoenix.query.threadPoolSize</tt> 
and <tt>phoenix.query.queueSize</tt> parameters and the server-side 
<tt>hbase.regionserver.handler.count</tt> parameter have an impact on 
performance.</p> 
+ <p>Phoenix breaks up queries into multiple scans and runs them in parallel to 
reduce latency. Parallelization in Phoenix is driven by the statistics related 
configuration parameters. Each chunk of data between guideposts will be run in 
parallel in a separate scan to improve query performance. The chunk size is 
determined by the GUIDE_POSTS_WIDTH table property (Phoenix 4.9 or above) or 
the global server-side <tt>phoenix.stats.guidepost.width</tt> parameter if the 
table property is not set. As the size of the chunks decrease, you’ll want to 
increase <tt>phoenix.query.queueSize</tt> as more work will be queued in that 
case. Note that at a minimum, separate scans will be run for each table region. 
Statistics in Phoenix provides a means of gaining intraregion parallelization. 
In addition to the guidepost width specification, the client-side 
<tt>phoenix.query.threadPoolSize</tt> and <tt>phoenix.query.queueSize</tt> 
parameters and the server-side <tt>hbase.regionserver.handler.count
 </tt> parameter have an impact on the amount of parallelization.</p> 
 </div> 
 <div class="section"> 
  <h2 id="Examples">Examples</h2> 
- <p>For a given table <tt>my_table</tt>:</p> 
+ <p>To update the statistics for a given table <tt>my_table</tt>, execute the 
following command:</p> 
  <div class="source"> 
   <pre>UPDATE STATISTICS my_table
 </pre> 
@@ -180,6 +181,16 @@
   <pre>UPDATE STATISTICS my_table COLUMNS
 </pre> 
  </div> 
+ <p>To modify the guidepost width to 10MB for a table, execute the following 
command:</p> 
+ <div class="source"> 
+  <pre>ALTER TABLE my_table SET GUIDE_POSTS_WIDTH = 10000000
+</pre> 
+ </div> 
+ <p>To remove the guidepost width, set the property to null:</p> 
+ <div class="source"> 
+  <pre>ALTER TABLE my_table SET GUIDE_POSTS_WIDTH = null
+</pre> 
+ </div> 
 </div> 
 <div class="section"> 
  <h2 id="Configuration">Configuration</h2> 
@@ -190,11 +201,6 @@
     <li>A server-side parameter that specifies the number of bytes between 
guideposts. A smaller amount increases parallelization, but also increases the 
number of chunks which must be merged on the client side.</li> 
     <li>The default value is 104857600 (100 MB).</li> 
    </ul></li> 
-  <li><tt>phoenix.stats.guidepost.per.region</tt> 
-   <ul> 
-    <li>A server-side parameter that specifies the number of guideposts per 
region. If set to a value greater than zero, then the guidepost width is 
determiend by the MAX_FILE_SIZE of the table divided by this value. Otherwise, 
if not set then the <tt>phoenix.stats.guidepost.width</tt> parameter is 
used.</li> 
-    <li>No default value.</li> 
-   </ul></li> 
   <li><tt>phoenix.stats.updateFrequency</tt> 
    <ul> 
     <li>A server-side paramater that determines the frequency in milliseconds 
for which statistics will be refreshed from the statistics table and 
subsequently used by the client.</li> 
@@ -358,6 +364,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li class="active">

Modified: phoenix/site/publish/upgrading.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/upgrading.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/upgrading.html (original)
+++ phoenix/site/publish/upgrading.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -324,6 +325,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/views.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/views.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/views.html (original)
+++ phoenix/site/publish/views.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -353,6 +354,9 @@ VALUES('John Doe', CURRENT_DATE(), NEXT
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/publish/who_is_using.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/who_is_using.html?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/publish/who_is_using.html (original)
+++ phoenix/site/publish/who_is_using.html Thu Dec  1 17:03:51 2016
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2016-09-14
+ Generated by Apache Maven Doxia at 2016-11-30
  Rendered using Reflow Maven Skin 1.1.0 
(http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -100,6 +100,7 @@
                                                                        <li ><a 
href="udf.html" title="User-defined Functions">User-defined Functions</a></li>
                                                                        <li 
class="divider"/>
                                                                        <li ><a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary 
Indexes</a></li>
+                                                                       <li ><a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li>
                                                                        <li ><a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace 
Mapping</a></li>
                                                                        <li ><a 
href="update_statistics.html" title="Statistics Collection">Statistics 
Collection</a></li>
                                                                        <li ><a 
href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp 
Column</a></li>
@@ -399,6 +400,9 @@
                                                        <a 
href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a>
                                                </li>
                                                <li >
+                                                       <a 
href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a>
+                                               </li>
+                                               <li >
                                                        <a 
href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a>
                                                </li>
                                                <li >

Modified: phoenix/site/source/src/site/markdown/update_statistics.md
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/update_statistics.md?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/update_statistics.md (original)
+++ phoenix/site/source/src/site/markdown/update_statistics.md Thu Dec  1 
17:03:51 2016
@@ -10,21 +10,22 @@ Statistics are also automatically collec
 manually running this command may not be necessary.
 
 ##Parallelization
-Phoenix breaks up queries into multiple scans and runs them in parallel to 
improve performance.
-parallelization in Phoenix is driven by the statistics related configuration 
parameters. 
+Phoenix breaks up queries into multiple scans and runs them in parallel to 
reduce latency.
+Parallelization in Phoenix is driven by the statistics related configuration 
parameters. 
 Each chunk of data between guideposts will be run in parallel in a separate 
scan to improve
-query performance. The chunk size is determined by the server-side
-<code>phoenix.stats.guidepost.width</code> or 
<code>phoenix.stats.guidepost.per.region</code>
-parameters. As the size of the chunks decrease, you'll want to increase
-<code>phoenix.query.queueSize</code> as more work will be queued in that case. 
Note
-that at a minimum, separate scans will be run for each table region. Beyond 
the statistics
-collection configuration parameters, the client-side 
<code>phoenix.query.threadPoolSize</code>
-and <code>phoenix.query.queueSize</code> parameters and the server-side
-<code>hbase.regionserver.handler.count</code> parameter have an impact on 
performance.
+query performance. The chunk size is determined by the GUIDE_POSTS_WIDTH table 
property (Phoenix 4.9 or above)
+or the global server-side <code>phoenix.stats.guidepost.width</code> parameter 
if the table property is
+not set. As the size of the chunks decrease,
+you'll want to increase <code>phoenix.query.queueSize</code> as more work will 
be queued in that
+case. Note that at a minimum, separate scans will be run for each table 
region. Statistics in Phoenix
+provides a means of gaining intraregion parallelization. In addition to the 
guidepost width specification,
+the client-side <code>phoenix.query.threadPoolSize</code> and 
<code>phoenix.query.queueSize</code> parameters
+and the server-side <code>hbase.regionserver.handler.count</code> parameter 
have an impact on the amount
+of parallelization.
 
 ## Examples
 
-For a given table <code>my_table</code>:
+To update the statistics for a given table <code>my_table</code>, execute the 
following command:
 
     UPDATE STATISTICS my_table
 
@@ -43,6 +44,14 @@ To collect the statistics on the table a
 
     UPDATE STATISTICS my_table COLUMNS
 
+To modify the guidepost width to 10MB for a table, execute the following 
command:
+
+    ALTER TABLE my_table SET GUIDE_POSTS_WIDTH = 10000000
+
+To remove the guidepost width, set the property to null:
+
+    ALTER TABLE my_table SET GUIDE_POSTS_WIDTH = null
+
 ## Configuration
 
 The configuration parameters controlling statistics collection include:
@@ -52,22 +61,16 @@ The configuration parameters controlling
       A smaller amount increases parallelization, but also increases the 
number of
       chunks which must be merged on the client side.
     * The default value is 104857600 (100 MB).
-2.  <code>phoenix.stats.guidepost.per.region</code>
-    * A server-side parameter that specifies the number of guideposts per 
region.
-      If set to a value greater than zero, then the guidepost width is 
determiend by
-      the MAX_FILE_SIZE of the table divided by this value. Otherwise, if not 
set
-      then the <code>phoenix.stats.guidepost.width</code> parameter is used.
-    * No default value.
-3.  <code>phoenix.stats.updateFrequency</code>
+2.  <code>phoenix.stats.updateFrequency</code>
     * A server-side paramater that determines the frequency in milliseconds 
for which statistics
       will be refreshed from the statistics table and subsequently used by the 
client.
     * The default value is 900000 (15 mins)
-4.  <code>phoenix.stats.minUpdateFrequency</code>
+3.  <code>phoenix.stats.minUpdateFrequency</code>
     * A client-side parameter that determines the minimum amount of time in 
milliseconds that
       must pass before statistics may again be manually collected through 
another <code>UPDATE
       STATISTICS</code> call.
     * The default value is <code>phoenix.stats.updateFrequency</code> divided 
by two (7.5 mins)
-5. <code>phoenix.stats.useCurrentTime</code>
+4. <code>phoenix.stats.useCurrentTime</code>
     * An advanced server-side parameter that if true causes the current time 
on the server-side
       to be used as the timestamp of rows in the statistics table when 
background tasks such as
       compactions or splits occur. If false, then the max timestamp found 
while traversing the

Modified: phoenix/site/source/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/site.xml?rev=1772240&r1=1772239&r2=1772240&view=diff
==============================================================================
--- phoenix/site/source/src/site/site.xml (original)
+++ phoenix/site/source/src/site/site.xml Thu Dec  1 17:03:51 2016
@@ -99,6 +99,7 @@
             <item href="udf.html" name="User-defined Functions"/>
             <item href="http:divider" name=""/>
             <item href="secondary_indexing.html" name="Secondary Indexes"/>
+            <item href="atomic_upsert.html" name="Atomic Upsert"/>
             <item href="namspace_mapping.html" name="Namespace Mapping"/>
             <item href="update_statistics.html" name="Statistics Collection"/>
             <item href="rowtimestamp.html" name="Row Timestamp Column"/>


Reply via email to