You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2016/02/04 01:38:00 UTC
svn commit: r1728396 [1/6] - in /tajo/site/docs/devel: ./ _sources/
_sources/configuration/ _sources/index/ _sources/partitioning/
_sources/sql_language/ _sources/table_management/ _static/
backup_and_restore/ configuration/ functions/ index/ partition...
Author: jihoonson
Date: Thu Feb 4 00:37:56 2016
New Revision: 1728396
URL: http://svn.apache.org/viewvc?rev=1728396&view=rev
Log:
update document for develop branch
Added:
tajo/site/docs/devel/_sources/configuration/storage-site-json.txt
tajo/site/docs/devel/_sources/sql_language/explain.txt
tajo/site/docs/devel/_sources/table_management/data_formats.txt
tajo/site/docs/devel/configuration/storage-site-json.html
tajo/site/docs/devel/sql_language/explain.html
tajo/site/docs/devel/table_management/data_formats.html
Modified:
tajo/site/docs/devel/_sources/configuration.txt
tajo/site/docs/devel/_sources/configuration/worker_configuration.txt
tajo/site/docs/devel/_sources/hbase_integration.txt
tajo/site/docs/devel/_sources/hive_integration.txt
tajo/site/docs/devel/_sources/index/future_work.txt
tajo/site/docs/devel/_sources/index/how_to_use.txt
tajo/site/docs/devel/_sources/index/types.txt
tajo/site/docs/devel/_sources/index_overview.txt
tajo/site/docs/devel/_sources/partitioning/column_partitioning.txt
tajo/site/docs/devel/_sources/sql_language.txt
tajo/site/docs/devel/_sources/sql_language/joins.txt
tajo/site/docs/devel/_sources/sql_language/predicates.txt
tajo/site/docs/devel/_sources/sql_language/queries.txt
tajo/site/docs/devel/_sources/table_management/compression.txt
tajo/site/docs/devel/_sources/table_management/orc.txt
tajo/site/docs/devel/_sources/table_management/tablespaces.txt
tajo/site/docs/devel/_static/basic.css
tajo/site/docs/devel/_static/doctools.js
tajo/site/docs/devel/_static/pygments.css
tajo/site/docs/devel/_static/searchtools.js
tajo/site/docs/devel/_static/websupport.js
tajo/site/docs/devel/backup_and_restore.html
tajo/site/docs/devel/backup_and_restore/catalog.html
tajo/site/docs/devel/configuration.html
tajo/site/docs/devel/configuration/catalog-site-xml.html
tajo/site/docs/devel/configuration/catalog_configuration.html
tajo/site/docs/devel/configuration/cluster_setup.html
tajo/site/docs/devel/configuration/ha_configuration.html
tajo/site/docs/devel/configuration/preliminary.html
tajo/site/docs/devel/configuration/service_config_defaults.html
tajo/site/docs/devel/configuration/tajo-site-xml.html
tajo/site/docs/devel/configuration/tajo_master_configuration.html
tajo/site/docs/devel/configuration/worker_configuration.html
tajo/site/docs/devel/faq.html
tajo/site/docs/devel/functions.html
tajo/site/docs/devel/functions/agg_func.html
tajo/site/docs/devel/functions/data_type_func_and_operators.html
tajo/site/docs/devel/functions/datetime_func_and_operators.html
tajo/site/docs/devel/functions/json_func.html
tajo/site/docs/devel/functions/math_func_and_operators.html
tajo/site/docs/devel/functions/network_func_and_operators.html
tajo/site/docs/devel/functions/python.html
tajo/site/docs/devel/functions/string_func_and_operators.html
tajo/site/docs/devel/functions/window_func.html
tajo/site/docs/devel/genindex.html
tajo/site/docs/devel/getting_started.html
tajo/site/docs/devel/hbase_integration.html
tajo/site/docs/devel/hive_integration.html
tajo/site/docs/devel/index.html
tajo/site/docs/devel/index/future_work.html
tajo/site/docs/devel/index/how_to_use.html
tajo/site/docs/devel/index/types.html
tajo/site/docs/devel/index_overview.html
tajo/site/docs/devel/introduction.html
tajo/site/docs/devel/jdbc_driver.html
tajo/site/docs/devel/partitioning/column_partitioning.html
tajo/site/docs/devel/partitioning/hash_partitioning.html
tajo/site/docs/devel/partitioning/intro_to_partitioning.html
tajo/site/docs/devel/partitioning/range_partitioning.html
tajo/site/docs/devel/search.html
tajo/site/docs/devel/searchindex.js
tajo/site/docs/devel/sql_language.html
tajo/site/docs/devel/sql_language/alter_table.html
tajo/site/docs/devel/sql_language/data_model.html
tajo/site/docs/devel/sql_language/ddl.html
tajo/site/docs/devel/sql_language/insert.html
tajo/site/docs/devel/sql_language/joins.html
tajo/site/docs/devel/sql_language/predicates.html
tajo/site/docs/devel/sql_language/queries.html
tajo/site/docs/devel/sql_language/sql_expression.html
tajo/site/docs/devel/storage_plugins.html
tajo/site/docs/devel/storage_plugins/overview.html
tajo/site/docs/devel/storage_plugins/postgresql.html
tajo/site/docs/devel/swift_integration.html
tajo/site/docs/devel/table_management.html
tajo/site/docs/devel/table_management/compression.html
tajo/site/docs/devel/table_management/json.html
tajo/site/docs/devel/table_management/orc.html
tajo/site/docs/devel/table_management/parquet.html
tajo/site/docs/devel/table_management/rcfile.html
tajo/site/docs/devel/table_management/sequencefile.html
tajo/site/docs/devel/table_management/table_overview.html
tajo/site/docs/devel/table_management/tablespaces.html
tajo/site/docs/devel/table_management/text.html
tajo/site/docs/devel/table_partitioning.html
tajo/site/docs/devel/tajo_client_api.html
tajo/site/docs/devel/time_zone.html
tajo/site/docs/devel/tsql.html
tajo/site/docs/devel/tsql/admin_command.html
tajo/site/docs/devel/tsql/background_command.html
tajo/site/docs/devel/tsql/dfs_command.html
tajo/site/docs/devel/tsql/execute_file.html
tajo/site/docs/devel/tsql/intro.html
tajo/site/docs/devel/tsql/meta_command.html
tajo/site/docs/devel/tsql/single_command.html
tajo/site/docs/devel/tsql/variables.html
Modified: tajo/site/docs/devel/_sources/configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/configuration.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/configuration.txt (original)
+++ tajo/site/docs/devel/_sources/configuration.txt Thu Feb 4 00:37:56 2016
@@ -1,6 +1,6 @@
-************************
+*************
Configuration
-************************
+*************
.. toctree::
:maxdepth: 1
@@ -13,4 +13,5 @@ Configuration
configuration/ha_configuration
configuration/service_config_defaults
configuration/tajo-site-xml
- configuration/catalog-site-xml
\ No newline at end of file
+ configuration/catalog-site-xml
+ configuration/storage-site-json
Added: tajo/site/docs/devel/_sources/configuration/storage-site-json.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/configuration/storage-site-json.txt?rev=1728396&view=auto
==============================================================================
--- tajo/site/docs/devel/_sources/configuration/storage-site-json.txt (added)
+++ tajo/site/docs/devel/_sources/configuration/storage-site-json.txt Thu Feb 4 00:37:56 2016
@@ -0,0 +1,64 @@
+**************************
+The storage-site.json File
+**************************
+
+This file is for configuring :doc:`/table_management/tablespaces`.
+The syntax of ``storage-site.json`` is like this basically:
+
+.. code:: json
+
+ {
+ "spaces": {
+ <space config 1>, <space config 2>, ...
+ },
+ "storages": {
+ <storage config 1>, <storage config 2>, ...
+ }
+ }
+
+------
+Spaces
+------
+
+This is a section for registering tablespaces. Some space config example is here:
+
+.. code:: json
+
+ "spaces": {
+ "jdbc_pgsql": {
+ "uri": "jdbc:postgresql://127.0.0.1:5740/origin",
+ "configs": {
+ "mapped_database":"tajo_pgsql_origin",
+ "connection_properties": {
+ "user":"tajouser",
+ "password":"123456"
+ }
+ }
+ },
+ ...
+ }
+
+* **space name** : Your own tablespace name which indicates a specific tablespace. Alpha-numeric characters and underscore(_) are permitted.
+* **uri** : An URI address of a tablespace
+* **configs** : It is optional. You can specify it as JSON object to pass to each tablespace handler.
+
+After you specify a tablespace, you can use it in `create table statement <../sql_language/ddl.html#create-table>`_.
+
+--------
+Storages
+--------
+
+This is for registering storage format and custom storage handler class.
+Tajo already supports HDFS, HBase, PostgreSQL, Amazon S3, Openstack Swift, etc, thus in usual cases using mentioned storages, you don't have to add any ``storages`` configuration.
+However, if you want to use your custom storage as one of Tajo's data source, you need to add a configuration for your storage. Here is an example of HDFS storage.
+See :doc:`storage_plugins/overview` for more information.
+
+.. code:: json
+
+ "storages": {
+ "hdfs": {
+ "handler": "org.apache.tajo.storage.FileTablespace",
+ "default-format": "text"
+ },
+ ...
+ }
Modified: tajo/site/docs/devel/_sources/configuration/worker_configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/configuration/worker_configuration.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/configuration/worker_configuration.txt (original)
+++ tajo/site/docs/devel/_sources/configuration/worker_configuration.txt Thu Feb 4 00:37:56 2016
@@ -14,7 +14,7 @@ If you want to adjust heap memory size,
TAJO_WORKER_HEAPSIZE=8000
-The default size is 1000 (1GB).
+The default size is 5000 (5GB).
========================
Temporary Data Directory
@@ -54,8 +54,8 @@ In order to specify the resource capacit
=================================== ============= ====================== =================================
tajo.worker.resource.cpu-cores Integer available cpu-cores the number of cpu cores
tajo.worker.resource.memory-mb Integer available jvm heap memory size (MB)
- tajo.worker.resource.disks Integer 1 the number of disks
- tajo.task.resource.min.memory-mb Integer 500 minimum allocatable memory per task
+ tajo.worker.resource.disks Integer 2 the number of disks
+ tajo.task.resource.min.memory-mb Integer 1000 minimum allocatable memory per task
tajo.qm.resource.min.memory-mb Integer 500 minimum allocatable memory per query
=================================== ============= ====================== =================================
@@ -73,7 +73,7 @@ In order to specify the resource capacit
Example
------------
-Assume that you want to give 15GB Jvm heap, 1GB memory per task, 4 disks, and 12 cores on each worker. The example configuration is as follows:
+Assume that you want to give 15GB Jvm heap, 2GB memory per task, 4 disks, and 12 cores on each worker. The example configuration is as follows:
``tajo-env.sh``
@@ -93,7 +93,7 @@ Assume that you want to give 15GB Jvm he
<property>
<name>tajo.task.resource.min.memory-mb</name>
- <value>1000</value>
+ <value>2000</value>
</property>
<property>
@@ -117,7 +117,7 @@ Assume that you want to give 15GB Jvm he
<property>
<name>tajo.task.resource.min.memory-mb</name>
- <value>1000</value>
+ <value>2000</value>
</property>
<property>
@@ -141,7 +141,7 @@ Assume that you want to give 15GB Jvm he
<property>
<name>tajo.task.resource.min.memory-mb</name>
- <value>1000</value>
+ <value>2000</value>
</property>
<property>
Modified: tajo/site/docs/devel/_sources/hbase_integration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/hbase_integration.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/hbase_integration.txt (original)
+++ tajo/site/docs/devel/_sources/hbase_integration.txt Thu Feb 4 00:37:56 2016
@@ -9,12 +9,14 @@ In order to use this feature, you need t
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 whi
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:
Modified: tajo/site/docs/devel/_sources/hive_integration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/hive_integration.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/hive_integration.txt (original)
+++ tajo/site/docs/devel/_sources/hive_integration.txt Thu Feb 4 00:37:56 2016
@@ -1,6 +1,6 @@
-*************************************
+****************
Hive Integration
-*************************************
+****************
Apache Tajo⢠catalog supports HiveCatalogStore to integrate with Apache Hiveâ¢.
This integration allows Tajo to access all tables used in Apache Hive.
@@ -12,16 +12,22 @@ and then add some configs into ``conf/ta
This section describes how to setup HiveMetaStore integration.
This instruction would take no more than five minutes.
-You need to set your Hive home directory to the environment variable ``HIVE_HOME`` in conf/tajo-env.sh as follows: ::
+You need to set your Hive home directory to the environment variable **HIVE_HOME** in ``conf/tajo-env.sh`` as follows:
+
+.. code-block:: sh
export HIVE_HOME=/path/to/your/hive/directory
If you need to use jdbc to connect HiveMetaStore, you have to prepare MySQL jdbc driver.
-Next, you should set the path of MySQL JDBC driver jar file to the environment variable HIVE_JDBC_DRIVER_DIR in conf/tajo-env.sh as follows: ::
+Next, you should set the path of MySQL JDBC driver jar file to the environment variable **HIVE_JDBC_DRIVER_DIR** in ``conf/tajo-env.sh`` as follows:
+
+.. code-block:: sh
- export HIVE_JDBC_DRIVER_DIR==/path/to/your/mysql_jdbc_driver/mysql-connector-java-x.x.x-bin.jar
+ export HIVE_JDBC_DRIVER_DIR=/path/to/your/mysql_jdbc_driver/mysql-connector-java-x.x.x-bin.jar
-Finally, you should specify HiveCatalogStore as Tajo catalog driver class in ``conf/catalog-site.xml`` as follows: ::
+Finally, you should specify HiveCatalogStore as Tajo catalog driver class in ``conf/catalog-site.xml`` as follows:
+
+.. code-block:: xml
<property>
<name>tajo.catalog.store.class</name>
@@ -30,13 +36,17 @@ Finally, you should specify HiveCatalogS
.. note::
- Hive stores a list of partitions for each table in its metastore. If new partitions are
- directly added to HDFS, HiveMetastore will not able aware of these partitions unless the user
+ Hive stores a list of partitions for each table in its metastore. When new partitions are
+ added directly to HDFS, HiveMetastore can't recognize these partitions until the user executes
``ALTER TABLE table_name ADD PARTITION`` commands on each of the newly added partitions or
- ``MSCK REPAIR TABLE table_name`` command.
+ ``MSCK REPAIR TABLE table_name`` command.
+
+ But current Tajo doesn't provide ``ADD PARTITION`` command and Hive doesn't provide an api for
+ responding to ``MSK REPAIR TABLE`` command. Thus, if you insert data to Hive partitioned
+ table and you want to scan the updated partitions through Tajo, you must run following command on Hive
+ (see `Hive doc <https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DDL#LanguageManualDDL-RecoverPartitions(MSCKREPAIRTABLE)>`_
+ for more details of the command):
- But current tajo doesn't provide ``ADD PARTITION`` command and hive doesn't provide an api for
- responding to ``MSK REPAIR TABLE`` command. Thus, if you insert data to hive partitioned
- table and you want to scan the updated partitions through Tajo, you must run following command on hive ::
+ .. code-block:: sql
- $ MSCK REPAIR TABLE [table_name];
+ MSCK REPAIR TABLE [table_name];
Modified: tajo/site/docs/devel/_sources/index/future_work.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/index/future_work.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/index/future_work.txt (original)
+++ tajo/site/docs/devel/_sources/index/future_work.txt Thu Feb 4 00:37:56 2016
@@ -2,7 +2,6 @@
Future Works
*************************************
-* Providing more index types, such as bitmap and HBase index
+* Supporting more index types, such as bitmap and HBase index
* Supporting index on partitioned tables
-* Supporting the backup and restore feature
* Cost-based query optimization by estimating the query selectivity
\ No newline at end of file
Modified: tajo/site/docs/devel/_sources/index/how_to_use.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/index/how_to_use.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/index/how_to_use.txt (original)
+++ tajo/site/docs/devel/_sources/index/how_to_use.txt Thu Feb 4 00:37:56 2016
@@ -1,18 +1,19 @@
-*************************************
+*****************
How to use index?
-*************************************
+*****************
--------------------------------------
+---------------
1. Create index
--------------------------------------
+---------------
-The first step for utilizing index is index creation. You can create index using SQL (:doc:`/sql_language/ddl`) or Tajo API (:doc:`/tajo_client_api`). For example, you can create a BST index on the lineitem table by submitting the following SQL to Tajo.
+The first step for utilizing index is to create an index. You can create an index using SQL (:doc:`/sql_language/ddl`) or Tajo API (:doc:`/tajo_client_api`).
+For example, the following SQL statement will create a BST index on the lineitem table.
.. code-block:: sql
default> create index l_orderkey_idx on lineitem (l_orderkey);
-If the index is created successfully, you can see the information about that index as follows: ::
+If the index is created successfully, you can see the index information as follows: ::
default> \d lineitem
@@ -48,17 +49,18 @@ If the index is created successfully, yo
For more information about index creation, please refer to the above links.
--------------------------------------
+-----------------------------
2. Enable/disable index scans
--------------------------------------
+-----------------------------
-When an index is successfully created, you must enable the index scan feature as follows:
+Reading data using index is disabled by default.
+So, exploiting the created index, you need a further step, enabling 'index scan' as following:
.. code-block:: sql
default> \set INDEX_ENABLED true
-If you don't want to use the index scan feature anymore, you can simply disable it as follows:
+If you don't want to use index scan anymore, you can simply disable it as follows:
.. code-block:: sql
@@ -66,4 +68,12 @@ If you don't want to use the index scan
.. note::
- Once the index scan feature is enabled, Tajo currently always performs the index scan regardless of its efficiency. You should set this option when the expected number of retrieved tuples is sufficiently small.
+ Once index scan is enabled, Tajo will perform 'index scan' if possible. In some cases, it may cause performance
+ degradation. If you always want to get better performance, you should either enable or disable 'index scan'
+ according to selectivity. Usually, the performance gain of index will increase when the selectivity is low.
+
+---------------------------
+3. Index backup and restore
+---------------------------
+
+Tajo currently provides only the catalog backup and restore for index. Please refer to :doc:`/backup_and_restore/catalog` for more information about catalog backup and restore.
\ No newline at end of file
Modified: tajo/site/docs/devel/_sources/index/types.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/index/types.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/index/types.txt (original)
+++ tajo/site/docs/devel/_sources/index/types.txt Thu Feb 4 00:37:56 2016
@@ -2,6 +2,6 @@
Index Types
*************************************
-Currently, Tajo supports only one type of index, ``TWO_LEVEL_BIN_TREE``, shortly ``BST``. The BST index is a kind of binary search tree which is extended to be permanently stored on disk. It consists of two levels of nodes; a leaf node indexes the keys with the positions of data in an HDFS block and a root node indexes the keys with the leaf node indices.
+Currently, Tajo supports only one type of index, ``TWO_LEVEL_BIN_TREE``, shortly ``BST``. The BST index is a kind of binary search tree which is extended to be permanently stored on disk. It consists of two levels of nodes; a leaf node indexes the keys with the offsets to data stored on HDFS, and a root node indexes the keys with the offsets to the leaf nodes.
-When an index scan is started, the query engine first reads the root node and finds the search key. If it finds a leaf node corresponding to the search key, it subsequently finds the search key in that leaf node. Finally, it directly reads a tuple corresponding to the search key from HDFS.
\ No newline at end of file
+When an index scan is started, the query engine first reads the root node and finds the search key. If it successfully finds a leaf node corresponding to the search key, it subsequently finds the search key in that leaf node. Finally, it directly reads a tuple corresponding to the search key from HDFS.
\ No newline at end of file
Modified: tajo/site/docs/devel/_sources/index_overview.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/index_overview.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/index_overview.txt (original)
+++ tajo/site/docs/devel/_sources/index_overview.txt Thu Feb 4 00:37:56 2016
@@ -4,12 +4,6 @@ Index (Experimental Feature)
An index is a data structure that is used for efficient query processing. Using an index, the Tajo query engine can directly retrieve search values.
-This is still an experimental feature. In order to use indexes, you must check out the source code of the ``index_support`` branch::
-
- git clone -b index_support https://git-wip-us.apache.org/repos/asf/tajo.git tajo-index
-
-For the source code build, please refer to :doc:`getting_started`.
-
The following sections describe the supported index types, the query execution with an index, and the future works.
.. toctree::
Modified: tajo/site/docs/devel/_sources/partitioning/column_partitioning.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/partitioning/column_partitioning.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/partitioning/column_partitioning.txt (original)
+++ tajo/site/docs/devel/_sources/partitioning/column_partitioning.txt Thu Feb 4 00:37:56 2016
@@ -11,29 +11,61 @@ How to Create a Column Partitioned Table
You can create a partitioned table by using the ``PARTITION BY`` clause. For a column partitioned table, you should use
the ``PARTITION BY COLUMN`` clause with partition keys.
-For example, assume there is a table ``orders`` composed of the following schema. ::
+For example, assume a table with the following schema.
- id INT,
- item_name TEXT,
- price FLOAT
+.. code-block:: sql
+
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ country TEXT,
+ city TEXT,
+ phone TEXT
+ );
-Also, assume that you want to use ``order_date TEXT`` and ``ship_date TEXT`` as the partition keys.
-Then, you should create a table as follows:
+If you want to make country as partitioned column, your Tajo definition would be this:
.. code-block:: sql
- CREATE TABLE orders (
- id INT,
- item_name TEXT,
- price
- ) PARTITION BY COLUMN (order_date TEXT, ship_date TEXT);
+ CREATE TABLE student (
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ city TEXT,
+ phone TEXT
+ ) PARTITION BY COLUMN (country TEXT);
+
+Let us assume you want to use more partition columns and parquet file format. Here's an example statement to create a table:
+
+.. code-block:: sql
+
+ CREATE TABLE student (
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ phone TEXT
+ ) USING PARQUET
+ PARTITION BY COLUMN (country TEXT, city TEXT);
+
+The statement above creates the student table with id, name, grade, etc. The table is also partitioned and data is stored in parquet files.
+
+You might have noticed that while the partitioning key columns are a part of the table DDL, theyâre only listed in the ``PARTITION BY`` clause. In Tajo, as data is written to disk, each partition of data will be automatically split out into different folders, e.g. country=USA/city=NEWYORK. During a read operation, Tajo will use the folder structure to quickly locate the right partitions and also return the partitioning columns as columns in the result set.
+
==================================================
-Partition Pruning on Column Partitioned Tables
+Querying Partitioned Tables
==================================================
-The following predicates in the ``WHERE`` clause can be used to prune unqualified column partitions without processing
-during query planning phase.
+If a table created using the ``PARTITION BY`` clause, a query can do partition pruning and scan only a fraction of the table relevant to the partitions specified by the query. Tajo currently does partition pruning if the partition predicates are specified in the WHERE clause. For example, if table student is partitioned on column country and column city, the following query retrieves rows in ``country=KOREA\city=SEOUL`` directory.
+
+.. code-block:: sql
+
+ SELECT * FROM student WHERE country = 'KOREA' AND city = 'SEOUL';
+
+The following predicates in the ``WHERE`` clause can be used to prune column partitions during query planning phase.
* ``=``
* ``<>``
@@ -44,9 +76,160 @@ during query planning phase.
* LIKE predicates with a leading wild-card character
* IN list predicates
+
+==================================================
+Add data to Partition Table
+==================================================
+
+Tajo provides a very useful feature of dynamic partitioning. You don't need to use any syntax with both ``INSERT INTO ... SELECT`` and ``Create Table As Select(CTAS)`` statments for dynamic partitioning. Tajo will automatically filter the data, create directories, move filtered data to appropriate directory and create partition over it.
+
+For example, assume there are both ``student_source`` and ``student`` tables composed of the following schema.
+
+.. code-block:: sql
+
+ CREATE TABLE student_source (
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ country TEXT,
+ city TEXT,
+ phone TEXT
+ );
+
+ CREATE TABLE student (
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ phone TEXT
+ ) PARTITION BY COLUMN (country TEXT, city TEXT);
+
+
+How to INSERT dynamically to partition table
+--------------------------------------------------------
+
+If you want to load an entire country or an entire city in one fell swoop:
+
+.. code-block:: sql
+
+ INSERT OVERWRITE INTO student
+ SELECT id, name, gender, grade, phone, country, city
+ FROM student_source;
+
+
+How to CTAS dynamically to partition table
+--------------------------------------------------------
+
+when a partition table is created:
+
+.. code-block:: sql
+
+ DROP TABLE if exists student;
+
+ CREATE TABLE student (
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ phone TEXT
+ ) PARTITION BY COLUMN (country TEXT, city TEXT)
+ AS SELECT id, name, gender, grade, phone, country, city
+ FROM student_source;
+
+
+.. note::
+
+ When loading data into a partition, itâs necessary to include the partition columns as the last columns in the query. The column names in the source query donât need to match the partition column names.
+
+
==================================================
Compatibility Issues with Apache Hiveâ¢
==================================================
If partitioned tables of Hive are created as external tables in Tajo, Tajo can process the Hive partitioned tables directly.
-There haven't known compatibility issues yet.
\ No newline at end of file
+
+
+How to create partition table
+--------------------------------------------------------
+
+If you create a partition table as follows in Tajo:
+
+.. code-block:: sql
+
+ default> CREATE TABLE student (
+ id INT,
+ name TEXT,
+ gender char(1),
+ grade TEXT,
+ phone TEXT
+ ) PARTITION BY COLUMN (country TEXT, city TEXT);
+
+
+And then you can get table information in Hive:
+
+.. code-block:: sql
+
+ hive> desc student;
+ OK
+ id int
+ name string
+ gender char(1)
+ grade string
+ phone string
+ country string
+ city string
+
+ # Partition Information
+ # col_name data_type comment
+
+ country string
+ city string
+
+
+Or as you create the table in Hive:
+
+.. code-block:: sql
+
+ hive > CREATE TABLE student (
+ id int,
+ name string,
+ gender char(1),
+ grade string,
+ phone string
+ ) PARTITIONED BY (country string, city string)
+ ROW FORMAT DELIMITED
+ FIELDS TERMINATED BY '|' ;
+
+You will see table information in Tajo:
+
+.. code-block:: sql
+
+ default> \d student;
+ table name: default.student
+ table uri: hdfs://your_hdfs_namespace/user/hive/warehouse/student
+ store type: TEXT
+ number of rows: 0
+ volume: 0 B
+ Options:
+ 'text.null'='\\N'
+ 'transient_lastDdlTime'='1438756422'
+ 'text.delimiter'='|'
+
+ schema:
+ id INT4
+ name TEXT
+ gender CHAR(1)
+ grade TEXT
+ phone TEXT
+
+ Partitions:
+ type:COLUMN
+ columns::default.student.country (TEXT), default.student.city (TEXT)
+
+
+How to add data to partition table
+--------------------------------------------------------
+
+In Tajo, you can add data dynamically to partition table of Hive with both ``INSERT INTO ... SELECT`` and ``Create Table As Select (CTAS)`` statments. Tajo will automatically filter the data to HiveMetastore, create directories and move filtered data to appropriate directory on the distributed file system.
+
Modified: tajo/site/docs/devel/_sources/sql_language.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/sql_language.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/sql_language.txt (original)
+++ tajo/site/docs/devel/_sources/sql_language.txt Thu Feb 4 00:37:56 2016
@@ -12,4 +12,5 @@ SQL Language
sql_language/queries
sql_language/joins
sql_language/sql_expression
- sql_language/predicates
\ No newline at end of file
+ sql_language/predicates
+ sql_language/explain
\ No newline at end of file
Added: tajo/site/docs/devel/_sources/sql_language/explain.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/sql_language/explain.txt?rev=1728396&view=auto
==============================================================================
--- tajo/site/docs/devel/_sources/sql_language/explain.txt (added)
+++ tajo/site/docs/devel/_sources/sql_language/explain.txt Thu Feb 4 00:37:56 2016
@@ -0,0 +1,93 @@
+************************
+EXPLAIN
+************************
+
+*Synopsis*
+
+.. code-block:: sql
+
+ EXPLAIN [GLOBAL] statement
+
+
+*Description*
+
+Show the logical or global execution plan of a statement.
+
+
+*Examples*
+
+Logical plan:
+
+.. code-block:: sql
+
+ default> EXPLAIN SELECT l_orderkey, count(*) FROM lineitem GROUP BY l_orderkey;
+ explain
+ -------------------------------
+ GROUP_BY(1)(l_orderkey)
+ => exprs: (count())
+ => target list: default.lineitem.l_orderkey (INT8), ?count (INT8)
+ => out schema:{(2) default.lineitem.l_orderkey (INT8), ?count (INT8)}
+ => in schema:{(1) default.lineitem.l_orderkey (INT8)}
+ SCAN(0) on default.lineitem
+ => target list: default.lineitem.l_orderkey (INT8)
+ => out schema: {(1) default.lineitem.l_orderkey (INT8)}
+ => in schema: {(16) default.lineitem.l_orderkey (INT8), default.lineitem.l_partkey (INT8), default.lineitem.l_suppkey (INT8), default.lineitem.l_linenumber (INT8), default.lineitem.l_quantity (FLOAT8), default.lineitem.l_extendedprice (FLOAT8), default.lineitem.l_discount (FLOAT8), default.lineitem.l_tax (FLOAT8), default.lineitem.l_returnflag (TEXT), default.lineitem.l_linestatus (TEXT), default.lineitem.l_shipdate (DATE), default.lineitem.l_commitdate (DATE), default.lineitem.l_receiptdate (DATE), default.lineitem.l_shipinstruct (TEXT), default.lineitem.l_shipmode (TEXT), default.lineitem.l_comment (TEXT)}
+
+
+Global plan:
+
+.. code-block:: sql
+
+ default> EXPLAIN GLOBAL SELECT l_orderkey, count(*) FROM lineitem GROUP BY l_orderkey;
+ explain
+ -------------------------------
+ -------------------------------------------------------------------------------
+ Execution Block Graph (TERMINAL - eb_0000000000000_0000_000003)
+ -------------------------------------------------------------------------------
+ |-eb_0000000000000_0000_000003
+ |-eb_0000000000000_0000_000002
+ |-eb_0000000000000_0000_000001
+ -------------------------------------------------------------------------------
+ Order of Execution
+ -------------------------------------------------------------------------------
+ 1: eb_0000000000000_0000_000001
+ 2: eb_0000000000000_0000_000002
+ 3: eb_0000000000000_0000_000003
+ -------------------------------------------------------------------------------
+
+ =======================================================
+ Block Id: eb_0000000000000_0000_000001 [LEAF]
+ =======================================================
+
+ [Outgoing]
+ [q_0000000000000_0000] 1 => 2 (type=HASH_SHUFFLE, key=default.lineitem.l_orderkey (INT8), num=32)
+
+ GROUP_BY(5)(l_orderkey)
+ => exprs: (count())
+ => target list: default.lineitem.l_orderkey (INT8), ?count_1 (INT8)
+ => out schema:{(2) default.lineitem.l_orderkey (INT8), ?count_1 (INT8)}
+ => in schema:{(1) default.lineitem.l_orderkey (INT8)}
+ SCAN(0) on default.lineitem
+ => target list: default.lineitem.l_orderkey (INT8)
+ => out schema: {(1) default.lineitem.l_orderkey (INT8)}
+ => in schema: {(16) default.lineitem.l_orderkey (INT8), default.lineitem.l_partkey (INT8), default.lineitem.l_suppkey (INT8), default.lineitem.l_linenumber (INT8), default.lineitem.l_quantity (FLOAT8), default.lineitem.l_extendedprice (FLOAT8), default.lineitem.l_discount (FLOAT8), default.lineitem.l_tax (FLOAT8), default.lineitem.l_returnflag (TEXT), default.lineitem.l_linestatus (TEXT), default.lineitem.l_shipdate (DATE), default.lineitem.l_commitdate (DATE), default.lineitem.l_receiptdate (DATE), default.lineitem.l_shipinstruct (TEXT), default.lineitem.l_shipmode (TEXT), default.lineitem.l_comment (TEXT)}
+
+ =======================================================
+ Block Id: eb_0000000000000_0000_000002 [ROOT]
+ =======================================================
+
+ [Incoming]
+ [q_0000000000000_0000] 1 => 2 (type=HASH_SHUFFLE, key=default.lineitem.l_orderkey (INT8), num=32)
+
+ GROUP_BY(1)(l_orderkey)
+ => exprs: (count(?count_1 (INT8)))
+ => target list: default.lineitem.l_orderkey (INT8), ?count (INT8)
+ => out schema:{(2) default.lineitem.l_orderkey (INT8), ?count (INT8)}
+ => in schema:{(2) default.lineitem.l_orderkey (INT8), ?count_1 (INT8)}
+ SCAN(6) on eb_0000000000000_0000_000001
+ => out schema: {(2) default.lineitem.l_orderkey (INT8), ?count_1 (INT8)}
+ => in schema: {(2) default.lineitem.l_orderkey (INT8), ?count_1 (INT8)}
+
+ =======================================================
+ Block Id: eb_0000000000000_0000_000003 [TERMINAL]
+ =======================================================
\ No newline at end of file
Modified: tajo/site/docs/devel/_sources/sql_language/joins.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/sql_language/joins.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/sql_language/joins.txt (original)
+++ tajo/site/docs/devel/_sources/sql_language/joins.txt Thu Feb 4 00:37:56 2016
@@ -155,6 +155,6 @@ Thus, they can perform join without expe
Tajo provides a session variable for broadcast join configuration. (For more detailed information of session variables, please refer to :doc:`/tsql/variables`.)
-* ``DIST_QUERY_BROADCAST_JOIN_THRESHOLD`` is a threshold for broadcast join. Only the relations who are larger than this value can be broadcasted.
+* ``BROADCAST_NON_CROSS_JOIN_THRESHOLD`` and ``BROADCAST_CROSS_JOIN_THRESHOLD`` are thresholds for broadcast join. Only the relations who are larger than this threshold can be broadcasted.
-You can also apply this configuration system widely by setting ``tajo.dist-query.join.broadcast.threshold-bytes`` in ``${TAJO_HOME}/conf/tajo-site.xml``.
\ No newline at end of file
+You can also apply this configuration system widely by setting ``tajo.dist-query.broadcast.non-cross-join.threshold-kb`` or ``tajo.dist-query.broadcast.cross-join.threshold-kb`` in ``${TAJO_HOME}/conf/tajo-site.xml``.
\ No newline at end of file
Modified: tajo/site/docs/devel/_sources/sql_language/predicates.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/sql_language/predicates.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/sql_language/predicates.txt (original)
+++ tajo/site/docs/devel/_sources/sql_language/predicates.txt Thu Feb 4 00:37:56 2016
@@ -1,19 +1,19 @@
-*****************
+***********
Predicates
-*****************
+***********
-=====================
+=============
IN Predicate
-=====================
+=============
-IN predicate provides row and array comparison.
+IN predicate provides a comparison of row, array, and result of a subquery.
*Synopsis*
.. code-block:: sql
- column_reference IN (val1, val2, ..., valN)
- column_reference NOT IN (val1, val2, ..., valN)
+ column_reference (NOT) IN (val1, val2, ..., valN)
+ column_reference (NOT) IN (SELECT ... FROM ...) AS alias_name
Examples are as follows:
@@ -26,7 +26,7 @@ Examples are as follows:
-- this statement filters lists down all the records where col1 value is neither 1, 2 nor 3:
SELECT col1, col2 FROM table1 WHERE col1 NOT IN (1, 2, 3);
-You can use 'IN clause' on text data domain as follows:
+You can use `IN clause` on text data domain as follows:
.. code-block:: sql
@@ -34,6 +34,25 @@ You can use 'IN clause' on text data dom
SELECT col1, col2 FROM table1 WHERE col2 NOT IN ('tajo', 'hadoop');
+Finally, you can use subqueries in the `IN clause`.
+
+.. code-block:: sql
+
+ SELECT col1, col2
+ FROM table1
+ WHERE col3 IN (
+ SELECT avg(col2) as avg_col2
+ FROM table2
+ GROUP BY col1
+ HAVING avg_col2 > 100);
+
+ SELECT col1, col2
+ FROM table1
+ WHERE col3 NOT IN (
+ SELECT avg(col2) as avg_col2
+ FROM table2
+ GROUP BY col1
+ HAVING avg_col2 > 100);
==================================
String Pattern Matching Predicates
Modified: tajo/site/docs/devel/_sources/sql_language/queries.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/sql_language/queries.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/sql_language/queries.txt (original)
+++ tajo/site/docs/devel/_sources/sql_language/queries.txt Thu Feb 4 00:37:56 2016
@@ -1,10 +1,10 @@
-**************************
+*******
Queries
-**************************
+*******
-=====================
+========
Overview
-=====================
+========
*Synopsis*
@@ -19,9 +19,9 @@ Overview
-=====================
+===========
From Clause
-=====================
+===========
*Synopsis*
@@ -120,18 +120,20 @@ both join tables. These common columns a
**Subqueries**
-Subqueries allow users to specify a derived table. It requires enclosing a SQL statement in parentheses and an alias name.
-For example:
+A subquery is a query that is nested inside another query. It can be embedded in the FROM and WHERE clauses.
+
+Example:
.. code-block:: sql
- FROM (SELECT * FROM table1) AS alias_name
+ FROM (SELECT col1, sum(col2) FROM table1 WHERE col3 > 0 group by col1 order by col1) AS alias_name
+ WHERE col1 IN (SELECT col1 FROM table1 WHERE col2 > 0 AND col2 < 100) AS alias_name
For more detailed information, please refer to :doc:`joins`.
-=====================
+============
Where Clause
-=====================
+============
The syntax of the WHERE Clause is
@@ -181,9 +183,9 @@ Aggregation functions can be used with `
SELECT l_partkey, COUNT(distinct l_quantity), SUM(distinct l_extendedprice) AS total FROM lineitem GROUP BY l_partkey;
-==========================
+=========================
Orderby and Limit Clauses
-==========================
+=========================
*Synopsis*
@@ -199,9 +201,9 @@ Orderby and Limit Clauses
before or after non-null values in the sort ordering. By default, null values are dealt as if larger than any non-null value;
that is, ``NULLS FIRST`` is the default for ``DESC`` order, and ``NULLS LAST`` otherwise.
-==========================
+================
Window Functions
-==========================
+================
A window function performs a calculation across multiple table rows that belong to some window frame.
Modified: tajo/site/docs/devel/_sources/table_management/compression.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/compression.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/compression.txt (original)
+++ tajo/site/docs/devel/_sources/table_management/compression.txt Thu Feb 4 00:37:56 2016
@@ -3,8 +3,7 @@ Compression
***********
Using compression can make data size compact, thereby enabling efficient use of network bandwidth and storage. Most of Tajo data formats support data compression feature.
-Currently, compression configuration affects only for stored data format and it is specified when a table is created as table meta information(See `Create Table <../sql_language/ddl.html#create-table>`_).
-Compression for intermidate data or others is not supported now.
+Currently, compression configuration affects only for stored data format and it is enabled when a table is created with the proper table property(See `Create Table <../sql_language/ddl.html#create-table>`_).
===========================================
Compression Properties for each Data Format
Added: tajo/site/docs/devel/_sources/table_management/data_formats.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/data_formats.txt?rev=1728396&view=auto
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/data_formats.txt (added)
+++ tajo/site/docs/devel/_sources/table_management/data_formats.txt Thu Feb 4 00:37:56 2016
@@ -0,0 +1,15 @@
+************
+Data Formats
+************
+
+Currently, Tajo provides following data formats:
+
+.. toctree::
+ :maxdepth: 1
+
+ text
+ json
+ rcfile
+ parquet
+ orc
+ sequencefile
\ No newline at end of file
Modified: tajo/site/docs/devel/_sources/table_management/orc.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/orc.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/orc.txt (original)
+++ tajo/site/docs/devel/_sources/table_management/orc.txt Thu Feb 4 00:37:56 2016
@@ -34,6 +34,7 @@ The ``WITH`` clause in the CREATE TABLE
Now, ORC file provides the following physical properties.
* ``orc.max.merge.distance``: When ORC file is read, if stripes are too closer and the distance is lower than this value, they are merged and read at once. Default is 1MB.
+* ``orc.max.read.buffer``: When ORC file is read, it defines maximum read buffer size. That is, it can be maximum size of a single read. Default is 8MB.
* ``orc.stripe.size``: It decides size of each stripe. Default is 64MB.
* ``orc.compression.kind``: It means the compression algorithm used to compress and write data. It should be one of ``none``, ``snappy``, ``zlib``. Default is ``none``.
* ``orc.buffer.size``: It decides size of writing buffer. Default is 256KB.
Modified: tajo/site/docs/devel/_sources/table_management/tablespaces.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/tablespaces.txt?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/tablespaces.txt (original)
+++ tajo/site/docs/devel/_sources/table_management/tablespaces.txt Thu Feb 4 00:37:56 2016
@@ -26,9 +26,11 @@ If the tablespace is not specified, the
Configuration
=============
-By default, Tajo use in ``${tajo.rootdir}/warehouse`` in ``conf/tajo-site.xml`` as a default tablespace. It also allows users to register additional tablespaces.
+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.
+---------------------------
+conf/storage-site.json file
+---------------------------
The configuration file has the following struct:
@@ -36,8 +38,8 @@ The configuration file has the following
{
"spaces": {
- "${table_space_name}": {
- "uri": "hbase://quorum1:port,quorum2:port/"
+ "${tablespace_name}": {
+ "uri": "hbase:zk://quorum1:port,quorum2:port/"
}
}
}
@@ -48,8 +50,8 @@ The following is an example for two tabl
{
"spaces": {
- "hbase-cluster1": {
- "uri": "hbase://quorum1:port,quorum2:port/"
+ "hbase_cluster1": {
+ "uri": "hbase:zk://quorum1:port,quorum2:port/"
},
"ssd": {
@@ -58,6 +60,8 @@ The following is an example for two tabl
}
}
+For more details, see :doc:`conf/storage-site.json</configuration/storage-site-json>`.
+
.. note::
Modified: tajo/site/docs/devel/_static/basic.css
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/basic.css?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/basic.css (original)
+++ tajo/site/docs/devel/_static/basic.css Thu Feb 4 00:37:56 2016
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Modified: tajo/site/docs/devel/_static/doctools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/doctools.js?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/doctools.js (original)
+++ tajo/site/docs/devel/_static/doctools.js Thu Feb 4 00:37:56 2016
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Modified: tajo/site/docs/devel/_static/pygments.css
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/pygments.css?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/pygments.css (original)
+++ tajo/site/docs/devel/_static/pygments.css Thu Feb 4 00:37:56 2016
@@ -9,8 +9,10 @@
.highlight .o { color: #ce5c00; font-weight: bold } /* Operator */
.highlight .x { color: #000000 } /* Other */
.highlight .p { color: #000000; font-weight: bold } /* Punctuation */
+.highlight .ch { color: #8f5902; font-style: italic } /* Comment.Hashbang */
.highlight .cm { color: #8f5902; font-style: italic } /* Comment.Multiline */
.highlight .cp { color: #8f5902; font-style: italic } /* Comment.Preproc */
+.highlight .cpf { color: #8f5902; font-style: italic } /* Comment.PreprocFile */
.highlight .c1 { color: #8f5902; font-style: italic } /* Comment.Single */
.highlight .cs { color: #8f5902; font-style: italic } /* Comment.Special */
.highlight .gd { color: #a40000 } /* Generic.Deleted */
Modified: tajo/site/docs/devel/_static/searchtools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/searchtools.js?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/searchtools.js (original)
+++ tajo/site/docs/devel/_static/searchtools.js Thu Feb 4 00:37:56 2016
@@ -4,12 +4,13 @@
*
* Sphinx JavaScript utilties for the full-text search.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
+/* Non-minified version JS is _stemmer.js if file is provided */
/**
* Porter Stemmer
*/
@@ -373,8 +374,7 @@ var Search = {
}
// lookup as search terms in fulltext
- results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
- .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
+ results = results.concat(this.performTermsSearch(searchterms, excluded, terms, titleterms));
// let the scorer override scores with a custom scoring function
if (Scorer.score) {
@@ -538,23 +538,47 @@ var Search = {
/**
* search for full-text terms in the index
*/
- performTermsSearch : function(searchterms, excluded, terms, score) {
+ performTermsSearch : function(searchterms, excluded, terms, titleterms) {
var filenames = this._index.filenames;
var titles = this._index.titles;
- var i, j, file, files;
+ var i, j, file;
var fileMap = {};
+ var scoreMap = {};
var results = [];
// perform the search on the required terms
for (i = 0; i < searchterms.length; i++) {
var word = searchterms[i];
+ var files = [];
+ var _o = [
+ {files: terms[word], score: Scorer.term},
+ {files: titleterms[word], score: Scorer.title}
+ ];
+
// no match but word was a required one
- if ((files = terms[word]) === undefined)
+ if ($u.every(_o, function(o){return o.files === undefined;})) {
break;
- if (files.length === undefined) {
- files = [files];
}
+ // found search word in contents
+ $u.each(_o, function(o) {
+ var _files = o.files;
+ if (_files === undefined)
+ return
+
+ if (_files.length === undefined)
+ _files = [_files];
+ files = files.concat(_files);
+
+ // set score for the word in each file to Scorer.term
+ for (j = 0; j < _files.length; j++) {
+ file = _files[j];
+ if (!(file in scoreMap))
+ scoreMap[file] = {}
+ scoreMap[file][word] = o.score;
+ }
+ });
+
// create the mapping
for (j = 0; j < files.length; j++) {
file = files[j];
@@ -576,7 +600,9 @@ var Search = {
// ensure that none of the excluded terms is in the search result
for (i = 0; i < excluded.length; i++) {
if (terms[excluded[i]] == file ||
- $u.contains(terms[excluded[i]] || [], file)) {
+ titleterms[excluded[i]] == file ||
+ $u.contains(terms[excluded[i]] || [], file) ||
+ $u.contains(titleterms[excluded[i]] || [], file)) {
valid = false;
break;
}
@@ -584,6 +610,9 @@ var Search = {
// if we have still a valid result we can add it to the result list
if (valid) {
+ // select one (max) score for the file.
+ // for better ranking, we should calculate ranking by using words statistics like basic tf-idf...
+ var score = $u.max($u.map(fileMap[file], function(w){return scoreMap[file][w]}));
results.push([filenames[file], titles[file], '', null, score]);
}
}
Modified: tajo/site/docs/devel/_static/websupport.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/websupport.js?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/websupport.js (original)
+++ tajo/site/docs/devel/_static/websupport.js Thu Feb 4 00:37:56 2016
@@ -4,7 +4,7 @@
*
* sphinx.websupport utilties for all documentation.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
Modified: tajo/site/docs/devel/backup_and_restore.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/backup_and_restore.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/backup_and_restore.html (original)
+++ tajo/site/docs/devel/backup_and_restore.html Thu Feb 4 00:37:56 2016
@@ -77,6 +77,7 @@
<li class="toctree-l2"><a class="reference internal" href="configuration/service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -99,6 +100,7 @@
<li class="toctree-l2"><a class="reference internal" href="sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="time_zone.html">Time Zone</a><ul>
@@ -231,7 +233,7 @@
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/backup_and_restore/catalog.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/backup_and_restore/catalog.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/backup_and_restore/catalog.html (original)
+++ tajo/site/docs/devel/backup_and_restore/catalog.html Thu Feb 4 00:37:56 2016
@@ -78,6 +78,7 @@
<li class="toctree-l2"><a class="reference internal" href="../configuration/service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../configuration/storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -270,7 +272,7 @@ CREATE EXTERNAL TABLE customer (c_custke
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration.html (original)
+++ tajo/site/docs/devel/configuration.html Thu Feb 4 00:37:56 2016
@@ -77,6 +77,7 @@
<li class="toctree-l2"><a class="reference internal" href="configuration/service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -99,6 +100,7 @@
<li class="toctree-l2"><a class="reference internal" href="sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="time_zone.html">Time Zone</a><ul>
@@ -217,6 +219,7 @@
<li class="toctree-l1"><a class="reference internal" href="configuration/service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l1"><a class="reference internal" href="configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l1"><a class="reference internal" href="configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/storage-site-json.html">The storage-site.json File</a></li>
</ul>
</div>
</div>
@@ -239,7 +242,7 @@
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration/catalog-site-xml.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/catalog-site-xml.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/catalog-site-xml.html (original)
+++ tajo/site/docs/devel/configuration/catalog-site-xml.html Thu Feb 4 00:37:56 2016
@@ -30,7 +30,7 @@
<link rel="top" title="Apache Tajo 0.11.0 documentation" href="../index.html"/>
<link rel="up" title="Configuration" href="../configuration.html"/>
- <link rel="next" title="Tajo Shell (TSQL)" href="../tsql.html"/>
+ <link rel="next" title="The storage-site.json File" href="storage-site-json.html"/>
<link rel="prev" title="The tajo-site.xml File" href="tajo-site-xml.html"/>
@@ -78,6 +78,7 @@
<li class="toctree-l2"><a class="reference internal" href="service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2 current"><a class="current reference internal" href="">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -217,7 +219,7 @@
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
- <a href="../tsql.html" class="btn btn-neutral float-right" title="Tajo Shell (TSQL)"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+ <a href="storage-site-json.html" class="btn btn-neutral float-right" title="The storage-site.json File"/>Next <span class="fa fa-arrow-circle-right"></span></a>
<a href="tajo-site-xml.html" class="btn btn-neutral" title="The tajo-site.xml File"><span class="fa fa-arrow-circle-left"></span> Previous</a>
@@ -229,7 +231,7 @@
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration/catalog_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/catalog_configuration.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/catalog_configuration.html (original)
+++ tajo/site/docs/devel/configuration/catalog_configuration.html Thu Feb 4 00:37:56 2016
@@ -78,6 +78,7 @@
<li class="toctree-l2"><a class="reference internal" href="service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -288,16 +290,16 @@ Query OK, <span class="m">0</span> rows
</div>
<p>Second, you must install the proper JDBC driver on the TajoMaster node. And then, you need to set the <code class="docutils literal"><span class="pre">TAJO_CLASSPATH</span></code> variable in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> as follows:</p>
<div class="highlight-sh"><div class="highlight"><pre><span class="o">(</span>MySQL<span class="o">)</span>
-<span class="nv">$ </span><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/local/mysql/lib/mysql-connector-java-x.x.x.jar
+$ <span class="nb">export</span> <span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/local/mysql/lib/mysql-connector-java-x.x.x.jar
<span class="o">(</span>MariaDB<span class="o">)</span>
-<span class="nv">$ </span><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/local/mariadb/lib/mariadb-java-client-x.x.x.jar
+$ <span class="nb">export</span> <span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/local/mariadb/lib/mariadb-java-client-x.x.x.jar
<span class="o">(</span>PostgreSQL<span class="o">)</span>
-<span class="nv">$ </span><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/share/java/postgresql-jdbc4.jar
+$ <span class="nb">export</span> <span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/share/java/postgresql-jdbc4.jar
<span class="o">(</span>Oracle<span class="o">)</span>
-<span class="nv">$ </span><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/path/to/oracle/driver/ojdbc7.jar
+$ <span class="nb">export</span> <span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/path/to/oracle/driver/ojdbc7.jar
</pre></div>
</div>
<p>Alternatively, you can copy the jdbc driver into <code class="docutils literal"><span class="pre">$TAJO_HOME/lib</span></code>.</p>
@@ -357,17 +359,17 @@ Query OK, <span class="m">0</span> rows
<h2>HiveCatalogStore Configuration<a class="headerlink" href="#hivecatalogstore-configuration" title="Permalink to this headline">¶</a></h2>
<p>Tajo support HiveCatalogStore to integrate with hive. If you want to use HiveCatalogStore, you just do as follows.</p>
<p>First, you must compile source code and get a binary archive as follows:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span class="nv">$ </span>git clone https://git-wip-us.apache.org/repos/asf/tajo.git tajo
-<span class="nv">$ </span>mvn clean install -DskipTests -Pdist -Dtar
-<span class="nv">$ </span>ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
+<div class="highlight-sh"><div class="highlight"><pre>$ git clone https://git-wip-us.apache.org/repos/asf/tajo.git tajo
+$ mvn clean install -DskipTests -Pdist -Dtar
+$ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
</pre></div>
</div>
<p>Second, you must set your hive home directory to HIVE_HOME variable in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> with it as follows:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span class="nb">export </span><span class="nv">HIVE_HOME</span><span class="o">=</span>/path/to/your/hive/directory
+<div class="highlight-sh"><div class="highlight"><pre><span class="nb">export</span> <span class="nv">HIVE_HOME</span><span class="o">=</span>/path/to/your/hive/directory
</pre></div>
</div>
<p>Third, if you need to use jdbc to connect HiveMetaStore, you have to prepare mysql jdbc driver on host which can be ran TajoMaster. If you prepare it, you should set jdbc driver file path to <code class="docutils literal"><span class="pre">HIVE_JDBC_DRIVER_DIR</span></code> variable in conf/tajo-env.sh with it as follows:</p>
-<div class="highlight-sh"><div class="highlight"><pre><span class="nb">export </span><span class="nv">HIVE_JDBC_DRIVER_DIR</span><span class="o">=</span>/path/to/your/mysql_jdbc_driver/mysql-connector-java-x.x.x-bin.jar
+<div class="highlight-sh"><div class="highlight"><pre><span class="nb">export</span> <span class="nv">HIVE_JDBC_DRIVER_DIR</span><span class="o">=</span>/path/to/your/mysql_jdbc_driver/mysql-connector-java-x.x.x-bin.jar
</pre></div>
</div>
<p>Lastly, you should add the following config to <code class="docutils literal"><span class="pre">conf/catalog-site.xml</span></code> :</p>
@@ -398,7 +400,7 @@ Query OK, <span class="m">0</span> rows
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration/cluster_setup.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/cluster_setup.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/cluster_setup.html (original)
+++ tajo/site/docs/devel/configuration/cluster_setup.html Thu Feb 4 00:37:56 2016
@@ -78,6 +78,7 @@
<li class="toctree-l2"><a class="reference internal" href="service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -304,7 +306,7 @@ $ $HADOOP_HOME/bin/hadoop fs -chmod g+w
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration/ha_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/ha_configuration.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/ha_configuration.html (original)
+++ tajo/site/docs/devel/configuration/ha_configuration.html Thu Feb 4 00:37:56 2016
@@ -78,6 +78,7 @@
<li class="toctree-l2"><a class="reference internal" href="service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -352,7 +354,7 @@ host2.domain.com
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration/preliminary.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/preliminary.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/preliminary.html (original)
+++ tajo/site/docs/devel/configuration/preliminary.html Thu Feb 4 00:37:56 2016
@@ -78,6 +78,7 @@
<li class="toctree-l2"><a class="reference internal" href="service_config_defaults.html">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -257,7 +259,7 @@
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>
Modified: tajo/site/docs/devel/configuration/service_config_defaults.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/service_config_defaults.html?rev=1728396&r1=1728395&r2=1728396&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/service_config_defaults.html (original)
+++ tajo/site/docs/devel/configuration/service_config_defaults.html Thu Feb 4 00:37:56 2016
@@ -78,6 +78,7 @@
<li class="toctree-l2 current"><a class="current reference internal" href="">Cluster Service Configuration Defaults</a></li>
<li class="toctree-l2"><a class="reference internal" href="tajo-site-xml.html">The tajo-site.xml File</a></li>
<li class="toctree-l2"><a class="reference internal" href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage-site-json.html">The storage-site.json File</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
<li class="toctree-l2"><a class="reference internal" href="../sql_language/joins.html">Joins</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/sql_expression.html">SQL Expressions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/explain.html">EXPLAIN</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
@@ -309,7 +311,7 @@
<div role="contentinfo">
<p>
- © Copyright 2014, Apache Tajo Team.
+ © Copyright 2015, Apache Tajo Team.
</p>
</div>