tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject svn commit: r1710762 [1/9] - in /tajo/site/docs/current: ./ _sources/ _sources/backup_and_restore/ _sources/configuration/ _sources/functions/ _sources/index/ _sources/sql_language/ _sources/table_management/ _sources/tsql/ backup_and_restore/ configur...
Date Tue, 27 Oct 2015 10:40:09 GMT
Author: jihoonson
Date: Tue Oct 27 10:40:08 2015
New Revision: 1710762

URL: http://svn.apache.org/viewvc?rev=1710762&view=rev
Log:
update current document for 0.11 release

Modified:
    tajo/site/docs/current/_sources/backup_and_restore/catalog.txt
    tajo/site/docs/current/_sources/configuration/catalog_configuration.txt
    tajo/site/docs/current/_sources/configuration/worker_configuration.txt
    tajo/site/docs/current/_sources/functions.txt
    tajo/site/docs/current/_sources/functions/datetime_func_and_operators.txt
    tajo/site/docs/current/_sources/functions/json_func.txt
    tajo/site/docs/current/_sources/functions/math_func_and_operators.txt
    tajo/site/docs/current/_sources/functions/network_func_and_operators.txt
    tajo/site/docs/current/_sources/functions/string_func_and_operators.txt
    tajo/site/docs/current/_sources/getting_started.txt
    tajo/site/docs/current/_sources/index.txt
    tajo/site/docs/current/_sources/index/how_to_use.txt
    tajo/site/docs/current/_sources/jdbc_driver.txt
    tajo/site/docs/current/_sources/sql_language.txt
    tajo/site/docs/current/_sources/sql_language/ddl.txt
    tajo/site/docs/current/_sources/sql_language/queries.txt
    tajo/site/docs/current/_sources/sql_language/sql_expression.txt
    tajo/site/docs/current/_sources/table_management.txt
    tajo/site/docs/current/_sources/table_management/file_formats.txt
    tajo/site/docs/current/_sources/table_management/table_overview.txt
    tajo/site/docs/current/_sources/table_management/text.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-site-xml.html
    tajo/site/docs/current/configuration/catalog_configuration.html
    tajo/site/docs/current/configuration/cluster_setup.html
    tajo/site/docs/current/configuration/configuration_defaults.html
    tajo/site/docs/current/configuration/ha_configuration.html
    tajo/site/docs/current/configuration/preliminary.html
    tajo/site/docs/current/configuration/service_config_defaults.html
    tajo/site/docs/current/configuration/tajo-site-xml.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/json_func.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/hbase_integration.html
    tajo/site/docs/current/hcatalog_integration.html
    tajo/site/docs/current/index.html
    tajo/site/docs/current/index/future_work.html
    tajo/site/docs/current/index/how_to_use.html
    tajo/site/docs/current/index/types.html
    tajo/site/docs/current/index_overview.html
    tajo/site/docs/current/introduction.html
    tajo/site/docs/current/jdbc_driver.html
    tajo/site/docs/current/objects.inv
    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/swift_integration.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_management/table_overview.html
    tajo/site/docs/current/table_management/text.html
    tajo/site/docs/current/table_partitioning.html
    tajo/site/docs/current/tajo_client_api.html
    tajo/site/docs/current/time_zone.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=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/backup_and_restore/catalog.txt (original)
+++ tajo/site/docs/current/_sources/backup_and_restore/catalog.txt Tue Oct 27 10:40:08 2015
@@ -25,7 +25,7 @@ For example, if you want to backup a tab
   --
 
   --
