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 2015/01/08 18:19:29 UTC

svn commit: r1650337 [1/6] - in /tajo/site/docs/current: ./ _sources/ _sources/backup_and_restore/ _sources/configuration/ _sources/getting_started/ _sources/sql_language/ _sources/table_management/ _sources/tsql/ backup_and_restore/ configuration/ fun...

Author: jihoonson
Date: Thu Jan  8 17:19:28 2015
New Revision: 1650337

URL: http://svn.apache.org/r1650337
Log:
Restore the 'current' documents

Modified:
    tajo/site/docs/current/_sources/backup_and_restore/catalog.txt
    tajo/site/docs/current/_sources/configuration.txt
    tajo/site/docs/current/_sources/configuration/catalog_configuration.txt
    tajo/site/docs/current/_sources/configuration/cluster_setup.txt
    tajo/site/docs/current/_sources/getting_started.txt
    tajo/site/docs/current/_sources/getting_started/first_query.txt
    tajo/site/docs/current/_sources/getting_started/prerequisites.txt
    tajo/site/docs/current/_sources/hcatalog_integration.txt
    tajo/site/docs/current/_sources/index.txt
    tajo/site/docs/current/_sources/jdbc_driver.txt
    tajo/site/docs/current/_sources/sql_language/ddl.txt
    tajo/site/docs/current/_sources/table_management.txt
    tajo/site/docs/current/_sources/table_management/csv.txt
    tajo/site/docs/current/_sources/tsql/meta_command.txt
    tajo/site/docs/current/_sources/tsql/variables.txt
    tajo/site/docs/current/backup_and_restore.html
    tajo/site/docs/current/backup_and_restore/catalog.html
    tajo/site/docs/current/configuration.html
    tajo/site/docs/current/configuration/catalog_configuration.html
    tajo/site/docs/current/configuration/cluster_setup.html
    tajo/site/docs/current/configuration/ha_configuration.html
    tajo/site/docs/current/configuration/preliminary.html
    tajo/site/docs/current/configuration/tajo_master_configuration.html
    tajo/site/docs/current/configuration/worker_configuration.html
    tajo/site/docs/current/faq.html
    tajo/site/docs/current/functions.html
    tajo/site/docs/current/functions/datetime_func_and_operators.html
    tajo/site/docs/current/functions/math_func_and_operators.html
    tajo/site/docs/current/functions/network_func_and_operators.html
    tajo/site/docs/current/functions/string_func_and_operators.html
    tajo/site/docs/current/genindex.html
    tajo/site/docs/current/getting_started.html
    tajo/site/docs/current/getting_started/building.html
    tajo/site/docs/current/getting_started/downloading_source.html
    tajo/site/docs/current/getting_started/first_query.html
    tajo/site/docs/current/getting_started/local_setup.html
    tajo/site/docs/current/getting_started/prerequisites.html
    tajo/site/docs/current/hcatalog_integration.html
    tajo/site/docs/current/index.html
    tajo/site/docs/current/introduction.html
    tajo/site/docs/current/jdbc_driver.html
    tajo/site/docs/current/partitioning/column_partitioning.html
    tajo/site/docs/current/partitioning/hash_partitioning.html
    tajo/site/docs/current/partitioning/intro_to_partitioning.html
    tajo/site/docs/current/partitioning/range_partitioning.html
    tajo/site/docs/current/search.html
    tajo/site/docs/current/searchindex.js
    tajo/site/docs/current/sql_language.html
    tajo/site/docs/current/sql_language/data_model.html
    tajo/site/docs/current/sql_language/ddl.html
    tajo/site/docs/current/sql_language/insert.html
    tajo/site/docs/current/sql_language/predicates.html
    tajo/site/docs/current/sql_language/queries.html
    tajo/site/docs/current/sql_language/sql_expression.html
    tajo/site/docs/current/table_management.html
    tajo/site/docs/current/table_management/compression.html
    tajo/site/docs/current/table_management/csv.html
    tajo/site/docs/current/table_management/file_formats.html
    tajo/site/docs/current/table_management/parquet.html
    tajo/site/docs/current/table_management/rcfile.html
    tajo/site/docs/current/table_management/sequencefile.html
    tajo/site/docs/current/table_partitioning.html
    tajo/site/docs/current/tajo_client_api.html
    tajo/site/docs/current/tsql.html
    tajo/site/docs/current/tsql/admin_command.html
    tajo/site/docs/current/tsql/background_command.html
    tajo/site/docs/current/tsql/dfs_command.html
    tajo/site/docs/current/tsql/execute_file.html
    tajo/site/docs/current/tsql/intro.html
    tajo/site/docs/current/tsql/meta_command.html
    tajo/site/docs/current/tsql/single_command.html
    tajo/site/docs/current/tsql/variables.html

Modified: tajo/site/docs/current/_sources/backup_and_restore/catalog.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/backup_and_restore/catalog.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/backup_and_restore/catalog.txt (original)
+++ tajo/site/docs/current/_sources/backup_and_restore/catalog.txt Thu Jan  8 17:19:28 2015
@@ -11,7 +11,7 @@ Now, Tajo supports a two backup methods
 SQL dump 
 ==========
 
-SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatibilities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is: ::
+SQL dump is an easy and strong way. If you use this approach, you don't need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is: ::
 
   $ tajo-dump table_name > outfile
 

Modified: tajo/site/docs/current/_sources/configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/configuration.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration.txt (original)
+++ tajo/site/docs/current/_sources/configuration.txt Thu Jan  8 17:19:28 2015
@@ -10,7 +10,5 @@ Configuration
     configuration/tajo_master_configuration
     configuration/worker_configuration
     configuration/catalog_configuration
+    configuration/configuration_defaults
     configuration/ha_configuration
-    configuration/service_config_defaults
-    configuration/tajo-site-xml
-    configuration/catalog-site-xml
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/configuration/catalog_configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/configuration/catalog_configuration.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration/catalog_configuration.txt (original)
+++ tajo/site/docs/current/_sources/configuration/catalog_configuration.txt Thu Jan  8 17:19:28 2015
@@ -56,13 +56,11 @@ Since Derby is a file-based embedded dat
 
   By default, *Catalog server* stores catalog data into ``/tmp/tajo-catalog-${username}`` directory. But, some operating systems may remove all contents in ``/tmp`` when booting up. In order to ensure persistent store of your catalog data, you need to set a proper location of derby directory.
 
-==================================================
-MySQL/MariaDB/PostgreSQL/Oracle Configuration
-==================================================
-
-Tajo supports several database systems, including MySQL, MariaDB, PostgreSQL, and Oracle, as its catalog store.
-In order to use these systems, you first need to create a database and a user for Tajo.
-The following example shows the creation of a user and a database with MySQL.
+=========================
+MySQLStore Configuration
+=========================
+
+In order to use MySQLStore, you need to create database and user on MySQL for Tajo.
 
 .. code-block:: sh
   
