Repository: tajo Updated Branches: refs/heads/master 099c2cd83 -> 1021e7502
TAJO-2053: Update description for HBase configuration. Closes #941 Signed-off-by: JaeHwa Jung <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/1021e750 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/1021e750 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/1021e750 Branch: refs/heads/master Commit: 1021e7502d5cf23f417af29698b05353ea4ac926 Parents: 099c2cd Author: Dongkyu Hwangbo <[email protected]> Authored: Mon Jan 18 11:24:17 2016 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Mon Jan 18 11:24:17 2016 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ tajo-docs/src/main/sphinx/hbase_integration.rst | 16 +++++++++++----- .../main/sphinx/table_management/tablespaces.rst | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1021e750/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 51bfa62..2f752fd 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,9 @@ Release 0.12.0 - unreleased IMPROVEMENT + TAJO-2053: Update description for HBase configuration. + (Dongkyu Hwangbo via jaehwa) + TAJO-2057: Remove redundant class loading in plan optimizer. (jinho) TAJO-2032: Change tajo.rest.service.port to be the general style in TAJO. http://git-wip-us.apache.org/repos/asf/tajo/blob/1021e750/tajo-docs/src/main/sphinx/hbase_integration.rst ---------------------------------------------------------------------- diff --git a/tajo-docs/src/main/sphinx/hbase_integration.rst b/tajo-docs/src/main/sphinx/hbase_integration.rst index 779223b..6b7844f 100644 --- a/tajo-docs/src/main/sphinx/hbase_integration.rst +++ b/tajo-docs/src/main/sphinx/hbase_integration.rst @@ -9,12 +9,14 @@ In order to use this feature, you need to build add some configs into ``conf/taj This section describes how to setup HBase integration. -First, you need to set your HBase home directory to the environment variable ``HBASE_HOME`` in conf/tajo-env.sh as follows: :: +First, you need to set your HBase home directory to the environment variable ``HBASE_HOME`` in ``conf/tajo-env.sh`` as follows: :: export HBASE_HOME=/path/to/your/hbase/directory If you set the directory, Tajo will add HBase library file to classpath. +Next, you must configure tablespace about HBase. Please see :doc:`/table_management/tablespaces` if you want to know more information about it. + ======================== @@ -30,8 +32,12 @@ CREATE TABLE WITH ('table'='<hbase_table_name>' , 'columns'=':key,<column_family_name>:<qualifier_name>, ...' , 'hbase.zookeeper.quorum'='<zookeeper_address>' - , 'hbase.zookeeper.property.clientPort'='<zookeeper_client_port>' - ) + , 'hbase.zookeeper.property.clientPort'='<zookeeper_client_port>') + [LOCATION 'hbase:zk://<hostname>:<port>/'] ; + +``IF NOT EXISTS`` allows ``CREATE [EXTERNAL] TABLE`` statement to avoid an error which occurs when the table does not exist. + +If you want to create ``EXTERNAL TABLE``, You must write ``LOCATION`` statement. Options @@ -40,7 +46,6 @@ Options * ``hbase.zookeeper.quorum`` : Set zookeeper quorum address. You can use different zookeeper cluster on the same Tajo database. If you don't set the zookeeper address, Tajo will refer the property of hbase-site.xml file. * ``hbase.zookeeper.property.clientPort`` : Set zookeeper client port. If you don't set the port, Tajo will refer the property of hbase-site.xml file. -``IF NOT EXISTS`` allows ``CREATE [EXTERNAL] TABLE`` statement to avoid an error which occurs when the table does not exist. @@ -94,7 +99,8 @@ In order to create a new HBase table which is to be managed by Tajo, use the USI CREATE EXTERNAL TABLE blog (rowkey text, author text, register_date text, title text) USING hbase WITH ( 'table'='blog' - , 'columns'=':key,info:author,info:date,content:title'); + , 'columns'=':key,info:author,info:date,content:title') + LOCATION 'hbase:zk://<hostname>:<port>/'; After executing the command above, you should be able to see the new table in the HBase shell: http://git-wip-us.apache.org/repos/asf/tajo/blob/1021e750/tajo-docs/src/main/sphinx/table_management/tablespaces.rst ---------------------------------------------------------------------- diff --git a/tajo-docs/src/main/sphinx/table_management/tablespaces.rst b/tajo-docs/src/main/sphinx/table_management/tablespaces.rst index ff90483..7d18675 100644 --- a/tajo-docs/src/main/sphinx/table_management/tablespaces.rst +++ b/tajo-docs/src/main/sphinx/table_management/tablespaces.rst @@ -26,7 +26,7 @@ If the tablespace is not specified, the default tablespace of the table's databa Configuration ============= -By default, Tajo use in ``${tajo.rootdir}/warehouse`` in :doc:`conf/tajo-site.xml</configuration/tajo-site-xml>` as a default tablespace. It also allows users to register additional tablespaces using ``storage-site.json`` file like below. +By default, Tajo use ``${tajo.rootdir}/warehouse`` in :doc:`conf/tajo-site.xml</configuration/tajo-site-xml>` as a default tablespace. It also allows users to register additional tablespaces using ``storage-site.json`` file like below. --------------------------- conf/storage-site.json file @@ -39,7 +39,7 @@ The configuration file has the following struct: { "spaces": { "${tablespace_name}": { - "uri": "hbase://quorum1:port,quorum2:port/" + "uri": "hbase:zk://quorum1:port,quorum2:port/" } } } @@ -51,7 +51,7 @@ The following is an example for two tablespaces for hbase and hdfs: { "spaces": { "hbase_cluster1": { - "uri": "hbase://quorum1:port,quorum2:port/" + "uri": "hbase:zk://quorum1:port,quorum2:port/" }, "ssd": {