-  -- Name: customer; Type: TABLE; Storage: CSV
+  -- Name: customer; Type: TABLE; Storage: TEXT
   -- Path: file:/home/hyunsik/tpch/customer
   --
   CREATE EXTERNAL TABLE customer (c_custkey INT8, c_name TEXT, c_address TEXT, c_nationkey INT8, c_phone TEXT, c_acctbal FLOAT8, c_mktsegment TEXT, c_comment TEXT) USING TEXT LOCATION 'file:/home/hyunsik/tpch/customer';

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=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration/catalog_configuration.txt (original)
+++ tajo/site/docs/current/_sources/configuration/catalog_configuration.txt Tue Oct 27 10:40:08 2015
@@ -7,21 +7,21 @@ If you want to customize the catalog ser
 * tajo.catalog.master.addr - If you want to launch a Tajo cluster in distributed mode, you must specify this address. For more detail information, see [Default Ports](#DefaultPorts).
 * tajo.catalog.store.class - If you want to change the persistent storage of the catalog server, specify the class name. Its default value is tajo.catalog.store.DerbyStore. In the current version, Tajo provides three persistent storage classes as follows:
 
-+-----------------------------------+------------------------------------------------+
-| Driver Class                      | Descriptions                                   |
-+===================================+================================================+
-| tajo.catalog.store.DerbyStore     | this storage class uses Apache Derby.          |
-+-----------------------------------+------------------------------------------------+
-| tajo.catalog.store.MySQLStore     | this storage class uses MySQL.                 |
-+-----------------------------------+------------------------------------------------+
-| tajo.catalog.store.MariaDBStore   | this storage class uses MariaDB.               |
-+-----------------------------------+------------------------------------------------+
-| tajo.catalog.store.MemStore       | this is the in-memory storage. It is only used |
-|                                   | in unit tests to shorten the duration of unit  |
-|                                   | tests.                                         |
-+-----------------------------------+------------------------------------------------+
-| tajo.catalog.store.HCatalogStore  | this storage class uses HiveMetaStore.         |
-+-----------------------------------+------------------------------------------------+
++--------------------------------------+------------------------------------------------+
+| Driver Class                         | Descriptions                                   |
++======================================+================================================+
+| tajo.catalog.store.DerbyStore        | this storage class uses Apache Derby.          |
++--------------------------------------+------------------------------------------------+
+| tajo.catalog.store.MySQLStore        | this storage class uses MySQL.                 |
++--------------------------------------+------------------------------------------------+
+| tajo.catalog.store.MariaDBStore      | this storage class uses MariaDB.               |
++--------------------------------------+------------------------------------------------+
+| tajo.catalog.store.MemStore          | this is the in-memory storage. It is only used |
+|                                      | in unit tests to shorten the duration of unit  |
+|                                      | tests.                                         |
++--------------------------------------+------------------------------------------------+
+| tajo.catalog.store.HiveCatalogStore  | this storage class uses HiveMetaStore.         |
++--------------------------------------+------------------------------------------------+
 
 =========================
 Derby Configuration
@@ -148,21 +148,19 @@ Finally, you must add the following conf
   </property>
 
 ==================================
-HCatalogStore Configuration
+HiveCatalogStore Configuration
 ==================================
 
-Tajo support HCatalogStore to integrate with hive. If you want to use HCatalogStore, you just do as follows.
+Tajo support HiveCatalogStore to integrate with hive. If you want to use HiveCatalogStore, you just do as follows.
 
 First, you must compile source code and get a binary archive as follows:
 
 .. code-block:: sh
 
   $ git clone https://git-wip-us.apache.org/repos/asf/tajo.git tajo
-  $ mvn clean install -DskipTests -Pdist -Dtar -Phcatalog-0.1x.0
+  $ mvn clean install -DskipTests -Pdist -Dtar
   $ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 
-Currently Tajo supports hive 0.12.0, hive 0.13.0, hive 0.13.1. If you enables HCatalogStore, you set the maven profile as ``-Phcatalog-0.12.0``.
-
 Second, you must set your hive home directory to HIVE_HOME variable in ``conf/tajo-env.sh`` with it as follows:
 
 .. code-block:: sh
@@ -182,5 +180,5 @@ Lastly, you should add the following con
 
   <property>
     <name>tajo.catalog.store.class</name>
-    <value>org.apache.tajo.catalog.store.HCatalogStore</value>
+    <value>org.apache.tajo.catalog.store.HiveCatalogStore</value>
   </property>

Modified: tajo/site/docs/current/_sources/configuration/worker_configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/configuration/worker_configuration.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration/worker_configuration.txt (original)
+++ tajo/site/docs/current/_sources/configuration/worker_configuration.txt Tue Oct 27 10:40:08 2015
@@ -43,21 +43,26 @@ Worker Resources
 ==========================================================
 
 Each worker can execute multiple tasks simultaneously.
-In Tajo, users can specify the total size of memory and the number of disks for each worker. Available resources affect how many tasks are executed simultaneously.
+
+In Tajo, users can specify the number of cpu cores, the total size of memory and the number of disks for each worker. Available resources affect how many tasks are executed simultaneously.
+CPU cores are a unit for expressing CPU parallelism, the unit for memory is megabytes and the unit for disks is the number of disk
 
 In order to specify the resource capacity of each worker, you should add the following configs to ``tajo-site.xml`` :
 
-=================================  ==========================  ===================   =========================
-  property name                     description                value type            default value            
-=================================  ==========================  ===================   =========================
-  tajo.worker.resource.cpu-cores    the number of cpu cores    integer               1                        
-  tajo.worker.resource.memory-mb    memory size (MB)           integer               1024                     
-  tajo.worker.resource.disks        the number of disks        integer               1                        
-=================================  ==========================  ===================   =========================
+===================================  =============   ======================   =================================
+  property name                        value type      default value            description
+===================================  =============   ======================   =================================
+  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.qm.resource.min.memory-mb       Integer         500                      minimum allocatable memory per query
+===================================  =============   ======================   =================================
 
 .. note:: 
   
-  Currently, QueryMaster requests 512MB memory and 0.5 disk per task for the backward compatibility.
+  Currently, QueryMaster requests 500MB memory and 1 cpu-core per task for the backward compatibility.
+  If you want to give more memory, you can set to ``tajo.qm.resource.min.memory-mb``
 
 .. note::
 
@@ -68,7 +73,14 @@ In order to specify the resource capacit
  Example
 ------------
 
-Assume that you want to give 5120 MB memory, 4 disks, and 24 cores on each worker. The example configuration is as follows:
+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:
+
+``tajo-env.sh``
+
+.. code-block:: bash
+
+  export TAJO_WORKER_HEAPSIZE=15000
+
 
 ``tajo-site.xml``
 
@@ -76,35 +88,63 @@ Assume that you want to give 5120 MB mem
 
   <property>
     <name>tajo.worker.resource.tajo.worker.resource.cpu-cores</name>
-    <value>24</value>
+    <value>12</value>
   </property>
   
    <property>
-    <name>tajo.worker.resource.memory-mb</name>
-    <value>5120</value>
+    <name>tajo.task.resource.min.memory-mb</name>
+    <value>1000</value>
   </property>
   
   <property>
-    <name>tajo.worker.resource.tajo.worker.resource.disks</name>
-    <value>4.0</value>
-  </property>  
-
---------------------
- Dedicated Mode
---------------------
-Tajo provides a dedicated mode that allows each worker in a Tajo cluster to use whole available system resources including cpu-cores, memory, and disks. For this mode, a user should add the following config to ``tajo-site.xml`` : 
+    <name>tajo.worker.resource.disks</name>
+    <value>4</value>
+  </property>
+
+
+* Example with HDFS
+
+``tajo-env.sh``
+
+.. code-block:: bash
+
+  export TAJO_WORKER_HEAPSIZE=15000
+
+
+``tajo-site.xml``
 
 .. code-block:: xml
 
+   <property>
+    <name>tajo.task.resource.min.memory-mb</name>
+    <value>1000</value>
+  </property>
+
   <property>
-    <name>tajo.worker.resource.dedicated</name>
+    <name>tajo.worker.resource.dfs-dir-aware</name>
     <value>true</value>
   </property>
 
-In addition, it can limit the memory capacity used for Tajo worker as follows:
 
-===============================================  ================================================   ===================   =======================
-  property name                                  description                                        value type            default value           
-===============================================  ================================================   ===================   =======================
-  tajo.worker.resource.dedicated-memory-ratio    how much memory to be used in whole memory         float                 0.8                     
-===============================================  ================================================   ===================   =======================
\ No newline at end of file
+* Example with S3
+
+``tajo-env.sh``
+
+.. code-block:: bash
+
+  export TAJO_WORKER_HEAPSIZE=15000
+
+
+``tajo-site.xml``
+
+.. code-block:: xml
+
+   <property>
+    <name>tajo.task.resource.min.memory-mb</name>
+    <value>1000</value>
+  </property>
+
+  <property>
+    <name>tajo.worker.resource.disk.parallel-execution.num</name>
+    <value>4</value>
+  </property>
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/functions.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions.txt (original)
+++ tajo/site/docs/current/_sources/functions.txt Tue Oct 27 10:40:08 2015
@@ -2,11 +2,45 @@
 Functions
 ******************
 
+Tajo provides extensive supports for functions. It includes a lot of built-in functions and user-defined functions which is implemented in Python.
+
+==========================
+Built-in Scalar Functions
+==========================
+
 .. toctree::
     :maxdepth: 1
 
+    functions/data_type_func_and_operators
     functions/math_func_and_operators
     functions/string_func_and_operators
     functions/datetime_func_and_operators
     functions/network_func_and_operators
-    functions/json_func
\ No newline at end of file
+    functions/json_func
+
+================================
+Built-in Aggregation Functions
+================================
+
+.. toctree::
+    :maxdepth: 1
+
+    functions/agg_func
+
+================================
+Built-in Window Functions
+================================
+
+.. toctree::
+    :maxdepth: 1
+
+    functions/window_func
+
+==============================
+User-defined Functions
+==============================
+
+.. toctree::
+    :maxdepth: 1
+
+    functions/python
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/functions/datetime_func_and_operators.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions/datetime_func_and_operators.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions/datetime_func_and_operators.txt (original)
+++ tajo/site/docs/current/_sources/functions/datetime_func_and_operators.txt Tue Oct 27 10:40:08 2015
@@ -37,7 +37,7 @@ DateTime Functions and Operators
 
 .. function:: current_date ()
 
-  Returns current date
+  Returns current date.
 
   :rtype: date
           
@@ -48,7 +48,7 @@ DateTime Functions and Operators
 
 .. function:: current_time ()
 
-  Returns current time
+  Returns current time.
 
   :rtype: time
           
@@ -57,10 +57,14 @@ DateTime Functions and Operators
     select current_time();
     > 05:18:27.651999
 
-.. function:: extract(field FROM source)
+.. function:: extract(field FROM source date|timestamp|time)
 
   The extract function retrieves subfields such as year or hour from date/time values. *source* must be a value expression of type *timestamp*, or *time*. (Expressions of type *date* are cast to *timestamp* and can therefore be used as well.) *field* is an identifier that selects what field to extract from the source value. The extract function returns values of type double precision. The following are valid field names:
 
+  :param field: extract field
+  :param source: source value
+  :rtype: float8
+
   **century**
 
   The century
@@ -230,10 +234,14 @@ DateTime Functions and Operators
 
   The date_part function is also supported. It is equivalent to the SQL-standard function extract:
 
-.. function:: date_part('field', source)
+.. function:: date_part(field text, source date|timestamp|time)
 
   Note that here the field parameter needs to be a string value, not a name. The valid field names for date_part are the same as for extract.
 
+  :param field: extract field
+  :param source: source value
+  :rtype: float8
+
   .. code-block:: sql
 
     select date_part('day', timestamp '2001-02-16 20:38:40');
@@ -302,7 +310,7 @@ DateTime Functions and Operators
     select to_timestamp('97/2/16 8:14:30', 'FMYYYY/FMMM/FMDD FMHH:FMMI:FMSS');
     > 0097-02-15 23:14:30
 
-.. function:: utc_usec_to (string text , long timestamp , int dayOfWeek)
+.. function:: utc_usec_to (string text , timestamp long , dayOfWeek int)
 
   * If the **first parameter** is 'day'.
 

Modified: tajo/site/docs/current/_sources/functions/json_func.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions/json_func.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions/json_func.txt (original)
+++ tajo/site/docs/current/_sources/functions/json_func.txt Tue Oct 27 10:40:08 2015
@@ -2,15 +2,61 @@
 JSON Functions
 *******************************
 
-.. function:: json_extract_path_text (string json, string xpath)
-  Extracts JSON string from a JSON string based on json path specified and returns JSON string pointed to by xPath
+.. function:: json_extract_path_text (json text, json_path text)
 
-  :param string:
-  :param string:
+  Extracts JSON string from a JSON string based on json path specified and returns JSON string pointed to by JSONPath.
+  Returns null if either argument is null.
+
+  :param json: JSON string
+  :param json_path: JSONpath
   :rtype: text
   :example:
 
   .. code-block:: sql
 
-    json_extract_path_text('{"test" : {"key" : "tajo"}}','$.test.key');
+    select json_extract_path_text('{"test" : {"key" : "tajo"}}','$.test.key');
     > tajo
+
+.. function:: json_array_get (json_array text, index int4)
+
+  Returns the element at the specified index into the JSON array. This function returns an element indexed from the end of an array with a negative index, and null if the element at the specified index doesn’t exist.
+
+  :param json_array: String of a JSON array
+  :param index: index
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select json_array_get('[100, 200, 300]', 0);
+    > 100
+
+    select json_array_get('[100, 200, 300]', -2);
+    > 200
+
+.. function:: json_array_contains (json_array text, value any)
+
+  Determine if the given value exists in the JSON array.
+
+  :param json_array: String of a JSON array
+  :param value: value of any type
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select json_array_contains('[100, 200, 300]', 100);
+    > t
+
+.. function:: json_array_length(json_array text)
+
+  Returns the length of json array.
+
+  :param json_array: String of a JSON array
+  :rtype: int8
+  :example:
+
+  .. code-block:: sql
+
+    select json_array_length('[100, 200, 300]');
+    > 3

Modified: tajo/site/docs/current/_sources/functions/math_func_and_operators.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions/math_func_and_operators.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions/math_func_and_operators.txt (original)
+++ tajo/site/docs/current/_sources/functions/math_func_and_operators.txt Tue Oct 27 10:40:08 2015
@@ -87,6 +87,7 @@ Math Functions and Operators
 
   :param number: target real number
   :rtype: int8
+  :alias: ceiling
   :example:
 
   .. code-block:: sql
@@ -213,6 +214,19 @@ Math Functions and Operators
     select radians(45.0);
     > 0.7853981633974483
 
+.. function:: random(number int4)
+
+  Returns a pseudorandom number.
+
+  :param number: range restriction
+  :rtype: int4
+  :example:
+
+  .. code-block:: sql
+
+    select random(10);
+    > 4
+
 .. function:: round (number int|float)
 
   Rounds to nearest integer

Modified: tajo/site/docs/current/_sources/functions/network_func_and_operators.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions/network_func_and_operators.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions/network_func_and_operators.txt (original)
+++ tajo/site/docs/current/_sources/functions/network_func_and_operators.txt Tue Oct 27 10:40:08 2015
@@ -23,7 +23,7 @@ as follows. ::
 Supported Functions
 ===================
 
-.. function:: geoip_country_code (string addr)
+.. function:: geoip_country_code (addr text)
 
   Convert an ipv4 address string to a geoip country code.
 
@@ -36,7 +36,7 @@ Supported Functions
     select geoip_country_code('163.152.71.31')
     > 'KR'
 
-.. function:: geoip_country_code (inet4 addr)
+.. function:: geoip_country_code (addr inet4)
 
   Convert an ipv4 address to a geoip country code.
 
@@ -49,7 +49,7 @@ Supported Functions
     select geoip_country_code(163.152.71.31)
     > 'KR'
 
-.. function:: geoip_in_country (string addr, string code)
+.. function:: geoip_in_country (addr text, code text)
 
   If the given country code is same with the country code of the given address, it returns true. Otherwise, returns false.
 
@@ -63,7 +63,7 @@ Supported Functions
     select geoip_in_country('163.152.71.31', 'KR')
     > true
 
-.. function:: geoip_in_country (inet4 addr, string code)
+.. function:: geoip_in_country (addr inet4, code text)
 
   If the given country code is same with the country code of the given address, it returns true. Otherwise, returns false.
 

Modified: tajo/site/docs/current/_sources/functions/string_func_and_operators.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions/string_func_and_operators.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions/string_func_and_operators.txt (original)
+++ tajo/site/docs/current/_sources/functions/string_func_and_operators.txt Tue Oct 27 10:40:08 2015
@@ -13,77 +13,284 @@ String Functions and Operators
 
   .. code-block:: sql
 
-    select ‘Ta’ || ‘jo’; 
+    select 'Ta' || 'jo';
     > 'Tajo'
   
+.. function:: ascii (string text)
+
+  Returns the ASCII code of the first character of the text.
+  For UTF-8, this function returns the Unicode code point of the character.
+  For other multibyte encodings, the argument must be an ASCII character.
+
+  :param string: input string
+  :rtype: int4
+  :example:
+
+  .. code-block:: sql
+
+    select ascii('x');
+    > 120
+
+.. function:: bit_length (string text)
+
+  Returns the number of bits in string.
+
+  :param string: input string
+  :rtype: int4
+  :example:
+
+  .. code-block:: sql
+
+    select bit_length('jose');
+    > 32
 
 .. function:: char_length (string text)
 
-  Returns Number of characters in string
+  Returns the number of characters in string.
 
   :param string: to be counted
   :rtype: int4
-  :alias: character_length
+  :alias: character_length, length
+  :example:
+
+  .. code-block:: sql
+
+    select char_length('Tajo');
+    > 4
+
+.. function:: octet_length (string text)
+
+  Returns the number of bytes in string.
+
+  :param string: input string
+  :rtype: int4
   :example:
 
   .. code-block:: sql
 
-    select char_length(‘Tajo’);
+    select octet_length('jose');
     > 4
 
+.. function:: chr (code int4)
+
+  Returns a character with the given code.
+
+  :param code: input character code
+  :rtype: char
+  :example:
+
+  .. code-block:: sql
+
+    select chr(65);
+    > A
+
+.. function:: decode (binary text, format text)
+
+  Decode binary data from textual representation in string.
+
+  :param binary: encoded value
+  :param format: decode format. base64, hex, escape. escape converts zero bytes and high-bit-set bytes to octal sequences (\nnn) and doubles backslashes.
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select decode('MTIzXDAwMFwwMDE=', 'base64');
+    > 123\\000\\001
+
+.. function:: digest (input text, method text)
+
+  Calculates the Digest hash of string.
+
+  :param input: input string
+  :param method: hash method
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select digest('tajo', 'sha1');
+    > 02b0e20540b89f0b735092bbac8093eb2e3804cf
+
+.. function:: encode (binary text, format text)
+
+  Encode binary data into a textual representation.
+
+  :param binary: decoded value
+  :param format: encode format. base64, hex, escape. escape converts zero bytes and high-bit-set bytes to octal sequences (\nnn) and doubles backslashes.
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select encode('123\\000\\001', 'base64');
+    > MTIzXDAwMFwwMDE=
+
+.. function:: initcap (string text)
+
+  Convert the first letter of each word to upper case  and the rest to lower case.
+
+  :param string: input string
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select initcap('hi THOMAS');
+    > Hi Thomas
+
+.. function:: md5 (string text)
+
+  Calculates the MD5 hash of string.
+
+  :param string: input string
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select md5('abc');
+    > 900150983cd24fb0d6963f7d28e17f72
+
+.. function:: left (string text, number int4)
+
+  Returns the first n characters in the string.
+
+  :param string: input string
+  :param number: number of characters retrieved
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select left('ABC', 2);
+    > AB
+
+.. function:: right(string text, number int4)
 
-.. function:: trim([leading | trailing | both] [characters] from string)
+  Returns the last n characters in the string.
 
-  Removes the characters (a space by default) from the start/end/both ends of the string
+  :param string: input string
+  :param number: number of characters retrieved
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select right('ABC', 2);
+    > BC
+
+.. function:: locate(source text, target text, [start_index int4])
+
+  Returns the location of specified substring.
+
+  :param source: source string
+  :param target: target substring
+  :param start_index: the index where the search is started
+  :rtype: int4
+  :alias: strpos
+  :example:
+
+  .. code-block:: sql
+
+    select locate('high', 'ig', 1);
+    > 2
+
+.. function:: strposb(source text, target text)
+
+  Returns the binary location of specified substring.
+
+  :param source: source string
+  :param target: target substring
+  :rtype: int4
+  :example:
+
+  .. code-block:: sql
 
-  :param string: 
-  :param characters: 
+    select strpos('tajo', 'aj');
+    > 2
+
+.. function:: substr(source text, start int4, length int4)
+
+  Extract substring.
+
+  :param source: source string
+  :param start: start index
+  :param length: length of substring
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select substr('alphabet', 3, 2);
+    > ph
+
+.. function:: trim(string text, [characters text])
+
+  Removes the characters (a space by default) from the start/end/both ends of the string.
+
+  :param string: input string
+  :param characters: characters which will be removed
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select trim('xTajoxx', 'x');
+    > Tajo
+
+.. function:: trim([leading | trailing | both] [characters text] FROM string text)
+
+  Removes the characters (a space by default) from the start/end/both ends of the string.
+
+  :param string: input string
+  :param characters: characters which will be removed
   :rtype: text
   :example:
 
   .. code-block:: sql
 
-    select trim(both ‘x’ from ‘xTajoxx’);
-    > Tajo   
+    select trim(both 'x' from 'xTajoxx');
+    > Tajo
 
 
 .. function:: btrim(string text, [characters text])
 
-  Removes the characters (a space by default) from the both ends of the string
+  Removes the characters (a space by default) from the both ends of the string.
   
-  :param string: 
-  :param characters: 
+  :param string: input string
+  :param characters: characters which will be removed
   :rtype: text
   :alias: trim
   :example:
 
   .. code-block:: sql
 
-    select btrim(‘xTajoxx’, ‘x’);
+    select btrim('xTajoxx', 'x');
     > Tajo 
 
 
 .. function:: ltrim(string text, [characters text])
 
-  Removes the characters (a space by default) from the start ends of the string
+  Removes the characters (a space by default) from the start ends of the string.
 
-  :param string: 
-  :param characters: 
+  :param string: input string
+  :param characters: characters which will be removed
   :rtype: text
   :example:
 
   .. code-block:: sql
 
-    select ltrim(‘xxTajo’, ‘x’);
+    select ltrim('xxTajo', 'x');
     > Tajo 
 
 
 .. function:: rtrim(string text, [characters text])
 
-  Removes the characters (a space by default) from the end ends of the string
+  Removes the characters (a space by default) from the end ends of the string.
 
-  :param string: 
-  :param characters: 
+  :param string: input string
+  :param characters: characters which will be removed
   :rtype: text
   :example:
 
@@ -95,42 +302,42 @@ String Functions and Operators
 
 .. function:: split_part(string text, delimiter text, field int)
 
-  Splits a string on delimiter and return the given field (counting from one)
+  Splits a string on delimiter and return the given field (counting from one).
 
-  :param string: 
-  :param delimiter: 
-  :param field: 
+  :param string: input string
+  :param delimiter: delimiter
+  :param field: index to field
   :rtype: text
   :example:
 
   .. code-block:: sql
 
-    select split_part(‘ab_bc_cd’,‘_’,2);   
+    select split_part('ab_bc_cd','_',2);   
     > bc 
 
 
 
 .. function:: regexp_replace(string text, pattern text, replacement text)
 
-  Replaces substrings matched to a given regular expression pattern
+  Replaces substrings matched to a given regular expression pattern.
 
-  :param string: 
-  :param pattern: 
-  :param replacement: 
+  :param string: input string
+  :param pattern: pattern
+  :param replacement: string substituted for the matching substring
   :rtype: text
   :example:
 
   .. code-block:: sql
 
-    select regexp_replace(‘abcdef’, ‘(ˆab|ef$)’, ‘–’); 
+    select regexp_replace('abcdef', '(ˆab|ef$)', '–'); 
     > –cd–
 
 
 .. function:: upper(string text)
 
-  makes an input text to be upper case
+  Makes an input text to be upper case.
 
-  :param string:
+  :param string: input string
   :rtype: text
   :example:
 
@@ -142,9 +349,9 @@ String Functions and Operators
 
 .. function:: lower(string text)
 
-  makes an input text to be lower case
+  Makes an input text to be lower case.
 
-  :param string:
+  :param string: input string
   :rtype: text
   :example:
 
@@ -152,3 +359,73 @@ String Functions and Operators
 
     select lower('TAJO');
     > tajo
+
+.. function:: lpad(source text, number int4, pad text)
+
+  Fill up the string to length by prepending the characters fill (a space by default). If the string is already longer than length then it is truncated (on the right).
+
+  :param source: source string
+  :param number: padding length
+  :param pad: padding string
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select lpad('hi', 5, 'xy');
+    > xyxhi
+
+.. function:: rpad(source text, number int4, pad text)
+
+  Fill up the string to length length by appending the characters fill (a space by default). If the string is already longer than length then it is truncated.
+
+  :param source: source string
+  :param number: padding length
+  :param pad: padding string
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select rpad('hi', 5, 'xy');
+    > hixyx
+
+.. function:: quote_ident(string text)
+
+  Return the given string suitably quoted to be used as an identifier in an SQL statement string. Quotes are added only if necessary (i.e., if the string contains non-identifier characters or would be case-folded). Embedded quotes are properly doubled.
+
+  :param string: input string
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select quote_ident('Foo bar');
+    > "Foo bar"
+
+.. function:: repeat(string text, number int4)
+
+  Repeat string the specified number of times.
+
+  :param string: input string
+  :param number: repetition number
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select repeat('Pg', 4);
+    > PgPgPgPg
+
+.. function:: reverse(string text)
+
+  Reverse string.
+
+  :param string: input string
+  :rtype: text
+  :example:
+
+  .. code-block:: sql
+
+    select reverse('TAJO');
+    > OJAT
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/getting_started.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/getting_started.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/getting_started.txt (original)
+++ tajo/site/docs/current/_sources/getting_started.txt Tue Oct 27 10:40:08 2015
@@ -9,7 +9,7 @@ Prerequisites
 ======================
 
  * Hadoop 2.3.0 or higher (up to 2.6.0)
- * Java 1.6 or 1.7
+ * Java 1.7 or higher
  * Protocol buffer 2.5.0
 
 ===================================
@@ -152,7 +152,7 @@ If you want to know DDL statements in mo
 
   table name: table1
   table path: file:/home/x/table1
-  store type: CSV
+  store type: TEXT
   number of rows: 0
   volume (bytes): 78 B
   schema:

Modified: tajo/site/docs/current/_sources/index.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/index.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/index.txt (original)
+++ tajo/site/docs/current/_sources/index.txt Tue Oct 27 10:40:08 2015
@@ -15,7 +15,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Apache Tajo™ 0.10.1 Release - User documentation
+Apache Tajo™ (0.11.0 Release) - User documentation
 ===========================================================================
 
 Table of Contents:
@@ -32,9 +32,10 @@ Table of Contents:
    functions
    table_management
    table_partitioning
+   storage_plugins
    index_overview
    backup_and_restore
-   hcatalog_integration
+   hive_integration
    hbase_integration
    swift_integration
    jdbc_driver

Modified: tajo/site/docs/current/_sources/index/how_to_use.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/index/how_to_use.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/index/how_to_use.txt (original)
+++ tajo/site/docs/current/_sources/index/how_to_use.txt Tue Oct 27 10:40:08 2015
@@ -18,7 +18,7 @@ If the index is created successfully, yo
 
   table name: default.lineitem
   table path: hdfs://localhost:7020/tpch/lineitem
-  store type: CSV
+  store type: TEXT
   number of rows: unknown
   volume: 753.9 MB
   Options:
@@ -66,4 +66,4 @@ 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.
\ No newline at end of file
+     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.

Modified: tajo/site/docs/current/_sources/jdbc_driver.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/jdbc_driver.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/jdbc_driver.txt (original)
+++ tajo/site/docs/current/_sources/jdbc_driver.txt Tue Oct 27 10:40:08 2015
@@ -42,6 +42,49 @@ In order to use the JDBC driver, you sho
   CLASSPATH=path/to/tajo-jdbc-x.y.z.jar:$CLASSPATH
 
 
+Connecting to the Tajo cluster instance
+=======================================
+A Tajo cluster is represented by a URL. Tajo JDBC driver can take the following URL forms:
+
+ * ``jdbc:tajo://host/``
+ * ``jdbc:tajo://host/database``
+ * ``jdbc:tajo://host:port/``
+ * ``jdbc:tajo://host:port/database``
+
+Each part of URL has the following meanings:
+
+ * ``host`` - The hostname of the TajoMaster. You can put hostname or ip address here.
+ * ``port`` - The port number that server is listening. Default port number is 26002.
+ * ``database`` - The database name. The default database name is ``default``.
+
+ To connect, you need to get ``Connection`` instance from Java JDBC Driver Manager as follows:
+
+.. code-block:: java
+
+  Connection db = DriverManager.getConnection(url);
+
+
+Connection Parameters
+=====================
+Connection parameters lets the JDBC Copnnection to enable or disable additional features. You should use ``java.util.Properties`` to pass your connection parameters into ``Connection``. The following example means that the transmission of ResultSet uses compression and its connection timeout is 15 seconds. 
+
+.. code-block:: java
+
+  String url = "jdbc:tajo://localhost/test";
+  Properties props = new Properties();
+  props.setProperty("useCompression","true");  // use compression for ResultSet
+  props.setProperty("connectTimeout","15000"); // 15 seconds
+  Connection conn = DriverManager.getConnection(url, props);
+
+The connection parameters that Tajo currently supports are as follows:
+
+ * ``useCompression = bool`` - Enable compressed transfer for ResultSet.
+ * ``defaultRowFetchSize = int`` - Determine the number of rows fetched in ResultSet by one fetch with trip to the Server.
+ * ``connectTimeout = int (seconds)`` - The timeout value used for socket connect operations. If connecting to the server takes longer than this value, the connection is broken. The timeout is specified in seconds and a value of zero means that it is disabled.
+ * ``socketTimeout = int (seconds)`` - The timeout value used for socket read operations. If reading from the server takes longer than this value, the connection is closed. This can be used as both a brute force global query timeout and a method of detecting network problems. The timeout is specified in seconds and a value of zero means that it is disabled.
+ * ``retry = int`` - Number of retry operation. Tajo JDBC driver is resilient against some network or connection problems. It determines how many times the connection will retry.
+
+
 An Example JDBC Client
 =======================
 

Modified: tajo/site/docs/current/_sources/sql_language.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/sql_language.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/sql_language.txt (original)
+++ tajo/site/docs/current/_sources/sql_language.txt Tue Oct 27 10:40:08 2015
@@ -8,6 +8,8 @@ SQL Language
     sql_language/data_model
     sql_language/ddl
     sql_language/insert
-    sql_language/queries    
+    sql_language/alter_table
+    sql_language/queries
+    sql_language/joins
     sql_language/sql_expression
     sql_language/predicates
\ No newline at end of file

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=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/sql_language/ddl.txt (original)
+++ tajo/site/docs/current/_sources/sql_language/ddl.txt Tue Oct 27 10:40:08 2015
@@ -10,8 +10,11 @@ CREATE DATABASE
 
 .. code-block:: sql
 
-  CREATE DATABASE [IF NOT EXISTS] <database_name> 
+  CREATE DATABASE [IF NOT EXISTS] <database_name>
 
+*Description*
+
+Database is the namespace in Tajo. A database can contain multiple tables which have unique name in it.
 ``IF NOT EXISTS`` allows ``CREATE DATABASE`` statement to avoid an error which occurs when the database exists.
 
 ========================
@@ -34,12 +37,20 @@ CREATE TABLE
 
 .. code-block:: sql
 
-  CREATE TABLE [IF NOT EXISTS] <table_name> [(<column_name> <data_type>, ... )]
+  CREATE TABLE [IF NOT EXISTS] <table_name> [(column_list)] [TABLESPACE tablespace_name]
   [using <storage_type> [with (<key> = <value>, ...)]] [AS <select_statement>]
 
-  CREATE EXTERNAL TABLE [IF NOT EXISTS] <table_name> (<column_name> <data_type>, ... )
+  CREATE EXTERNAL TABLE [IF NOT EXISTS] <table_name> (column_list)
   using <storage_type> [with (<key> = <value>, ...)] LOCATION '<path>'
 
+*Description*
+
+In Tajo, there are two types of tables, `managed table` and `external table`.
+Managed tables are placed on some predefined tablespaces. The ``TABLESPACE`` clause is to specify a tablespace for this table. For external tables, Tajo allows an arbitrary table location with the ``LOCATION`` clause.
+For more information about tables and tablespace, please refer to :doc:`/table_management/table_overview` and :doc:`/table_management/tablespaces`.
+
+``column_list`` is a sequence of the column name and its type like ``<column_name> <data_type>, ...``. Additionally, the `asterisk (*)` is allowed for external tables when their data format is `JSON`. You can find more details at :doc:`/table_management/json`.
+
 ``IF NOT EXISTS`` allows ``CREATE [EXTERNAL] TABLE`` statement to avoid an error which occurs when the table does not exist.
 
 ------------------------
@@ -56,7 +67,7 @@ If you want to add an external table tha
   ...
   L_COMMENT text) 
 