@@ -76,48 +74,48 @@ The following example shows the creation
   Query OK, 0 rows affected (0.01 sec)
 
 
-Second, you must install the proper JDBC driver on the TajoMaster node. And then, you need to set the ``TAJO_CLASSPATH`` variable in ``conf/tajo-env.sh`` as follows:
+And then, you need to prepare MySQL JDBC driver on the machine which can be ran TajoMaster. If you do, you should set ``TAJO_CLASSPATH`` variable in ``conf/tajo-env.sh`` with it as follows:
 
 .. code-block:: sh
 
-  (MySQL)
-  $ export TAJO_CLASSPATH=/usr/local/mysql/lib/mysql-connector-java-x.x.x.jar
-
-  (MariaDB)
-  $ export TAJO_CLASSPATH=/usr/local/mariadb/lib/mariadb-java-client-x.x.x.jar
-
-  (PostgreSQL)
-  $ export TAJO_CLASSPATH=/usr/share/java/postgresql-jdbc4.jar
+  export TAJO_CLASSPATH=/usr/local/mysql/lib/mysql-connector-java-x.x.x.jar
 
-  (Oracle)
-  $ export TAJO_CLASSPATH=/path/to/oracle/driver/ojdbc7.jar
+Or you just can copy jdbc driver into ``$TAJO_HOME/lib``.
 
-Alternatively, you can copy the jdbc driver into ``$TAJO_HOME/lib``.
-
-Finally, you must add the following configurations to `conf/catalog-site.xml` :
+Finally, you should add the following config to `conf/catalog-site.xml` :
 
 .. code-block:: xml
 
   <property>
-    <name>tajo.catalog.jdbc.connection.id</name>
-    <value><user name></value>
+    <name>tajo.catalog.store.class</name>
+    <value>org.apache.tajo.catalog.store.MySQLStore</value>
   </property>
   <property>
-    <name>tajo.catalog.jdbc.connection.password</name>
-    <value><user password></value>
+    <name>tajo.catalog.jdbc.connection.id</name>
+    <value><mysql user name></value>
   </property>
-
-  <!-- MySQL -->
   <property>
-    <name>tajo.catalog.store.class</name>
-    <value>org.apache.tajo.catalog.store.MySQLStore</value>
+    <name>tajo.catalog.jdbc.connection.password</name>
+    <value><mysql user password></value>
   </property>
   <property>
     <name>tajo.catalog.jdbc.uri</name>
     <value>jdbc:mysql://<mysql host name>:<mysql port>/<database name for tajo>?createDatabaseIfNotExist=true</value>
   </property>
 
-  <!-- MariaDB -->
+
+===========================
+MariaDBStore Configuration
+===========================
+
+All configurations for using MariaDBStore is compatible with MySQLStore except following:
+
+.. code-block:: sh
+
+  export TAJO_CLASSPATH=/usr/local/mariadb/lib/mariadb-java-client-x.x.x.jar
+
+.. code-block:: xml
+
   <property>
     <name>tajo.catalog.store.class</name>
     <value>org.apache.tajo.catalog.store.MariaDBStore</value>
@@ -127,29 +125,10 @@ Finally, you must add the following conf
     <value>jdbc:mariadb://<mariadb host name>:<mariadb port>/<database name for tajo>?createDatabaseIfNotExist=true</value>
   </property>
 
-  <!-- PostgreSQL -->
-  <property>
-    <name>tajo.catalog.store.class</name>
-    <value>org.apache.tajo.catalog.store.PostgreSQLStore</value>
-  </property>
-  <property>
-    <name>tajo.catalog.jdbc.uri</name>
-    <value>jdbc:postgresql://<postgresql host name>:<postgresql port>/<database name for tajo>?createDatabaseIfNotExist=true</value>
-  </property>
-
-  <!-- Oracle -->
-  <property>
-    <name>tajo.catalog.store.class</name>
-    <value>org.apache.tajo.catalog.store.OracleStore</value>
-  </property>
-  <property>
-    <name>tajo.catalog.jdbc.uri</name>
-    <value>jdbc:oracle:thin:@//<oracle host name>:<oracle port>/<ServiceName for tajo database></value>
-  </property>
 
-==================================
-HCatalogStore Configuration
-==================================
+----------------------------------
+  HCatalogStore Configuration
+----------------------------------
 
 Tajo support HCatalogStore to integrate with hive. If you want to use HCatalogStore, you just do as follows.
 

Modified: tajo/site/docs/current/_sources/configuration/cluster_setup.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/configuration/cluster_setup.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration/cluster_setup.txt (original)
+++ tajo/site/docs/current/_sources/configuration/cluster_setup.txt Thu Jan  8 17:19:28 2015
@@ -82,5 +82,5 @@ Then, execute ``start-tajo.sh`` ::
 
 .. note::
 
-  In default, TajoMaster listens on 127.0.0.1 for clients. To allow remote clients to access TajoMaster, please set tajo.master.client-rpc.address config to tajo-site.xml. In order to know how to change the listen port, please refer :doc:`/configuration/service_config_defaults`.
+  In default, TajoMaster listens on 127.0.0.1 for clients. To allow remote clients to access TajoMaster, please set tajo.master.client-rpc.address config to tajo-site.xml. In order to know how to change the listen port, please refer :doc:`/configuration/configuration_defaults`.
 

Modified: tajo/site/docs/current/_sources/getting_started.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/getting_started.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/getting_started.txt (original)
+++ tajo/site/docs/current/_sources/getting_started.txt Thu Jan  8 17:19:28 2015
@@ -4,179 +4,11 @@ Getting Started
 
 In this section, we explain setup of a standalone Tajo instance. It will run against the local filesystem. In later sections, we will present how to run Tajo cluster instance on Apache Hadoop's HDFS, a distributed filesystem. This section shows you how to start up a Tajo cluster, create tables in your Tajo cluster, submit SQL queries via Tajo shell, and shutting down your Tajo cluster instance. The below exercise should take no more than ten minutes.
 
-======================
-Prerequisites
-======================
+.. toctree::
+  :maxdepth: 1
 
