Updates to service coverage and hbase tweaks.
git-svn-id: https://svn.apache.org/repos/asf/incubator/knox/trunk@1530477 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/books/0.3.0/book_getting-started.md b/books/0.3.0/book_getting-started.md
index c086940..7f2d82f 100644
--- a/books/0.3.0/book_getting-started.md
+++ b/books/0.3.0/book_getting-started.md
@@ -158,7 +158,6 @@
| README | Provides basic information about the Apache Knox Gateway. |
| ISSUES | Describes significant know issues. |
| CHANGES | Enumerates the changes between releases. |
-| INSTALL | Provides simple installation instructions. |
| LICENSE | Documents the license under which this software is provided. |
| NOTICE | Documents required attribution notices for included dependencies. |
| DISCLAIMER | Documents that this release is from a project undergoing incubation at Apache. |
@@ -175,11 +174,12 @@
| WebHCat/Templeton | 0.11.0 | ![y] | ![y] |
| Ozzie | 4.0.0 | ![y] | ![y] |
| HBase/Stargate | 0.95.2 | ![y] | ![?] |
-| Hive (via WebHCat) | 0.11.0 | ![y] | ![y] |
-| | 0.12.0 | ![y] | ![y] |
+| Hive (via WebHCat) | 0.11.0 | ![y] | ![n] |
+| | 0.12.0 | ![y] | ![?] |
| Hive (via JDBC) | 0.11.0 | ![n] | ![n] |
-| | 0.12.0 | ![?]![y] | ![?] |
-| Hive (via ODBC) | 0.12.0 | ![?] | ![?] |
+| | 0.12.0 | ![?] | ![?] |
+| Hive (via ODBC) | 0.11.0 | ![n] | ![n] |
+| Hive | 0.12.0 | ![?] | ![?] |
### Sandbox Configuration ###
diff --git a/books/0.3.0/service_hbase.md b/books/0.3.0/service_hbase.md
index 24e5d0a..93cb2eb 100644
--- a/books/0.3.0/service_hbase.md
+++ b/books/0.3.0/service_hbase.md
@@ -38,9 +38,9 @@
sudo /usr/lib/hbase/bin/hbase-daemon.sh start rest -p 60080
-60080 post is used because it was specified in sample Hadoop cluster deployment `{GATEWAY_HOME}/deployments/sandbox.xml`.
+Port 60080 is used because it was specified in sample Hadoop cluster deployment `{GATEWAY_HOME}/deployments/sandbox.xml`.
-#### Configure Sandbox port mapping for VirtualBox
+#### Configure Sandbox port mapping for VirtualBox ####
1. Select the VM
2. Select menu Machine>Settings...
@@ -51,15 +51,25 @@
7. Press OK to close the rule window
8. Press OK to Network window save the changes
-60080 post is used because it was specified in sample Hadoop cluster deployment `{GATEWAY_HOME}/deployments/sandbox.xml`.
+60080 pot is used because it was specified in sample Hadoop cluster deployment `{GATEWAY_HOME}/deployments/sandbox.xml`.
-### HBase/Stargate client DSL
+#### HBase Restart ####
-#### Usage
+If it becomes necessary to restart HBase you can log into the hosts running HBase and use these steps.
+
+ sudo /usr/lib/hbase/bin/hbase-daemon.sh stop rest
+ sudo -u hbase /usr/lib/hbase/bin/hbase-daemon.sh stop regionserver
+ sudo -u hbase /usr/lib/hbase/bin/hbase-daemon.sh stop master
+
+ sudo -u hbase /usr/lib/hbase/bin/hbase-daemon.sh start regionserver
+ sudo -u hbase /usr/lib/hbase/bin/hbase-daemon.sh start master
+ sudo /usr/lib/hbase/bin/hbase-daemon.sh start rest -p 60080
+
+### HBase/Stargate client DSL ###
For more details about client DSL usage please follow this [page|https://cwiki.apache.org/confluence/display/KNOX/Client+Usage].
-##### systemVersion() - Query Software Version.
+#### systemVersion() - Query Software Version.
* Request
* No request parameters.
@@ -68,7 +78,7 @@
* Example
* `HBase.session(session).systemVersion().now().string`
-##### clusterVersion() - Query Storage Cluster Version.
+#### clusterVersion() - Query Storage Cluster Version.
* Request
* No request parameters.
@@ -77,7 +87,7 @@
* Example
* `HBase.session(session).clusterVersion().now().string`
-##### status() - Query Storage Cluster Status.
+#### status() - Query Storage Cluster Status.
* Request
* No request parameters.
@@ -86,7 +96,7 @@
* Example
* `HBase.session(session).status().now().string`
-##### table().list() - Query Table List.
+#### table().list() - Query Table List.
* Request
* No request parameters.
@@ -95,7 +105,7 @@
* Example
* `HBase.session(session).table().list().now().string`
-##### table(String tableName).schema() - Query Table Schema.
+#### table(String tableName).schema() - Query Table Schema.
* Request
* No request parameters.
@@ -104,7 +114,7 @@
* Example
* `HBase.session(session).table().schema().now().string`
-##### table(String tableName).create() - Create Table Schema.
+#### table(String tableName).create() - Create Table Schema.
* Request
* attribute(String name, Object value) - the table's attribute.
@@ -129,7 +139,7 @@
.attribute("tb_attr3", "value5")
.now()
-##### table(String tableName).update() - Update Table Schema.
+#### table(String tableName).update() - Update Table Schema.
* Request
* family(String name) - starts family definition. Has sub requests:
@@ -149,7 +159,7 @@
.endFamilyDef()
.now()```
-##### table(String tableName).regions() - Query Table Metadata.
+#### table(String tableName).regions() - Query Table Metadata.
* Request
* No request parameters.
@@ -158,7 +168,7 @@
* Example
* `HBase.session(session).table(tableName).regions().now().string`
-##### table(String tableName).delete() - Delete Table.
+#### table(String tableName).delete() - Delete Table.
* Request
* No request parameters.
@@ -167,7 +177,7 @@
* Example
* `HBase.session(session).table(tableName).delete().now()`
-##### table(String tableName).row(String rowId).store() - Cell Store.
+#### table(String tableName).row(String rowId).store() - Cell Store.
* Request
* column(String family, String qualifier, Object value, Long time) - the data to store; "qualifier" may be "null"; "time" is optional.
@@ -187,7 +197,7 @@
.column("family1", "row2_col1", "row2_col_value1")
.now()
-##### table(String tableName).row(String rowId).query() - Cell or Row Query.
+#### table(String tableName).row(String rowId).query() - Cell or Row Query.
* rowId is optional. Querying with null or empty rowId will select all rows.
* Request
@@ -216,7 +226,7 @@
.numVersions(1)
.now().string
-##### table(String tableName).row(String rowId).delete() - Row, Column, or Cell Delete.
+#### table(String tableName).row(String rowId).delete() - Row, Column, or Cell Delete.
* Request
* column(String family, String qualifier) - the column to delete; "qualifier" is optional.
@@ -238,7 +248,7 @@
.time(Long.MAX_VALUE)
.now()```
-##### table(String tableName).scanner().create() - Scanner Creation.
+#### table(String tableName).scanner().create() - Scanner Creation.
* Request
* startRow(String) - the lower bound for filtration by row id.
@@ -268,7 +278,7 @@
.maxVersions(100)
.now()```
-##### table(String tableName).scanner(String scannerId).getNext() - Scanner Get Next.
+#### table(String tableName).scanner(String scannerId).getNext() - Scanner Get Next.
* Request
* No request parameters.
@@ -277,7 +287,7 @@
* Example
* `HBase.session(session).table(tableName).scanner(scannerId).getNext().now().string`
-##### table(String tableName).scanner(String scannerId).delete() - Scanner Deletion.
+#### table(String tableName).scanner(String scannerId).delete() - Scanner Deletion.
* Request
* No request parameters.
@@ -286,7 +296,7 @@
* Example
* `HBase.session(session).table(tableName).scanner(scannerId).delete().now()`
-#### Examples
+### HBase/Stargate via Client DSL ###
This example illustrates sequence of all basic HBase operations:
1. get system version
@@ -515,7 +525,7 @@
Set Accept Header to "text/plain", "text/xml", "application/json" or "application/x-protobuf"
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X GET 'https://localhost:8443/gateway/sandbox/hbase/status/cluster'
@@ -523,33 +533,33 @@
Set Accept Header to "text/plain", "text/xml", "application/json" or "application/x-protobuf"
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X GET 'https://localhost:8443/gateway/sandbox/hbase'
#### Create table with two column families using xml input
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml" -H "Content-Type: text/xml"\
-d '<?xml version="1.0" encoding="UTF-8"?><TableSchema name="table1"><ColumnSchema name="family1"/><ColumnSchema name="family2"/></TableSchema>'\
-X PUT 'https://localhost:8443/gateway/sandbox/hbase/table1/schema'
#### Create table with two column families using JSON input
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: application/json" -H "Content-Type: application/json"\
-d '{"name":"table2","ColumnSchema":[{"name":"family3"},{"name":"family4"}]}'\
-X PUT 'https://localhost:8443/gateway/sandbox/hbase/table2/schema'
#### Get table metadata
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X GET 'https://localhost:8443/gateway/sandbox/hbase/table1/regions'
#### Insert single row table
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Content-Type: text/xml"\
-H "Accept: text/xml"\
-d '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><CellSet><Row key="cm93MQ=="><Cell column="ZmFtaWx5MTpjb2wx" >dGVzdA==</Cell></Row></CellSet>'\
@@ -557,7 +567,7 @@
#### Insert multiple rows into table
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Content-Type: text/xml"\
-H "Accept: text/xml"\
-d '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><CellSet><Row key="cm93MA=="><Cell column=" ZmFtaWx5Mzpjb2x1bW4x" >dGVzdA==</Cell></Row><Row key="cm93MQ=="><Cell column=" ZmFtaWx5NDpjb2x1bW4x" >dGVzdA==</Cell></Row></CellSet>'\
@@ -567,7 +577,7 @@
Set Accept Header to "text/plain", "text/xml", "application/json" or "application/x-protobuf"
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X GET 'https://localhost:8443/gateway/sandbox/hbase/table1/*'
@@ -575,25 +585,25 @@
Set Accept Header to "text/plain", "text/xml", "application/json" or "application/x-protobuf"
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X GET 'https://localhost:8443/gateway/sandbox/hbase/table1/row1/family1:col1'
#### Delete entire row from table
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X DELETE 'https://localhost:8443/gateway/sandbox/hbase/table2/row0'
#### Delete column family from row
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X DELETE 'https://localhost:8443/gateway/sandbox/hbase/table2/row0/family3'
#### Delete specific column from row
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X DELETE 'https://localhost:8443/gateway/sandbox/hbase/table2/row0/family3'
@@ -601,24 +611,24 @@
Scanner URL will be in Location response header
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Content-Type: text/xml"\
-d '<Scanner batch="1"/>'\
-X PUT 'https://localhost:8443/gateway/sandbox/hbase/table1/scanner'
#### Get the values of the next cells found by the scanner
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: application/json"\
-X GET 'https://localhost:8443/gateway/sandbox/hbase/table1/scanner/13705290446328cff5ed'
#### Delete scanner
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-H "Accept: text/xml"\
-X DELETE 'https://localhost:8443/gateway/sandbox/hbase/table1/scanner/13705290446328cff5ed'
#### Delete table
- % curl -ik -u guest:guest-password\
+ curl -ik -u guest:guest-password\
-X DELETE 'https://localhost:8443/gateway/sandbox/hbase/table1/schema'