-  USING TEXT WITH ('text.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec')
+  USING TEXT WITH ('text.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.SnappyCodec')
   LOCATION 'hdfs://localhost:9010/tajo/warehouse/lineitem_100_snappy';
 
 `compression.codec` parameter can have one of the following compression codecs:
@@ -75,6 +86,8 @@ If you want to add an external table tha
 
   DROP TABLE [IF EXISTS] <table_name> [PURGE]
 
+*Description*
+
 ``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.
 
 ========================
@@ -89,6 +102,11 @@ If you want to add an external table tha
   ( { column_name | ( expression ) } [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )
   [ WHERE predicate ]
 
+*Description*
+
+Tajo supports index for fast data retrieval. Currently, index is supported for only plain ``TEXT`` formats stored on ``HDFS``.
+For more information, please refer to :doc:`/index_overview`.
+
 ------------------------
  Index method
 ------------------------
@@ -106,4 +124,4 @@ Index methods:
 
 .. code-block:: sql
 
-  DROP INDEX name
\ No newline at end of file
+  DROP INDEX name

Modified: tajo/site/docs/current/_sources/sql_language/queries.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/sql_language/queries.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/sql_language/queries.txt (original)
+++ tajo/site/docs/current/_sources/sql_language/queries.txt Tue Oct 27 10:40:08 2015
@@ -127,6 +127,8 @@ For example:
 
   FROM (SELECT * FROM table1) AS alias_name
 
+For more detailed information, please refer to :doc:`joins`.
+
 =====================
 Where Clause
 =====================

Modified: tajo/site/docs/current/_sources/sql_language/sql_expression.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/sql_language/sql_expression.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/sql_language/sql_expression.txt (original)
+++ tajo/site/docs/current/_sources/sql_language/sql_expression.txt Tue Oct 27 10:40:08 2015
@@ -16,16 +16,60 @@ A type cast converts a specified-typed d
   CAST ( expression AS type )
   expression::type
 
+In addition, several functions are provided for type conversion. Please refer to :doc:`../functions/data_type_func_and_operators` and :doc:`../functions/datetime_func_and_operators`.
 
 -------------------------
-String Expressions
+String Literals
 -------------------------
 
+A string constant is an arbitrary sequence of characters bounded by single quotes (``'``):
+
+.. code-block:: sql
+
+  'tajo'
+
+-------------------------
+Function Calls
+-------------------------
+
+The syntax for a function call consists of the name of a function and its argument list enclosed in parentheses:
+
+.. code-block:: sql
+
+  function_name ([expression [, expression ... ]] )
+
+For more information about functions, please refer to :doc:`../functions`.
 
 -------------------------
-Function Call
+Window Function Calls
 -------------------------
 
+A window function call performs aggregate operation across the ``window`` which is a set of rows that are related to the current row. An window function has the following syntax. 
+
 .. code-block:: sql
 
-  function_name ([expression [, expression ... ]] )
\ No newline at end of file
+  function_name OVER ( window_definition )
+
+where *function_name* is the name of aggregation function. Any aggregation function or window function can be used. For built-in aggregation functions and window functions, please refer to :doc:`../functions/agg_func` and :doc:`../functions/window_func`.
+
+*window_definition* has the following syntax.
+
+.. code-block:: sql
+
+  [ PARTITION BY expression [, ...] ]
+  [ ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] ]
+
+In the above syntax, *expression* can be any expression except window function call itself.
+*PARTITION BY* and *ORDER BY* lists have the same syntax and semantics as *GROUP BY* and *ORDER BY* clauses.
+That is, *PARTITION BY* list describes how the output result will be partitioned like *GROUP BY* clause creates multiple partitions according to the value of its expression.
+With *ORDER BY* list, result values are sorted in each partition.
+
+Here are some examples.
+
+.. code-block:: sql
+
+  select l_orderkey, count(*) as cnt, row_number() over (order by count(*) desc) row_num from lineitem group by l_orderkey order by l_orderkey;
+
+  select o_custkey, o_orderstatus, sum(o_totalprice) over (partition by o_custkey) as price from orders;
+
+  select l_linenumber, l_tax, sum(l_quantity) over (partition by l_linenumber order by l_tax desc) as quantity, avg(l_extendedprice) over (partition by l_shipdate) from lineitem order by l_tax;
\ 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=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/table_management.txt (original)
+++ tajo/site/docs/current/_sources/table_management.txt Tue Oct 27 10:40:08 2015
@@ -8,5 +8,6 @@ In Tajo, a table is a logical view of on
     :maxdepth: 1
 
     table_management/table_overview
+    table_management/tablespaces
     table_management/file_formats
     table_management/compression
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/table_management/file_formats.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/table_management/file_formats.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/table_management/file_formats.txt (original)
+++ tajo/site/docs/current/_sources/table_management/file_formats.txt Tue Oct 27 10:40:08 2015
@@ -2,12 +2,14 @@
 File Formats
 *************************************
 
-Currently, Tajo provides four file formats as follows:
+Currently, Tajo provides following file formats:
 
 .. toctree::
     :maxdepth: 1
 
     text
+    json
     rcfile
     parquet
+    orc
     sequencefile
\ No newline at end of file

Modified: tajo/site/docs/current/_sources/table_management/table_overview.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/table_management/table_overview.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/table_management/table_overview.txt (original)
+++ tajo/site/docs/current/_sources/table_management/table_overview.txt Tue Oct 27 10:40:08 2015
@@ -5,15 +5,47 @@ Overview of Tajo Tables
 Overview
 ========
 
+Tablespaces
+===========
+
+Tablespaces is a physical location where files or data objects representing data rows can be stored. Once defined, a tablespace can be referred to by a name when creating a database or a table. Especially, it is very useful when a Tajo cluster instance should use heterogeneous storage systems such as HDFS, MySQL, and Oracle because each tablespace can be specified to use a different storage system. 
+
+Please refer to :doc:`/table_management/tablespaces` if you want to know more information about tablespaces.
+
 Managed Table
 ================
 
-.. todo::
+``CREATE TABLE`` statement lets you create a table located in the warehouse directory specified by the configuration property ``tajo.warehouse.directory`` or ``${tajo.root}/warehouse`` by default. For example:
+
+.. code-block:: sql
+
+ CREATE TABLE employee (
+  id int,
+  name text,
+  age
+ );
+
 
 External Table
 ================
 
-.. todo::
+``CREATE EXTERNAL TABLE`` statement lets you create a table located in a specify location so that Tajo does not use a default data warehouse location for the table. External tables are in common used if you already have data generated. LOCATION clause must be required for an external table. 
+
+.. code-block:: sql
+
+ CREATE EXTERNAL TABLE employee (
+  id int,
+  name text,
+  age
+ ) LOCATION 'hdfs://table/path';
+
+
+The location can be a directory located in HDFS, Amazon S3, HBase, or local file system (if a Tajo cluster runs in a single machine). URI examples are as follows:
+
+ * HDFS - ``hdfs://hostname:8020/table1``
+ * Amazon S3 - ``s3://bucket-name/table1``
+ * local file system - ``file:///dir/table1``
+ * Openstack Swift - ``swift://bucket-name/table1``
 
 Table Properties
 ================

Modified: tajo/site/docs/current/_sources/table_management/text.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/table_management/text.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/table_management/text.txt (original)
+++ tajo/site/docs/current/_sources/table_management/text.txt Tue Oct 27 10:40:08 2015
@@ -1,16 +1,16 @@
-*************************************
+****
 TEXT
-*************************************
+****
 
-A character-separated values plain-text file represents a tabular data set consisting of rows and columns.
-Each row is a plan-text line. A line is usually broken by a character line feed ``\n`` or carriage-return ``\r``.
+A character-separated values plain text file represents a tabular data set consisting of rows and columns.
+Each row is a plain text line. A line is usually broken by a character line feed ``\n`` or carriage-return ``\r``.
 The line feed ``\n`` is the default delimiter in Tajo. Each record consists of multiple fields, separated by
 some other character or string, most commonly a literal vertical bar ``|``, comma ``,`` or tab ``\t``.
 The vertical bar is used as the default field delimiter in Tajo.
 
-=========================================
+============================
 How to Create a TEXT Table ?
-=========================================
+============================
 
 If you are not familiar with the ``CREATE TABLE`` statement, please refer to the Data Definition Language :doc:`/sql_language/ddl`.
 
@@ -27,9 +27,9 @@ statement. The below is an example state
     type text
   ) USING TEXT;
 