- * Hadoop 2.3.0 or higher (up to 2.5.1)
- * Java 1.6 or 1.7
- * Protocol buffer 2.5.0
-
-===================================
-Dowload and unpack the source code
-===================================
-
-You can either download the source code release of Tajo or check out the development codebase from Git.
-
------------------------------------
-Download the latest source release
------------------------------------
-
-Choose a download site from this list of `Apache Download Mirrors <http://www.apache.org/dyn/closer.cgi/tajo>`_.
-Click on the suggested mirror link. This will take you to a mirror of Tajo Releases. 
-Download the file that ends in .tar.gz to your local filesystem, e.g. tajo-x.y.z-src.tar.gz.
-
-Decompress and untar your downloaded file and then change into the unpacked directory. ::
-
-  tar xzvf tajo-x.y.z-src.tar.gz
-
------------------------------------
-Check out the source code via Git
------------------------------------
-
-The development codebase can also be downloaded from `the Apache git repository <https://git-wip-us.apache.org/repos/asf/tajo.git>`_ as follows: ::
-
-  git clone https://git-wip-us.apache.org/repos/asf/tajo.git
-
-A read-only git repository is also mirrored on `Github <https://github.com/apache/tajo>`_.
-
-
-=================
-Build source code
-=================
-
-You prepare the prerequisites and the source code, you can build the source code now.
-
-The first step of the installation procedure is to configure the source tree for your system and choose the options you would like. This is done by running the configure script. For a default installation simply enter:
-
-You can compile source code and get a binary archive as follows:
-
-.. code-block:: bash
-
-  $ cd tajo-x.y.z
-  $ mvn clean install -DskipTests -Pdist -Dtar -Dhadoop.version=2.X.X
-  $ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
-
-.. note::
-
-  If you don't specify the hadoop version, tajo cluster may not run correctly. Thus, we highly recommend that you specify your hadoop version with maven build command.
-
-  Example:
-
-    $ mvn clean install -DskipTests -Pdist -Dtar -Dhadoop.version=2.5.1
-
-Then, after you move some proper directory, discompress the tar.gz file as follows:
-
-.. code-block:: bash
-
-  $ cd [a directory to be parent of tajo binary]
-  $ tar xzvf ${TAJO_SRC}/tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
-
-================================
-Setting up a local Tajo cluster
-================================
-
-Apache Tajo™ provides two run modes: local mode and fully distributed mode. Here, we explain only the local mode where a Tajo instance runs on a local file system. A local mode Tajo instance can start up with very simple configurations.
-
-First of all, you need to add the environment variables to conf/tajo-env.sh.
-
-.. code-block:: bash
-
-  # Hadoop home. Required
-  export HADOOP_HOME= ...
-
-  # The java implementation to use.  Required.
-  export JAVA_HOME= ...
-
-To launch the tajo master, execute start-tajo.sh.
-
-.. code-block:: bash
-
-  $ $TAJO_HOME/bin/start-tajo.sh
-
-.. note::
-
-  If you want to how to setup a fully distributed mode of Tajo, please see :doc:`/configuration/cluster_setup`.
-
-.. warning::
-
-  By default, *Catalog server* which manages table meta data uses `Apache Derby <http://db.apache.org/derby/>`_ as a persistent storage, and Derby stores data into ``/tmp/tajo-catalog-${username}`` directory. But, some operating systems may remove all contents in ``/tmp`` when booting up. In order to ensure persistent store of your catalog data, you need to set a proper location of derby directory. To learn Catalog configuration, please refer to :doc:`/configuration/catalog_configuration`.
-
-======================
-First query execution
-======================
-
-First of all, we need to prepare some table for query execution. For example, you can make a simple text-based table as follows: 
-
-.. code-block:: bash
-
-  $ mkdir /home/x/table1
-  $ cd /home/x/table1
-  $ cat > data.csv
-  1|abc|1.1|a
-  2|def|2.3|b
-  3|ghi|3.4|c
-  4|jkl|4.5|d
-  5|mno|5.6|e
-  <CTRL + D>
-
-
-Apache Tajo™ provides a SQL shell which allows users to interactively submit SQL queries. In order to use this shell, please execute ``bin/tsql`` ::
-
-  $ $TAJO_HOME/bin/tsql
-  tajo>
-
-In order to load the table we created above, we should think of a schema of the table.
-Here, we assume the schema as (int, text, float, text). ::
-
-  $ $TAJO_HOME/bin/tsql
-  tajo> create external table table1 (
-        id int,
-        name text, 
-        score float, 
-        type text) 
-        using csv with ('text.delimiter'='|') location 'file:/home/x/table1';
-
-To load an external table, you need to use ‘create external table’ statement. 
-In the location clause, you should use the absolute directory path with an appropriate scheme. 
-If the table resides in HDFS, you should use ‘hdfs’ instead of ‘file’.
-
-If you want to know DDL statements in more detail, please see Query Language. ::
-
-  tajo> \d
-  table1
-
- ``\d`` command shows the list of tables. ::
-
-  tajo> \d table1
-
-  table name: table1
-  table path: file:/home/x/table1
-  store type: CSV
-  number of rows: 0
-  volume (bytes): 78 B
-  schema:
-  id      INT
-  name    TEXT
-  score   FLOAT
-  type    TEXT
-
-``\d [table name]`` command shows the description of a given table.
-
-Also, you can execute SQL queries as follows: ::
-
-  tajo> select * from table1 where id > 2;
-  final state: QUERY_SUCCEEDED, init time: 0.069 sec, response time: 0.397 sec
-  result: file:/tmp/tajo-hadoop/staging/q_1363768615503_0001_000001/RESULT, 3 rows ( 35B)
-
-  id,  name,  score,  type
-  - - - - - - - - - -  - - -
-  3,  ghi,  3.4,  c
-  4,  jkl,  4.5,  d
-  5,  mno,  5.6,  e
-
-  tajo> \q
-  bye
-
-Feel free to enjoy Tajo with SQL standards. 
-If you want to know more explanation for SQL supported by Tajo, please refer :doc:`/sql_language`.
\ No newline at end of file
+  getting_started/prerequisites
+  getting_started/downloading_source
+  getting_started/building
+  getting_started/local_setup
+  getting_started/first_query
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/getting_started/first_query.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/getting_started/first_query.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/getting_started/first_query.txt (original)
+++ tajo/site/docs/current/_sources/getting_started/first_query.txt Thu Jan  8 17:19:28 2015
@@ -31,7 +31,7 @@ Here, we assume the schema as (int, text
         name text, 
         score float, 
         type text) 
-        using csv with ('text.delimiter'='|') location 'file:/home/x/table1';
+        using csv with ('csvfile.delimiter'='|') location 'file:/home/x/table1';
 
 To load an external table, you need to use ‘create external table’ statement. 
 In the location clause, you should use the absolute directory path with an appropriate scheme. 

Modified: tajo/site/docs/current/_sources/getting_started/prerequisites.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/getting_started/prerequisites.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/getting_started/prerequisites.txt (original)
+++ tajo/site/docs/current/_sources/getting_started/prerequisites.txt Thu Jan  8 17:19:28 2015
@@ -2,6 +2,6 @@
 Prerequisites
 **********************
 
