You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2016/09/28 03:26:57 UTC

zeppelin git commit: ZEPPELIN-1452: Include Phoenix 'thin client' instructions in docs

Repository: zeppelin
Updated Branches:
  refs/heads/master 74ef094f6 -> aff653bca


ZEPPELIN-1452: Include Phoenix 'thin client' instructions in docs

### What is this PR for?
Phoenix has two different connection types: thick and thin.
This PR is about describing the difference between the two and including properties for both in docs/interpreter/jdbc.md
### What type of PR is it?
Documentation

### What is the Jira issue?
[ZEPPELIN-1452](https://issues.apache.org/jira/browse/ZEPPELIN-1452)

### How should this be tested?
No tests necessary

### Questions:
* Does the licenses files need update?
No
* Is there breaking changes for older versions?
No
* Does this needs documentation?
No

Author: Randy Gelhausen <rg...@gmail.com>

Closes #1436 from randerzander/master and squashes the following commits:

3ed029e [Randy Gelhausen] Update jdbc.md
6e2dff0 [Randy Gelhausen] Update jdbc.md
2964ba8 [Randy Gelhausen] Update jdbc.md
d2720c3 [Randy Gelhausen] tweaked jdbc readme
38b1692 [Randy Gelhausen] Updated JDBC docs to include Phoenix thin client


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/aff653bc
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/aff653bc
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/aff653bc

Branch: refs/heads/master
Commit: aff653bcad899cdf6cc382bb6d25ebe91ce5e429
Parents: 74ef094
Author: Randy Gelhausen <rg...@gmail.com>
Authored: Tue Sep 20 16:27:18 2016 -0400
Committer: Mina Lee <mi...@apache.org>
Committed: Wed Sep 28 12:26:51 2016 +0900

----------------------------------------------------------------------
 docs/interpreter/jdbc.md | 42 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/aff653bc/docs/interpreter/jdbc.md
----------------------------------------------------------------------
diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md
index 72963c0..d3104cb 100644
--- a/docs/interpreter/jdbc.md
+++ b/docs/interpreter/jdbc.md
@@ -269,38 +269,76 @@ To develop this functionality use this [method](http://docs.oracle.com/javase/7/
  </table>
 
 ### Phoenix
-#### Properties
+
+ Phoenix supports `thick` and `thin` connection types:
+
+ - Thick client is faster, but must connect directly to ZooKeeper and HBase RegionServers.
+ - Thin client has fewer dependencies and connects through a [Phoenix Query Server](http://phoenix.apache.org/server.html) instance.
+
+Use the appropriate `phoenix.driver` and `phoenix.url` for your connection type.
+
+#### Properties:
  <table class="table-configuration">
    <tr>
      <th>Name</th>
      <th>Value</th>
+     <th>Description</th>
    </tr>
    <tr>
      <td>phoenix.driver</td>
      <td>org.apache.phoenix.jdbc.PhoenixDriver</td>
+     <td>'Thick Client', connects directly to Phoenix</td>
+   </tr>
+   <tr>
+     <td>phoenix.driver</td>
+     <td>org.apache.phoenix.queryserver.client.Driver</td>
+     <td>'Thin Client', connects via Phoenix Query Server</td>
    </tr>
    <tr>
      <td>phoenix.url</td>
      <td>jdbc:phoenix:localhost:2181:/hbase-unsecure</td>
+     <td>'Thick Client', connects directly to Phoenix</td>
+   </tr>
+   <tr>
+     <td>phoenix.url</td>
+     <td>jdbc:phoenix:thin:url=http://localhost:8765;serialization=PROTOBUF</td>
+     <td>'Thin Client', connects via Phoenix Query Server</td>
    </tr>
    <tr>
      <td>phoenix.user</td>
      <td>phoenix_user</td>
+     <td></td>
    </tr>
    <tr>
      <td>phoenix.password</td>
      <td>phoenix_password</td>
+     <td></td>
    </tr>
  </table>
-#### Dependencies
+#### Dependencies:
+ 
+ Include the dependency for your connection type (it should be only *one* of the following).
+ 
  <table class="table-configuration">
    <tr>
      <th>Artifact</th>
      <th>Excludes</th>
+     <th>Description</th>
    </tr>
    <tr>
      <td>org.apache.phoenix:phoenix-core:4.4.0-HBase-1.0</td>
      <td></td>
+     <td>'Thick Client', connects directly to Phoenix</td>
+   </tr>
+   <tr>
+     <td>org.apache.phoenix:phoenix-server-client:4.7.0-HBase-1.1</td>
+     <td></td>
+     <td>'Thin Client' for Phoenix 4.7, connects via Phoenix Query Server</td>
+   </tr>
+   <tr>
+     <td>org.apache.phoenix:phoenix-queryserver-client:4.8.0-HBase-1.2</td>
+     <td></td>
+     <td>'Thin Client' for Phoenix 4.8+, connects via Phoenix Query Server</td>
    </tr>
  </table>