-=========================================
+===================
 Physical Properties
-=========================================
+===================
 
 Some table storage formats provide parameters for enabling or disabling features and adjusting physical parameters.
 The ``WITH`` clause in the CREATE TABLE statement allows users to set those parameters.
@@ -42,10 +42,13 @@ The ``WITH`` clause in the CREATE TABLE
 * ``text.serde``: custom (De)serializer class. ``org.apache.tajo.storage.text.CSVLineSerDe`` 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.
 
+* ``text.skip.headerlines``: Number of header lines to be skipped. Some text files often have a header which has a kind of metadata(e.g.: column names), thus this option can be useful.
+
 The following example is to set a custom field delimiter, ``NULL`` character, and compression codec:
 
 .. code-block:: sql
@@ -64,13 +67,13 @@ The following example is to set a custom
   Be careful when using ``\n`` as the field delimiter because *TEXT* format tables use ``\n`` as the line delimiter.
   At the moment, Tajo does not provide a way to specify the line delimiter.
 
-=========================================
+=====================
 Custom (De)serializer
-=========================================
+=====================
 
 The *TEXT* format not only provides reading and writing interfaces for text data but also allows users to process custom
-plan-text file formats with user-defined (De)serializer classes.
-For example, with custom (de)serializers, Tajo can process JSON file formats or any specialized plan-text file formats.
+plain text file formats with user-defined (De)serializer classes.
+With custom (de)serializers, Tajo can process any text files no matter which the internal structure is.
 
 In order to specify a custom (De)serializer, set a physical property ``text.serde``.
 The property value should be a fully qualified class name.