- * Hadoop 2.3.0 or higher (up to 2.5.1)
- * Java 1.6 or 1.7
- * Protocol buffer 2.5.0
+ * Hadoop 2.2.0, 2.3.0, or 2.4.0
+ * Java 1.6 or higher
+ * Protocol buffer 2.5.0
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/hcatalog_integration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/hcatalog_integration.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/hcatalog_integration.txt (original)
+++ tajo/site/docs/current/_sources/hcatalog_integration.txt Thu Jan  8 17:19:28 2015
@@ -37,16 +37,3 @@ Finally, you should specify HCatalogStor
     <name>tajo.catalog.store.class</name>
     <value>org.apache.tajo.catalog.store.HCatalogStore</value>
   </property>
-
-.. 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
-  ``ALTER TABLE table_name ADD PARTITION`` commands on each of the newly added partitions or
-  ``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 ::
-
-  $ MSCK REPAIR TABLE [table_name];

Modified: tajo/site/docs/current/_sources/index.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/index.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/index.txt (original)
+++ tajo/site/docs/current/_sources/index.txt Thu Jan  8 17:19:28 2015
@@ -15,14 +15,9 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Apache Tajo™ (dev) - User documentation
+Apache Tajo™ 0.9.0 Release Documentation
 ===========================================================================
 
-.. warning::
-   
-  This documentation is based on the development branch (master).
-  As a result, some contents can be mismatched to the actual implementation.
-
 Table of Contents:
 
 .. toctree::
@@ -33,11 +28,9 @@ Table of Contents:
    configuration
    tsql
    sql_language
-   time_zone
    functions
    table_management
    table_partitioning
-   index_overview
    backup_and_restore
    hcatalog_integration
    jdbc_driver   

Modified: tajo/site/docs/current/_sources/jdbc_driver.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/jdbc_driver.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/jdbc_driver.txt (original)
+++ tajo/site/docs/current/_sources/jdbc_driver.txt Thu Jan  8 17:19:28 2015
@@ -53,7 +53,7 @@ The JDBC driver class name is ``org.apac
 You can get the driver ``Class.forName("org.apache.tajo.jdbc.TajoDriver")``.
 The connection url should be ``jdbc:tajo://<TajoMaster hostname>:<TajoMaster client rpc port>/<database name>``.
 The default TajoMaster client rpc port is ``26002``.
-If you want to change the listening port, please refer :doc:`/configuration/cluster_setup`.
+If you want to change the listening port, please refer :doc:`/configuration/configuration_defaults`.
 
 .. note::
   

Modified: tajo/site/docs/current/_sources/sql_language/ddl.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/sql_language/ddl.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/sql_language/ddl.txt (original)
+++ tajo/site/docs/current/_sources/sql_language/ddl.txt Thu Jan  8 17:19:28 2015
@@ -56,7 +56,7 @@ If you want to add an external table tha
   ...
   L_COMMENT text) 
 
-  USING csv WITH ('text.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec')
+  USING csv WITH ('csvfile.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec')
   LOCATION 'hdfs://localhost:9010/tajo/warehouse/lineitem_100_snappy';
 
 `compression.codec` parameter can have one of the following compression codecs:
@@ -75,35 +75,4 @@ If you want to add an external table tha
 
   DROP TABLE [IF EXISTS] <table_name> [PURGE]
 
-``IF EXISTS`` allows ``DROP DATABASE`` statement to avoid an error which occurs when the database does not exist. ``DROP TABLE`` statement removes a table from Tajo catalog, but it does not remove the contents. If ``PURGE`` option is given, ``DROP TABLE`` statement will eliminate the entry in the catalog as well as the contents.
-
-========================
- CREATE INDEX
-========================
-
-*Synopsis*
-
-.. code-block:: sql
-
-  CREATE INDEX [ name ] ON table_name [ USING method ]
-  ( { column_name | ( expression ) } [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )
-  [ WHERE predicate ]
-
-------------------------
- Index method
-------------------------
-
-Currently, Tajo supports only one type of index.
-
-Index methods:
-  * TWO_LEVEL_BIN_TREE: This method is used by default in Tajo. For more information about its structure, please refer to :doc:`/index/types`.
-
-========================
- DROP INDEX
-========================
-
-*Synopsis*
-
-.. code-block:: sql
-
-  DROP INDEX name
\ No newline at end of file
+``IF EXISTS`` allows ``DROP DATABASE`` statement to avoid an error which occurs when the database does not exist. ``DROP TABLE`` statement removes a table from Tajo catalog, but it does not remove the contents. If ``PURGE`` option is given, ``DROP TABLE`` statement will eliminate the entry in the catalog as well as the contents.
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/table_management.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/table_management.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/table_management.txt (original)
+++ tajo/site/docs/current/_sources/table_management.txt Thu Jan  8 17:19:28 2015
@@ -2,11 +2,8 @@
 Table Management
 ******************
 
-In Tajo, a table is a logical view of one data sources. Logically, one table consists of a logical schema, partitions, URL, and various properties. Physically, A table can be a directory in HDFS, a single file, one HBase table, or a RDBMS table. In order to make good use of Tajo, users need to understand features and physical characteristics of their physical layout. This section explains all about table management.
-
 .. toctree::
     :maxdepth: 1
 
-    table_management/table_overview
     table_management/file_formats
-    table_management/compression
\ No newline at end of file
+    table_management/compression

Modified: tajo/site/docs/current/_sources/table_management/csv.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/table_management/csv.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/table_management/csv.txt (original)
+++ tajo/site/docs/current/_sources/table_management/csv.txt Thu Jan  8 17:19:28 2015
@@ -36,15 +36,10 @@ The ``WITH`` clause in the CREATE TABLE
 
 Now, the CSV storage format provides the following physical properties.
 
-* ``text.delimiter``: delimiter character. ``|`` or ``\u0001`` is usually used, and the default field delimiter is ``|``.
-* ``text.null``: NULL character. The default NULL character is an empty string ``''``. Hive's default NULL character is ``'\\N'``.
+* ``csvfile.delimiter``: delimiter character. ``|`` or ``\u0001`` is usually used, and the default field delimiter is ``|``.
+* ``csvfile.null``: NULL character. The default NULL character is an empty string ``''``. Hive's default NULL character is ``'\\N'``.
 * ``compression.codec``: Compression codec. You can enable compression feature and set specified compression algorithm. The compression algorithm used to compress files. The compression codec name should be the fully qualified class name inherited from `org.apache.hadoop.io.compress.CompressionCodec <https://hadoop.apache.org/docs/current/api/org/apache/hadoop/io/compress/CompressionCodec.html>`_. By default, compression is disabled.
-* ``csvfile.serde`` (deprecated): custom (De)serializer class. ``org.apache.tajo.storage.TextSerializerDeserializer`` is the default (De)serializer class.
-* ``timezone``: the time zone that the table uses for writting. When table rows are read or written, ```timestamp``` and ```time``` column values are adjusted by this timezone if it is set. Time zone can be an abbreviation form like 'PST' or 'DST'. Also, it accepts an offset-based form like 'UTC+9' or a location-based form like 'Asia/Seoul'.
-* ``text.error-tolerance.max-num``: the maximum number of permissible parsing errors. This value should be an integer value. By default, ``text.error-tolerance.max-num`` is ``0``. According to the value, parsing errors will be handled in different ways.
-  * If ``text.error-tolerance.max-num < 0``, all parsing errors are ignored.
-  * If ``text.error-tolerance.max-num == 0``, any parsing error is not allowed. If any error occurs, the query will be failed. (default)
-  * If ``text.error-tolerance.max-num > 0``, the given number of parsing errors in each task will be pemissible.
+* ``csvfile.serde``: custom (De)serializer class. ``org.apache.tajo.storage.TextSerializerDeserializer`` is the default (De)serializer class.
 
 The following example is to set a custom field delimiter, NULL character, and compression codec:
 
@@ -55,8 +50,8 @@ The following example is to set a custom
   name text,
   score float,
   type text
- ) USING CSV WITH('text.delimiter'='\u0001',
-                  'text.null'='\\N',
+ ) USING CSV WITH('csvfile.delimiter'='\u0001',
+                  'csvfile.null'='\\N',
                   'compression.codec'='org.apache.hadoop.io.compress.SnappyCodec');
 
 .. warning::
