Author: elserj
Date: Tue Apr 10 19:15:30 2018
New Revision: 1828850
URL: http://svn.apache.org/viewvc?rev=1828850&view=rev
Log:
PHOENIX-4672 Update pqs HTTP krb principal configuration keys
Modified:
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/publish/server.html
phoenix/site/source/src/site/markdown/server.md
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1828850&r1=1828849&r2=1828850&view=diff
==============================================================================
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Tue Apr 10 19:15:30 2018
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2018-03-24
+ Generated by Apache Maven Doxia at 2018-04-10
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1828850&r1=1828849&r2=1828850&view=diff
==============================================================================
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Tue Apr 10 19:15:30 2018
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2018-03-24
+ Generated by Apache Maven Doxia at 2018-04-10
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1828850&r1=1828849&r2=1828850&view=diff
==============================================================================
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Tue Apr 10 19:15:30 2018
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2018-03-24
+ Generated by Apache Maven Doxia at 2018-04-10
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
Modified: phoenix/site/publish/server.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1828850&r1=1828849&r2=1828850&view=diff
==============================================================================
--- phoenix/site/publish/server.html (original)
+++ phoenix/site/publish/server.html Tue Apr 10 19:15:30 2018
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2018-03-06
+ Generated by Apache Maven Doxia at 2018-04-10
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -299,130 +299,135 @@ log4j.logger.org.eclipse.jetty.server=IN
<td><i>unset</i></td>
</tr>
<tr class="a">
- <td><small>phoenix.queryserver.kerberos.http.principal</small></td>
+ <td><small>phoenix.queryserver.http.kerberos.principal</small></td>
<td style="text-align: left;">The kerberos principal to use when
authenticating SPNEGO connections. phoenix.queryserver.kerberos.principal will
be used if this property is undefined.</td>
<td><i>unset</i></td>
</tr>
<tr class="b">
+ <td><small>phoenix.queryserver.kerberos.http.principal</small></td>
+ <td style="text-align: left;">Deprecated, use
phoenix.queryserver.http.kerberos.principal instead.</td>
+ <td><i>unset</i></td>
+ </tr>
+ <tr class="a">
<td><small>phoenix.queryserver.dns.nameserver</small></td>
<td style="text-align: left;">The DNS hostname</td>
<td>default</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>phoenix.queryserver.dns.interface</small></td>
<td style="text-align: left;">The name of the network interface to query
for DNS.</td>
<td>default</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td colspan="3"> </td>
</tr>
- <tr class="a">
+ <tr class="b">
<td colspan="3"><b>Configurations relating to the server connection
cache.</b></td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><b>Property</b></td>
<td><b>Description</b></td>
<td><b>Default</b></td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>avatica.connectioncache.concurrency</small></td>
<td style="text-align: left;">Connection cache concurrency level. Default
is 10.</td>
<td>10</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>avatica.connectioncache.initialcapacity</small></td>
<td style="text-align: left;">Connection cache initial capacity. Default
is 100.</td>
<td>100</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>avatica.connectioncache.maxcapacity</small></td>
<td style="text-align: left;"> Connection cache maximum capacity.
Approaching this point, the cache will start to evict least recently used
connection objects. Default is 1000. </td>
<td>1000</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>avatica.connectioncache.expiryduration</small></td>
<td style="text-align: left;"> Connection cache expiration duration. Any
connections older than this value will be discarded. Default is 10 minutes.
</td>
<td>10</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>avatica.connectioncache.expiryunit</small></td>
<td style="text-align: left;"> Connection cache expiration unit. Unit
modifier applied to the value provided in avatica.connectioncache.expiryunit.
Default is minutes. </td>
<td>MINUTES</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td colspan="3"> </td>
</tr>
- <tr class="a">
+ <tr class="b">
<td colspan="3" id="jdbc_url_options"><b>JDBC URL options.</b></td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>url</small></td>
<td style="text-align: left;"> The URL of the QueryServer. </td>
<td>null</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>serialization</small></td>
<td style="text-align: left;"> The client-side analogy to
phoenix.queryserver.serialization in the server to control how the client
should serialize data to send to the QueryServer. </td>
<td>PROTOBUF</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>timeZone</small></td>
<td style="text-align: left;"> The time zone the JDBC connection should
use. If not provided, the time zone will be specified by JVM. The value of this
should be parseable by Java's TimeZone class. </td>
<td>null</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td colspan="3"> </td>
</tr>
- <tr class="b">
+ <tr class="a">
<td colspan="3"><b>Configurations relating to the server statement
cache.</b></td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><b>Property</b></td>
<td><b>Description</b></td>
<td><b>Default</b></td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>avatica.statementcache.concurrency</small></td>
<td style="text-align: left;">Statement cache concurrency level. Default
is 100.</td>
<td>100</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>avatica.statementcache.initialcapacity</small></td>
<td style="text-align: left;">Statement cache initial capacity. Default is
1000.</td>
<td>1000</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>avatica.statementcache.maxcapacity</small></td>
<td style="text-align: left;"> Statement cache maximum capacity.
Approaching this point, the cache will start to evict least recently used
statement objects. Default is 10000. </td>
<td>10000</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>avatica.statementcache.expiryduration</small></td>
<td style="text-align: left;"> Statement cache expiration duration. Any
statements older than this value will be discarded. Default is 5 minutes. </td>
<td>5</td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>avatica.statementcache.expiryunit</small></td>
<td style="text-align: left;"> Statement cache expiration unit. Unit
modifier applied to the value provided in avatica.statementcache.expiryunit.
Default is minutes. </td>
<td>MINUTES</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td colspan="3"> </td>
</tr>
- <tr class="b">
+ <tr class="a">
<td colspan="3"><b>Configurations relating to impersonation.</b></td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><b>Property</b></td>
<td><b>Description</b></td>
<td><b>Default</b></td>
</tr>
- <tr class="b">
+ <tr class="a">
<td><small>phoenix.queryserver.withRemoteUserExtractor</small></td>
<td style="text-align: left;"> Boolean which controls if a remote user to
impersonate should be extracted from the HTTP request parameter made by that
user instead of the HTTP-authenticated user name (which is the default). </td>
<td>false</td>
</tr>
- <tr class="a">
+ <tr class="b">
<td><small>phoenix.queryserver.remoteUserExtractor.param</small></td>
<td style="text-align: left;"> The name of the HTTP request parameter to
use to extract the user name to execute the query as. </td>
<td>doAs</td>
Modified: phoenix/site/source/src/site/markdown/server.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/server.md?rev=1828850&r1=1828849&r2=1828850&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/server.md (original)
+++ phoenix/site/source/src/site/markdown/server.md Tue Apr 10 19:15:30 2018
@@ -183,12 +183,17 @@ configuration.
<td><em>unset</em></td>
</tr>
<tr>
- <td><small>phoenix.queryserver.kerberos.http.principal</small></td>
+ <td><small>phoenix.queryserver.http.kerberos.principal</small></td>
<td style="text-align: left;">The kerberos principal to use when
authenticating SPNEGO connections.
phoenix.queryserver.kerberos.principal will be used if this property is
undefined.</td>
<td><em>unset</em></td>
</tr>
<tr>
+ <td><small>phoenix.queryserver.kerberos.http.principal</small></td>
+ <td style="text-align: left;">Deprecated, use
phoenix.queryserver.http.kerberos.principal instead.</td>
+ <td><em>unset</em></td>
+ </tr>
+ <tr>
<td><small>phoenix.queryserver.dns.nameserver</small></td>
<td style="text-align: left;">The DNS hostname</td>
<td>default</td>