@@ -87,17 +90,17 @@ For example:
  ) USING TEXT WITH ('text.serde'='org.my.storage.CustomSerializerDeserializer')
 
 
-=========================================
+==========================
 Null Value Handling Issues
-=========================================
+==========================
 In default, ``NULL`` character in *TEXT* format 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``.
 
-=========================================
+======================================
 Compatibility Issues with Apache Hive™
-=========================================
+======================================
 
 *TEXT* tables generated in Tajo can be processed directly by Apache Hive™ without further processing.
 In this section, we explain some compatibility issue for users who use both Hive and Tajo.

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=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/tsql/meta_command.txt (original)
+++ tajo/site/docs/current/_sources/tsql/meta_command.txt Tue Oct 27 10:40:08 2015
@@ -80,7 +80,7 @@ Basic usages
 
   table name: orders
   table path: hdfs:/xxx/xxx/tpch/orders
-  store type: CSV
+  store type: TEXT
   number of rows: 0
   volume (bytes): 172.0 MB
   schema:

Modified: tajo/site/docs/current/_sources/tsql/variables.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/tsql/variables.txt?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/tsql/variables.txt (original)
+++ tajo/site/docs/current/_sources/tsql/variables.txt Tue Oct 27 10:40:08 2015
@@ -56,10 +56,6 @@ Now, tajo provides the following session
 * ``DATE_ORDER``
 * ``TEXT_NULL``
 * ``DEBUG_ENABLED``