@@ -93,7 +88,7 @@ Null Value Handling Issues
 In default, NULL character in CSV files is an empty string ``''``.
 In other words, an empty field is basically recognized as a NULL value in Tajo.
 If a field domain is ``TEXT``, an empty field is recognized as a string value ``''`` instead of NULL value.
-Besides, You can also use your own NULL character by specifying a physical property ``text.null``.
+Besides, You can also use your own NULL character by specifying a physical property ``csvfile.null``.
 
 =========================================
 Compatibility Issues with Apache Hive™
@@ -110,6 +105,6 @@ clause in a Hive's ``CREATE TABLE`` stat
 
  CREATE TABLE table1 (id int, name string, score float, type string)
  ROW FORMAT DELIMITED FIELDS TERMINATED BY '|'
- STORED AS TEXT
+ STORED AS TEXTFILE
 
-To the best of our knowledge, there is not way to specify a custom NULL character in Hive.
+To the best of our knowledge, there is not way to specify a custom NULL character in Hive.
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/tsql/meta_command.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/tsql/meta_command.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/tsql/meta_command.txt (original)
+++ tajo/site/docs/current/_sources/tsql/meta_command.txt Thu Jan  8 17:19:28 2015
@@ -3,7 +3,7 @@ Meta Commands
 *********************************
 
 