-* ``TEST_BROADCAST_JOIN_ENABLED``
-* ``TEST_JOIN_OPT_ENABLED``
-* ``TEST_FILTER_PUSHDOWN_ENABLED``
-* ``TEST_MIN_TASK_NUM``
 * ``BEHAVIOR_ARITHMETIC_ABORT``
 * ``RESULT_SET_FETCH_ROWNUM``
 

Modified: tajo/site/docs/current/backup_and_restore.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/backup_and_restore.html?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/backup_and_restore.html (original)
+++ tajo/site/docs/current/backup_and_restore.html Tue Oct 27 10:40:08 2015
@@ -94,7 +94,9 @@
 <li class="toctree-l2"><a class="reference internal" href="sql_language/data_model.html">Data Model</a></li>
 <li class="toctree-l2"><a class="reference internal" href="sql_language/ddl.html">Data Definition Language</a></li>
 <li class="toctree-l2"><a class="reference internal" href="sql_language/insert.html">INSERT (OVERWRITE) INTO</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sql_language/alter_table.html">ALTER TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="sql_language/queries.html">Queries</a></li>
+<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>
 </ul>
@@ -108,15 +110,15 @@
 </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>
-<li class="toctree-l2"><a class="reference internal" href="functions/datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="functions/network_func_and_operators.html">Network Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="functions/json_func.html">JSON Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#built-in-scalar-functions">Built-in Scalar Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#built-in-aggregation-functions">Built-in Aggregation Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#built-in-window-functions">Built-in Window Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#user-defined-functions">User-defined Functions</a></li>
 </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/tablespaces.html">Tablespaces</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,6 +130,11 @@
 <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="storage_plugins.html">Storage Plugin</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="storage_plugins/overview.html">Storage Plugin Overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage_plugins/postgresql.html">PostgreSQL Storage Handler</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>