-In tsql, any command that begins with an unquoted backslash ('\\') is a tsql meta-command that is processed by tsql itself.
+In tsql, any command that begins with an unquoted backslash ('\') is a tsql meta-command that is processed by tsql itself.
 
 In the current implementation, there are meta commands as follows: ::
 
@@ -41,7 +41,7 @@ In the current implementation, there are
 
 
   Documentations
-    tsql guide        http://tajo.apache.org/docs/current/tsql.html
+    tsql guide        http://tajo.apache.org/docs/current/cli.html
     Query language    http://tajo.apache.org/docs/current/sql_language.html
     Functions         http://tajo.apache.org/docs/current/functions.html
     Backup & restore  http://tajo.apache.org/docs/current/backup_and_restore.html

Modified: tajo/site/docs/current/_sources/tsql/variables.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/tsql/variables.txt?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/tsql/variables.txt (original)
+++ tajo/site/docs/current/_sources/tsql/variables.txt Thu Jan  8 17:19:28 2015
@@ -54,7 +54,7 @@ Now, tajo provides the following session
 * ``CLI_ERROR_STOP``
 * ``TIMEZONE``
 * ``DATE_ORDER``
-* ``TEXT_NULL``
+* ``CSVFILE_NULL``
 * ``DEBUG_ENABLED``
 * ``TEST_BROADCAST_JOIN_ENABLED``
 * ``TEST_JOIN_OPT_ENABLED``

Modified: tajo/site/docs/current/backup_and_restore.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/backup_and_restore.html?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/backup_and_restore.html (original)
+++ tajo/site/docs/current/backup_and_restore.html Thu Jan  8 17:19:28 2015
@@ -30,7 +30,7 @@
   
     <link rel="top" title="Apache Tajo 0.8.0 documentation" href="index.html"/>
         <link rel="next" title="Backup and Restore Catalog" href="backup_and_restore/catalog.html"/>
-        <link rel="prev" title="Future Works" href="index/future_work.html"/> 
+        <link rel="prev" title="Hash Partitioning" href="partitioning/hash_partitioning.html"/> 
 
   
   <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
@@ -60,11 +60,11 @@
             <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#dowload-and-unpack-the-source-code">Dowload and unpack the source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#build-source-code">Build source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#setting-up-a-local-tajo-cluster">Setting up a local Tajo cluster</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#first-query-execution">First query execution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/prerequisites.html">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/downloading_source.html">Dowload and unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/building.html">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/local_setup.html">Setting up a local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/first_query.html">First query execution</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration</a><ul>
@@ -73,10 +73,8 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -99,14 +97,6 @@
 <li class="toctree-l2"><a class="reference internal" href="sql_language/predicates.html">Predicates</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="time_zone.html">Time Zone</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#server-cluster-time-zone">Server Cluster Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#table-time-zone">Table Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#client-time-zone">Client Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#time-zone-id">Time Zone ID</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="functions.html">Functions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="functions/string_func_and_operators.html">String Functions and Operators</a></li>
@@ -115,7 +105,6 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="table_management/table_overview.html">Overview of Tajo Tables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="table_management/file_formats.html">File Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="table_management/compression.html">Compression</a></li>
 </ul>
@@ -127,12 +116,6 @@
 <li class="toctree-l2"><a class="reference internal" href="partitioning/hash_partitioning.html">Hash Partitioning</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="index_overview.html">Index (Experimental Feature)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="index/types.html">Index Types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="index/how_to_use.html">How to use index?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="index/future_work.html">Future Works</a></li>
-</ul>
-</li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">Backup and Restore</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
@@ -199,7 +182,7 @@
         <a href="backup_and_restore/catalog.html" class="btn btn-neutral float-right" title="Backup and Restore Catalog"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
-        <a href="index/future_work.html" class="btn btn-neutral" title="Future Works"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="partitioning/hash_partitioning.html" class="btn btn-neutral" title="Hash Partitioning"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       
     </div>
   

Modified: tajo/site/docs/current/backup_and_restore/catalog.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/backup_and_restore/catalog.html?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/backup_and_restore/catalog.html (original)
+++ tajo/site/docs/current/backup_and_restore/catalog.html Thu Jan  8 17:19:28 2015
@@ -61,11 +61,11 @@
             <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="../introduction.html">Introduction</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#dowload-and-unpack-the-source-code">Dowload and unpack the source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#build-source-code">Build source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#setting-up-a-local-tajo-cluster">Setting up a local Tajo cluster</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#first-query-execution">First query execution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/prerequisites.html">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/downloading_source.html">Dowload and unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/building.html">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/local_setup.html">Setting up a local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/first_query.html">First query execution</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../configuration.html">Configuration</a><ul>
@@ -74,10 +74,8 @@
 <li class="toctree-l2"><a class="reference internal" href="../configuration/tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../configuration/configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,14 +98,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#server-cluster-time-zone">Server Cluster Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#table-time-zone">Table Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#client-time-zone">Client Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#time-zone-id">Time Zone ID</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../functions.html">Functions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../functions/string_func_and_operators.html">String Functions and Operators</a></li>
@@ -116,7 +106,6 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../table_management/table_overview.html">Overview of Tajo Tables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/file_formats.html">File Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/compression.html">Compression</a></li>
 </ul>
@@ -128,12 +117,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../partitioning/hash_partitioning.html">Hash Partitioning</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../index_overview.html">Index (Experimental Feature)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../index/types.html">Index Types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/how_to_use.html">How to use index?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/future_work.html">Future Works</a></li>
-</ul>
-</li>
 <li class="toctree-l1 current"><a class="reference internal" href="../backup_and_restore.html">Backup and Restore</a><ul class="current">
 <li class="toctree-l2 current"><a class="current reference internal" href="">Backup and Restore Catalog</a></li>
 </ul>
@@ -193,7 +176,7 @@
 </ul>
 <div class="section" id="sql-dump">
 <h2>SQL dump<a class="headerlink" href="#sql-dump" title="Permalink to this headline">¶</a></h2>
-<p>SQL dump is an easy and strong way. If you use this approach, you don&#8217;t need to concern database-level compatibilities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is:</p>
+<p>SQL dump is an easy and strong way. If you use this approach, you don&#8217;t need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is:</p>
 <div class="highlight-python"><div class="highlight"><pre>$ tajo-dump table_name &gt; outfile
 </pre></div>
 </div>

Modified: tajo/site/docs/current/configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration.html?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/configuration.html (original)
+++ tajo/site/docs/current/configuration.html Thu Jan  8 17:19:28 2015
@@ -30,7 +30,7 @@
   
     <link rel="top" title="Apache Tajo 0.8.0 documentation" href="index.html"/>
         <link rel="next" title="Preliminary" href="configuration/preliminary.html"/>
-        <link rel="prev" title="Getting Started" href="getting_started.html"/> 
+        <link rel="prev" title="First query execution" href="getting_started/first_query.html"/> 
 
   
   <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
@@ -60,11 +60,11 @@
             <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
 <li class="toctree-l1"><a class="reference internal" href="getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#dowload-and-unpack-the-source-code">Dowload and unpack the source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#build-source-code">Build source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#setting-up-a-local-tajo-cluster">Setting up a local Tajo cluster</a></li>
-<li class="toctree-l2"><a class="reference internal" href="getting_started.html#first-query-execution">First query execution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/prerequisites.html">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/downloading_source.html">Dowload and unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/building.html">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/local_setup.html">Setting up a local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="getting_started/first_query.html">First query execution</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">Configuration</a><ul>
@@ -73,10 +73,8 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -99,14 +97,6 @@
 <li class="toctree-l2"><a class="reference internal" href="sql_language/predicates.html">Predicates</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="time_zone.html">Time Zone</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#server-cluster-time-zone">Server Cluster Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#table-time-zone">Table Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#client-time-zone">Client Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#time-zone-id">Time Zone ID</a></li>
-<li class="toctree-l2"><a class="reference internal" href="time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="functions.html">Functions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="functions/string_func_and_operators.html">String Functions and Operators</a></li>
@@ -115,7 +105,6 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="table_management/table_overview.html">Overview of Tajo Tables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="table_management/file_formats.html">File Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="table_management/compression.html">Compression</a></li>
 </ul>
@@ -127,12 +116,6 @@
 <li class="toctree-l2"><a class="reference internal" href="partitioning/hash_partitioning.html">Hash Partitioning</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="index_overview.html">Index (Experimental Feature)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="index/types.html">Index Types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="index/how_to_use.html">How to use index?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="index/future_work.html">Future Works</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="backup_and_restore.html">Backup and Restore</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
@@ -190,10 +173,8 @@
 <li class="toctree-l1"><a class="reference internal" href="configuration/tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l1"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </div>
 </div>
@@ -207,7 +188,7 @@
         <a href="configuration/preliminary.html" class="btn btn-neutral float-right" title="Preliminary"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
-        <a href="getting_started.html" class="btn btn-neutral" title="Getting Started"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="getting_started/first_query.html" class="btn btn-neutral" title="First query execution"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       
     </div>
   

Modified: tajo/site/docs/current/configuration/catalog_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/catalog_configuration.html?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/catalog_configuration.html (original)
+++ tajo/site/docs/current/configuration/catalog_configuration.html Thu Jan  8 17:19:28 2015
@@ -30,7 +30,7 @@
   
     <link rel="top" title="Apache Tajo 0.8.0 documentation" href="../index.html"/>
         <link rel="up" title="Configuration" href="../configuration.html"/>
-        <link rel="next" title="High Availability for TajoMaster" href="ha_configuration.html"/>
+        <link rel="next" title="Configuration Defaults" href="configuration_defaults.html"/>
         <link rel="prev" title="Worker Configuration" href="worker_configuration.html"/> 
 
   
@@ -61,11 +61,11 @@
             <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="../introduction.html">Introduction</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#dowload-and-unpack-the-source-code">Dowload and unpack the source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#build-source-code">Build source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#setting-up-a-local-tajo-cluster">Setting up a local Tajo cluster</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#first-query-execution">First query execution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/prerequisites.html">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/downloading_source.html">Dowload and unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/building.html">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/local_setup.html">Setting up a local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/first_query.html">First query execution</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../configuration.html">Configuration</a><ul class="current">
@@ -74,10 +74,8 @@
 <li class="toctree-l2"><a class="reference internal" href="tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2 current"><a class="current reference internal" href="">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,14 +98,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#server-cluster-time-zone">Server Cluster Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#table-time-zone">Table Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#client-time-zone">Client Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#time-zone-id">Time Zone ID</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../functions.html">Functions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../functions/string_func_and_operators.html">String Functions and Operators</a></li>
@@ -116,7 +106,6 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../table_management/table_overview.html">Overview of Tajo Tables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/file_formats.html">File Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/compression.html">Compression</a></li>
 </ul>
@@ -128,12 +117,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../partitioning/hash_partitioning.html">Hash Partitioning</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../index_overview.html">Index (Experimental Feature)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../index/types.html">Index Types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/how_to_use.html">How to use index?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/future_work.html">Future Works</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../backup_and_restore.html">Backup and Restore</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
@@ -248,11 +231,9 @@ tests.</td>
 <p class="last">By default, <em>Catalog server</em> stores catalog data into <tt class="docutils literal"><span class="pre">/tmp/tajo-catalog-${username}</span></tt> directory. But, some operating systems may remove all contents in <tt class="docutils literal"><span class="pre">/tmp</span></tt> when booting up. In order to ensure persistent store of your catalog data, you need to set a proper location of derby directory.</p>
 </div>
 </div>
-<div class="section" id="mysql-mariadb-postgresql-oracle-configuration">
-<h2>MySQL/MariaDB/PostgreSQL/Oracle Configuration<a class="headerlink" href="#mysql-mariadb-postgresql-oracle-configuration" title="Permalink to this headline">¶</a></h2>
-<p>Tajo supports several database systems, including MySQL, MariaDB, PostgreSQL, and Oracle, as its catalog store.
-In order to use these systems, you first need to create a database and a user for Tajo.
-The following example shows the creation of a user and a database with MySQL.</p>
+<div class="section" id="mysqlstore-configuration">
+<h2>MySQLStore Configuration<a class="headerlink" href="#mysqlstore-configuration" title="Permalink to this headline">¶</a></h2>
+<p>In order to use MySQLStore, you need to create database and user on MySQL for Tajo.</p>
 <div class="highlight-sh"><div class="highlight"><pre>mysql&gt; create user <span class="s1">&#39;tajo&#39;</span>@<span class="s1">&#39;localhost&#39;</span> identified by <span class="s1">&#39;xxxxxx&#39;</span><span class="p">;</span>
 Query OK, <span class="m">0</span> rows affected <span class="o">(</span>0.00 sec<span class="o">)</span>
 
@@ -263,43 +244,38 @@ mysql&gt; grant all on tajo.* to <span c
 Query OK, <span class="m">0</span> rows affected <span class="o">(</span>0.01 sec<span class="o">)</span>
 </pre></div>
 </div>
-<p>Second, you must install the proper JDBC driver on the TajoMaster node. And then, you need to set the <tt class="docutils literal"><span class="pre">TAJO_CLASSPATH</span></tt> variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> 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="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="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="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
+<p>And then, you need to prepare MySQL JDBC driver on the machine which can be ran TajoMaster. If you do, you should set <tt class="docutils literal"><span class="pre">TAJO_CLASSPATH</span></tt> variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> with it as follows:</p>
+<div class="highlight-sh"><div class="highlight"><pre><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
 </pre></div>
 </div>
-<p>Alternatively, you can copy the jdbc driver into <tt class="docutils literal"><span class="pre">$TAJO_HOME/lib</span></tt>.</p>
-<p>Finally, you must add the following configurations to <cite>conf/catalog-site.xml</cite> :</p>
+<p>Or you just can copy jdbc driver into <tt class="docutils literal"><span class="pre">$TAJO_HOME/lib</span></tt>.</p>
+<p>Finally, you should add the following config to <cite>conf/catalog-site.xml</cite> :</p>
 <div class="highlight-xml"><div class="highlight"><pre>&lt;property&gt;
-  &lt;name&gt;tajo.catalog.jdbc.connection.id&lt;/name&gt;
-  &lt;value&gt;&lt;user name&gt;&lt;/value&gt;
+  &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
+  &lt;value&gt;org.apache.tajo.catalog.store.MySQLStore&lt;/value&gt;
 &lt;/property&gt;
 &lt;property&gt;
-  &lt;name&gt;tajo.catalog.jdbc.connection.password&lt;/name&gt;
-  &lt;value&gt;&lt;user password&gt;&lt;/value&gt;
+  &lt;name&gt;tajo.catalog.jdbc.connection.id&lt;/name&gt;
+  &lt;value&gt;&lt;mysql user name&gt;&lt;/value&gt;
 &lt;/property&gt;
-
-&lt;!-- MySQL --&gt;
 &lt;property&gt;
-  &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
-  &lt;value&gt;org.apache.tajo.catalog.store.MySQLStore&lt;/value&gt;
+  &lt;name&gt;tajo.catalog.jdbc.connection.password&lt;/name&gt;
+  &lt;value&gt;&lt;mysql user password&gt;&lt;/value&gt;
 &lt;/property&gt;
 &lt;property&gt;
   &lt;name&gt;tajo.catalog.jdbc.uri&lt;/name&gt;
   &lt;value&gt;jdbc:mysql://&lt;mysql host name&gt;:&lt;mysql port&gt;/&lt;database name for tajo&gt;?createDatabaseIfNotExist=true&lt;/value&gt;
 &lt;/property&gt;
-
-&lt;!-- MariaDB --&gt;
-&lt;property&gt;
+</pre></div>
+</div>
+</div>
+<div class="section" id="mariadbstore-configuration">
+<h2>MariaDBStore Configuration<a class="headerlink" href="#mariadbstore-configuration" title="Permalink to this headline">¶</a></h2>
+<p>All configurations for using MariaDBStore is compatible with MySQLStore except following:</p>
+<div class="highlight-sh"><div class="highlight"><pre><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
+</pre></div>
+</div>
+<div class="highlight-xml"><div class="highlight"><pre>&lt;property&gt;
   &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
   &lt;value&gt;org.apache.tajo.catalog.store.MariaDBStore&lt;/value&gt;
 &lt;/property&gt;
@@ -307,31 +283,10 @@ Query OK, <span class="m">0</span> rows
   &lt;name&gt;tajo.catalog.jdbc.uri&lt;/name&gt;
   &lt;value&gt;jdbc:mariadb://&lt;mariadb host name&gt;:&lt;mariadb port&gt;/&lt;database name for tajo&gt;?createDatabaseIfNotExist=true&lt;/value&gt;
 &lt;/property&gt;
-
-&lt;!-- PostgreSQL --&gt;
-&lt;property&gt;
-  &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
-  &lt;value&gt;org.apache.tajo.catalog.store.PostgreSQLStore&lt;/value&gt;
-&lt;/property&gt;
-&lt;property&gt;
-  &lt;name&gt;tajo.catalog.jdbc.uri&lt;/name&gt;
-  &lt;value&gt;jdbc:postgresql://&lt;postgresql host name&gt;:&lt;postgresql port&gt;/&lt;database name for tajo&gt;?createDatabaseIfNotExist=true&lt;/value&gt;
-&lt;/property&gt;
-
-&lt;!-- Oracle --&gt;
-&lt;property&gt;
-  &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
-  &lt;value&gt;org.apache.tajo.catalog.store.OracleStore&lt;/value&gt;
-&lt;/property&gt;
-&lt;property&gt;
-  &lt;name&gt;tajo.catalog.jdbc.uri&lt;/name&gt;
-  &lt;value&gt;jdbc:oracle:thin:@//&lt;oracle host name&gt;:&lt;oracle port&gt;/&lt;ServiceName for tajo database&gt;&lt;/value&gt;
-&lt;/property&gt;
 </pre></div>
 </div>
-</div>
 <div class="section" id="hcatalogstore-configuration">
-<h2>HCatalogStore Configuration<a class="headerlink" href="#hcatalogstore-configuration" title="Permalink to this headline">¶</a></h2>
+<h3>HCatalogStore Configuration<a class="headerlink" href="#hcatalogstore-configuration" title="Permalink to this headline">¶</a></h3>
 <p>Tajo support HCatalogStore to integrate with hive. If you want to use HCatalogStore, 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
@@ -357,6 +312,7 @@ Query OK, <span class="m">0</span> rows
 </div>
 </div>
 </div>
+</div>
 
 
           </div>
@@ -364,7 +320,7 @@ Query OK, <span class="m">0</span> rows
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       
-        <a href="ha_configuration.html" class="btn btn-neutral float-right" title="High Availability for TajoMaster"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="configuration_defaults.html" class="btn btn-neutral float-right" title="Configuration Defaults"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
         <a href="worker_configuration.html" class="btn btn-neutral" title="Worker Configuration"><span class="fa fa-arrow-circle-left"></span> Previous</a>

Modified: tajo/site/docs/current/configuration/cluster_setup.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/cluster_setup.html?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/cluster_setup.html (original)
+++ tajo/site/docs/current/configuration/cluster_setup.html Thu Jan  8 17:19:28 2015
@@ -61,11 +61,11 @@
             <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="../introduction.html">Introduction</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#dowload-and-unpack-the-source-code">Dowload and unpack the source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#build-source-code">Build source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#setting-up-a-local-tajo-cluster">Setting up a local Tajo cluster</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#first-query-execution">First query execution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/prerequisites.html">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/downloading_source.html">Dowload and unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/building.html">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/local_setup.html">Setting up a local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/first_query.html">First query execution</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../configuration.html">Configuration</a><ul class="current">
@@ -74,10 +74,8 @@
 <li class="toctree-l2"><a class="reference internal" href="tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,14 +98,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#server-cluster-time-zone">Server Cluster Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#table-time-zone">Table Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#client-time-zone">Client Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#time-zone-id">Time Zone ID</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../functions.html">Functions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../functions/string_func_and_operators.html">String Functions and Operators</a></li>
@@ -116,7 +106,6 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../table_management/table_overview.html">Overview of Tajo Tables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/file_formats.html">File Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/compression.html">Compression</a></li>
 </ul>
@@ -128,12 +117,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../partitioning/hash_partitioning.html">Hash Partitioning</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../index_overview.html">Index (Experimental Feature)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../index/types.html">Index Types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/how_to_use.html">How to use index?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/future_work.html">Future Works</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../backup_and_restore.html">Backup and Restore</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
@@ -257,7 +240,7 @@ $ $HADOOP_HOME/bin/hadoop fs -chmod g+w
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">In default, TajoMaster listens on 127.0.0.1 for clients. To allow remote clients to access TajoMaster, please set tajo.master.client-rpc.address config to tajo-site.xml. In order to know how to change the listen port, please refer <a class="reference internal" href="service_config_defaults.html"><em>Cluster Service Configuration Defaults</em></a>.</p>
+<p class="last">In default, TajoMaster listens on 127.0.0.1 for clients. To allow remote clients to access TajoMaster, please set tajo.master.client-rpc.address config to tajo-site.xml. In order to know how to change the listen port, please refer <a class="reference internal" href="configuration_defaults.html"><em>Configuration Defaults</em></a>.</p>
 </div>
 </div>
 </div>

Modified: tajo/site/docs/current/configuration/ha_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/ha_configuration.html?rev=1650337&r1=1650336&r2=1650337&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/ha_configuration.html (original)
+++ tajo/site/docs/current/configuration/ha_configuration.html Thu Jan  8 17:19:28 2015
@@ -30,8 +30,8 @@
   
     <link rel="top" title="Apache Tajo 0.8.0 documentation" href="../index.html"/>
         <link rel="up" title="Configuration" href="../configuration.html"/>
-        <link rel="next" title="Cluster Service Configuration Defaults" href="service_config_defaults.html"/>
-        <link rel="prev" title="Catalog Configuration" href="catalog_configuration.html"/> 
+        <link rel="next" title="Tajo Shell (TSQL)" href="../tsql.html"/>
+        <link rel="prev" title="Configuration Defaults" href="configuration_defaults.html"/> 
 
   
   <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
@@ -61,11 +61,11 @@
             <ul class="current">
 <li class="toctree-l1"><a class="reference internal" href="../introduction.html">Introduction</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../getting_started.html">Getting Started</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#dowload-and-unpack-the-source-code">Dowload and unpack the source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#build-source-code">Build source code</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#setting-up-a-local-tajo-cluster">Setting up a local Tajo cluster</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../getting_started.html#first-query-execution">First query execution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/prerequisites.html">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/downloading_source.html">Dowload and unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/building.html">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/local_setup.html">Setting up a local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../getting_started/first_query.html">First query execution</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../configuration.html">Configuration</a><ul class="current">
@@ -74,10 +74,8 @@
 <li class="toctree-l2"><a class="reference internal" href="tajo_master_configuration.html">Tajo Master Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration_defaults.html">Configuration Defaults</a></li>
 <li class="toctree-l2 current"><a class="current reference internal" href="">High Availability for TajoMaster</a></li>
-<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>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo Shell (TSQL)</a><ul>
@@ -100,14 +98,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/predicates.html">Predicates</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../time_zone.html">Time Zone</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#server-cluster-time-zone">Server Cluster Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#table-time-zone">Table Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#client-time-zone">Client Time Zone</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#time-zone-id">Time Zone ID</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../functions.html">Functions</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../functions/string_func_and_operators.html">String Functions and Operators</a></li>
@@ -116,7 +106,6 @@
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../table_management/table_overview.html">Overview of Tajo Tables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/file_formats.html">File Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../table_management/compression.html">Compression</a></li>
 </ul>
@@ -128,12 +117,6 @@
 <li class="toctree-l2"><a class="reference internal" href="../partitioning/hash_partitioning.html">Hash Partitioning</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../index_overview.html">Index (Experimental Feature)</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="../index/types.html">Index Types</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/how_to_use.html">How to use index?</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../index/future_work.html">Future Works</a></li>
-</ul>
-</li>
 <li class="toctree-l1"><a class="reference internal" href="../backup_and_restore.html">Backup and Restore</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
@@ -317,10 +300,10 @@ host2.domain.com
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       
-        <a href="service_config_defaults.html" class="btn btn-neutral float-right" title="Cluster Service Configuration Defaults"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+        <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="catalog_configuration.html" class="btn btn-neutral" title="Catalog Configuration"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="configuration_defaults.html" class="btn btn-neutral" title="Configuration Defaults"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       
     </div>