@@ -138,7 +145,7 @@
 <li class="toctree-l2"><a class="reference internal" href="backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="hcatalog_integration.html">HCatalog Integration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="hive_integration.html">Hive Integration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="hbase_integration.html">HBase Integration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="hbase_integration.html#create-table">CREATE TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="hbase_integration.html#drop-table">DROP TABLE</a></li>
@@ -156,6 +163,8 @@
 <li class="toctree-l1"><a class="reference internal" href="jdbc_driver.html">Tajo JDBC Driver</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#how-to-get-jdbc-driver">How to get JDBC driver</a></li>
 <li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#setting-the-classpath">Setting the CLASSPATH</a></li>
+<li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#connecting-to-the-tajo-cluster-instance">Connecting to the Tajo cluster instance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#connection-parameters">Connection Parameters</a></li>
 <li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#an-example-jdbc-client">An Example JDBC Client</a></li>
 </ul>
 </li>

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=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/backup_and_restore/catalog.html (original)
+++ tajo/site/docs/current/backup_and_restore/catalog.html Tue Oct 27 10:40:08 2015
@@ -30,7 +30,7 @@
   
     <link rel="top" title="Apache Tajo 0.11.0 documentation" href="../index.html"/>
         <link rel="up" title="Backup and Restore" href="../backup_and_restore.html"/>
-        <link rel="next" title="HCatalog Integration" href="../hcatalog_integration.html"/>
+        <link rel="next" title="Hive Integration" href="../hive_integration.html"/>
         <link rel="prev" title="Backup and Restore" href="../backup_and_restore.html"/> 
 
   
@@ -95,7 +95,9 @@
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/data_model.html">Data Model</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/ddl.html">Data Definition Language</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/insert.html">INSERT (OVERWRITE) INTO</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/alter_table.html">ALTER TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/queries.html">Queries</a></li>
+<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>
 </ul>
@@ -109,15 +111,15 @@
 </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>
-<li class="toctree-l2"><a class="reference internal" href="../functions/datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../functions/network_func_and_operators.html">Network Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../functions/json_func.html">JSON Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#built-in-scalar-functions">Built-in Scalar Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#built-in-aggregation-functions">Built-in Aggregation Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#built-in-window-functions">Built-in Window Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#user-defined-functions">User-defined Functions</a></li>
 </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/tablespaces.html">Tablespaces</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>
@@ -129,6 +131,11 @@
 <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="../storage_plugins.html">Storage Plugin</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="../storage_plugins/overview.html">Storage Plugin Overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../storage_plugins/postgresql.html">PostgreSQL Storage Handler</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>
@@ -139,7 +146,7 @@
 <li class="toctree-l2 current"><a class="current reference internal" href="">Backup and Restore Catalog</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../hcatalog_integration.html">HCatalog Integration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../hive_integration.html">Hive Integration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../hbase_integration.html">HBase Integration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../hbase_integration.html#create-table">CREATE TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../hbase_integration.html#drop-table">DROP TABLE</a></li>
@@ -157,6 +164,8 @@
 <li class="toctree-l1"><a class="reference internal" href="../jdbc_driver.html">Tajo JDBC Driver</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#how-to-get-jdbc-driver">How to get JDBC driver</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#setting-the-classpath">Setting the CLASSPATH</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#connecting-to-the-tajo-cluster-instance">Connecting to the Tajo cluster instance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#connection-parameters">Connection Parameters</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#an-example-jdbc-client">An Example JDBC Client</a></li>
 </ul>
 </li>
@@ -220,7 +229,7 @@ $ cat table_backup.sql
 --
 
 --
--- Name: customer; Type: TABLE; Storage: CSV
+-- Name: customer; Type: TABLE; Storage: TEXT
 -- Path: file:/home/hyunsik/tpch/customer
 --
 CREATE EXTERNAL TABLE customer (c_custkey INT8, c_name TEXT, c_address TEXT, c_nationkey INT8, c_phone TEXT, c_acctbal FLOAT8, c_mktsegment TEXT, c_comment TEXT) USING TEXT LOCATION &#39;file:/home/hyunsik/tpch/customer&#39;;
@@ -249,7 +258,7 @@ CREATE EXTERNAL TABLE customer (c_custke
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       
-        <a href="../hcatalog_integration.html" class="btn btn-neutral float-right" title="HCatalog Integration"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="../hive_integration.html" class="btn btn-neutral float-right" title="Hive Integration"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
         <a href="../backup_and_restore.html" class="btn btn-neutral" title="Backup and Restore"><span class="fa fa-arrow-circle-left"></span> Previous</a>

Modified: tajo/site/docs/current/configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration.html?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/configuration.html (original)
+++ tajo/site/docs/current/configuration.html Tue Oct 27 10:40:08 2015
@@ -94,7 +94,9 @@
 <li class="toctree-l2"><a class="reference internal" href="sql_language/data_model.html">Data Model</a></li>
 <li class="toctree-l2"><a class="reference internal" href="sql_language/ddl.html">Data Definition Language</a></li>
 <li class="toctree-l2"><a class="reference internal" href="sql_language/insert.html">INSERT (OVERWRITE) INTO</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sql_language/alter_table.html">ALTER TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="sql_language/queries.html">Queries</a></li>
+<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>
 </ul>
@@ -108,15 +110,15 @@
 </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>
-<li class="toctree-l2"><a class="reference internal" href="functions/datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="functions/network_func_and_operators.html">Network Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="functions/json_func.html">JSON Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#built-in-scalar-functions">Built-in Scalar Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#built-in-aggregation-functions">Built-in Aggregation Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#built-in-window-functions">Built-in Window Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#user-defined-functions">User-defined Functions</a></li>
 </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/tablespaces.html">Tablespaces</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,6 +130,11 @@
 <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="storage_plugins.html">Storage Plugin</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="storage_plugins/overview.html">Storage Plugin Overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="storage_plugins/postgresql.html">PostgreSQL Storage Handler</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>
@@ -138,7 +145,7 @@
 <li class="toctree-l2"><a class="reference internal" href="backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="hcatalog_integration.html">HCatalog Integration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="hive_integration.html">Hive Integration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="hbase_integration.html">HBase Integration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="hbase_integration.html#create-table">CREATE TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="hbase_integration.html#drop-table">DROP TABLE</a></li>
@@ -156,6 +163,8 @@
 <li class="toctree-l1"><a class="reference internal" href="jdbc_driver.html">Tajo JDBC Driver</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#how-to-get-jdbc-driver">How to get JDBC driver</a></li>
 <li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#setting-the-classpath">Setting the CLASSPATH</a></li>
+<li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#connecting-to-the-tajo-cluster-instance">Connecting to the Tajo cluster instance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#connection-parameters">Connection Parameters</a></li>
 <li class="toctree-l2"><a class="reference internal" href="jdbc_driver.html#an-example-jdbc-client">An Example JDBC Client</a></li>
 </ul>
 </li>

Modified: tajo/site/docs/current/configuration/catalog-site-xml.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/catalog-site-xml.html?rev=1710762&r1=1710761&r2=1710762&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/catalog-site-xml.html (original)
+++ tajo/site/docs/current/configuration/catalog-site-xml.html Tue Oct 27 10:40:08 2015
@@ -95,7 +95,9 @@
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/data_model.html">Data Model</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/ddl.html">Data Definition Language</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/insert.html">INSERT (OVERWRITE) INTO</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../sql_language/alter_table.html">ALTER TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../sql_language/queries.html">Queries</a></li>
+<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>
 </ul>
@@ -109,15 +111,15 @@
 </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>
-<li class="toctree-l2"><a class="reference internal" href="../functions/datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../functions/network_func_and_operators.html">Network Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="../functions/json_func.html">JSON Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#built-in-scalar-functions">Built-in Scalar Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#built-in-aggregation-functions">Built-in Aggregation Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#built-in-window-functions">Built-in Window Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#user-defined-functions">User-defined Functions</a></li>
 </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/tablespaces.html">Tablespaces</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>
@@ -129,6 +131,11 @@
 <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="../storage_plugins.html">Storage Plugin</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="../storage_plugins/overview.html">Storage Plugin Overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../storage_plugins/postgresql.html">PostgreSQL Storage Handler</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>
@@ -139,7 +146,7 @@
 <li class="toctree-l2"><a class="reference internal" href="../backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="../hcatalog_integration.html">HCatalog Integration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../hive_integration.html">Hive Integration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../hbase_integration.html">HBase Integration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../hbase_integration.html#create-table">CREATE TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../hbase_integration.html#drop-table">DROP TABLE</a></li>
@@ -157,6 +164,8 @@
 <li class="toctree-l1"><a class="reference internal" href="../jdbc_driver.html">Tajo JDBC Driver</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#how-to-get-jdbc-driver">How to get JDBC driver</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#setting-the-classpath">Setting the CLASSPATH</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#connecting-to-the-tajo-cluster-instance">Connecting to the Tajo cluster instance</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#connection-parameters">Connection Parameters</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../jdbc_driver.html#an-example-jdbc-client">An Example JDBC Client</a></li>
 </ul>
 </li>



Mime
View raw message