tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject svn commit: r1674454 [1/4] - in /tajo/site/docs/devel: ./ _sources/ _sources/backup_and_restore/ _sources/configuration/ _sources/sql_language/ _sources/table_management/ _static/ backup_and_restore/ configuration/ functions/ index/ partitioning/ sql_l...
Date Sat, 18 Apr 2015 08:35:50 GMT
Author: jihoonson
Date: Sat Apr 18 08:35:49 2015
New Revision: 1674454

URL: http://svn.apache.org/r1674454
Log:
Add Python document.

Modified:
    tajo/site/docs/devel/_sources/backup_and_restore/catalog.txt
    tajo/site/docs/devel/_sources/configuration/catalog_configuration.txt
    tajo/site/docs/devel/_sources/functions.txt
    tajo/site/docs/devel/_sources/getting_started.txt
    tajo/site/docs/devel/_sources/index.txt
    tajo/site/docs/devel/_sources/sql_language/ddl.txt
    tajo/site/docs/devel/_sources/table_management/file_formats.txt
    tajo/site/docs/devel/_sources/table_management/table_overview.txt
    tajo/site/docs/devel/_static/basic.css
    tajo/site/docs/devel/_static/doctools.js
    tajo/site/docs/devel/_static/pygments.css
    tajo/site/docs/devel/_static/searchtools.js
    tajo/site/docs/devel/_static/websupport.js
    tajo/site/docs/devel/backup_and_restore.html
    tajo/site/docs/devel/backup_and_restore/catalog.html
    tajo/site/docs/devel/configuration.html
    tajo/site/docs/devel/configuration/catalog-site-xml.html
    tajo/site/docs/devel/configuration/catalog_configuration.html
    tajo/site/docs/devel/configuration/cluster_setup.html
    tajo/site/docs/devel/configuration/ha_configuration.html
    tajo/site/docs/devel/configuration/preliminary.html
    tajo/site/docs/devel/configuration/service_config_defaults.html
    tajo/site/docs/devel/configuration/tajo-site-xml.html
    tajo/site/docs/devel/configuration/tajo_master_configuration.html
    tajo/site/docs/devel/configuration/worker_configuration.html
    tajo/site/docs/devel/faq.html
    tajo/site/docs/devel/functions.html
    tajo/site/docs/devel/functions/datetime_func_and_operators.html
    tajo/site/docs/devel/functions/math_func_and_operators.html
    tajo/site/docs/devel/functions/network_func_and_operators.html
    tajo/site/docs/devel/functions/string_func_and_operators.html
    tajo/site/docs/devel/genindex.html
    tajo/site/docs/devel/getting_started.html
    tajo/site/docs/devel/hbase_integration.html
    tajo/site/docs/devel/index.html
    tajo/site/docs/devel/index/future_work.html
    tajo/site/docs/devel/index/how_to_use.html
    tajo/site/docs/devel/index/types.html
    tajo/site/docs/devel/index_overview.html
    tajo/site/docs/devel/introduction.html
    tajo/site/docs/devel/jdbc_driver.html
    tajo/site/docs/devel/objects.inv
    tajo/site/docs/devel/partitioning/column_partitioning.html
    tajo/site/docs/devel/partitioning/hash_partitioning.html
    tajo/site/docs/devel/partitioning/intro_to_partitioning.html
    tajo/site/docs/devel/partitioning/range_partitioning.html
    tajo/site/docs/devel/search.html
    tajo/site/docs/devel/searchindex.js
    tajo/site/docs/devel/sql_language.html
    tajo/site/docs/devel/sql_language/data_model.html
    tajo/site/docs/devel/sql_language/ddl.html
    tajo/site/docs/devel/sql_language/insert.html
    tajo/site/docs/devel/sql_language/predicates.html
    tajo/site/docs/devel/sql_language/queries.html
    tajo/site/docs/devel/sql_language/sql_expression.html
    tajo/site/docs/devel/swift_integration.html
    tajo/site/docs/devel/table_management.html
    tajo/site/docs/devel/table_management/compression.html
    tajo/site/docs/devel/table_management/file_formats.html
    tajo/site/docs/devel/table_management/parquet.html
    tajo/site/docs/devel/table_management/rcfile.html
    tajo/site/docs/devel/table_management/sequencefile.html
    tajo/site/docs/devel/table_management/table_overview.html
    tajo/site/docs/devel/table_partitioning.html
    tajo/site/docs/devel/tajo_client_api.html
    tajo/site/docs/devel/time_zone.html
    tajo/site/docs/devel/tsql.html
    tajo/site/docs/devel/tsql/admin_command.html
    tajo/site/docs/devel/tsql/background_command.html
    tajo/site/docs/devel/tsql/dfs_command.html
    tajo/site/docs/devel/tsql/execute_file.html
    tajo/site/docs/devel/tsql/intro.html
    tajo/site/docs/devel/tsql/meta_command.html
    tajo/site/docs/devel/tsql/single_command.html
    tajo/site/docs/devel/tsql/variables.html

Modified: tajo/site/docs/devel/_sources/backup_and_restore/catalog.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/backup_and_restore/catalog.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/backup_and_restore/catalog.txt (original)
+++ tajo/site/docs/devel/_sources/backup_and_restore/catalog.txt Sat Apr 18 08:35:49 2015
@@ -28,7 +28,7 @@ For example, if you want to backup a tab
   -- Name: customer; Type: TABLE; Storage: CSV
   -- 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 CSV LOCATION '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';
   
 
 If you want to restore the catalog from the SQL dump file, please type the below command: ::

Modified: tajo/site/docs/devel/_sources/configuration/catalog_configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/configuration/catalog_configuration.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/configuration/catalog_configuration.txt (original)
+++ tajo/site/docs/devel/_sources/configuration/catalog_configuration.txt Sat Apr 18 08:35:49 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/devel/_sources/functions.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/functions.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/functions.txt (original)
+++ tajo/site/docs/devel/_sources/functions.txt Sat Apr 18 08:35:49 2015
@@ -2,10 +2,79 @@
 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 Functions
+===================
+
 .. toctree::
     :maxdepth: 1
 
     functions/math_func_and_operators
     functions/string_func_and_operators
     functions/datetime_func_and_operators
-    functions/network_func_and_operators
\ No newline at end of file
+    functions/network_func_and_operators
+    functions/json_func
+
+==============================
+Python User-defined Functions
+==============================
+
+-----------------------
+Function registration
+-----------------------
+
+To register Python UDFs, you must install script files in all cluster nodes.
+After that, you can register your functions by specifying the paths to those script files in ``tajo-site.xml``. Here is an example of the configuration.
+
+.. code-block:: xml
+
+  <property>
+    <name>tajo.function.python.code-dir</name>
+    <value>/path/to/script1.py,/path/to/script2.py</value>
+  </property>
+
+Please note that you can specify multiple paths with ``','`` as a delimiter. Each file can contain multiple functions. Here is a typical example of a script file.
+
+.. code-block:: python
+
+  # /path/to/script1.py
+
+  @outputType('int4')
+  def return_one():
+    return 1
+
+  @outputType("text")
+  def helloworld():
+    return 'Hello, World'
+
+  # No decorator - blob
+  def concat_py(str):
+    return str+str
+
+  @outputType('int4')
+  def sum_py(a,b):
+    return a+b
+
+If the configuration is set properly, every function in the script files are registered when the Tajo cluster starts up.
+
+-----------------------
+Decorators and types
+-----------------------
+
+By default, every function has a return type of ``BLOB``.
+You can use Python decorators to define output types for the script functions. Tajo can figure out return types from the annotations of the Python script.
+
+* ``outputType``: Defines the return data type for a script UDF in a format that Tajo can understand. The defined type must be one of the types supported by Tajo. For supported types, please refer to :doc:`/sql_language/data_model`.
+
+-----------------------
+Query example
+-----------------------
+
+Once the Python UDFs are successfully registered, you can use them as other built-in functions.
+
+.. code-block:: sql
+
+  default> select concat_py(n_name)::text from nation where sum_py(n_regionkey,1) > 2;
+

Modified: tajo/site/docs/devel/_sources/getting_started.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/getting_started.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/getting_started.txt (original)
+++ tajo/site/docs/devel/_sources/getting_started.txt Sat Apr 18 08:35:49 2015
@@ -8,7 +8,7 @@ In this section, we explain setup of a s
 Prerequisites
 ======================
 
- * Hadoop 2.3.0 or higher (up to 2.5.1)
+ * Hadoop 2.3.0 or higher (up to 2.6.0)
  * Java 1.6 or 1.7
  * Protocol buffer 2.5.0
 
@@ -135,7 +135,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 text 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. 

Modified: tajo/site/docs/devel/_sources/index.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/index.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/index.txt (original)
+++ tajo/site/docs/devel/_sources/index.txt Sat Apr 18 08:35:49 2015
@@ -39,7 +39,7 @@ Table of Contents:
    table_partitioning
    index_overview
    backup_and_restore
-   hcatalog_integration
+   hive_integration
    hbase_integration
    swift_integration
    jdbc_driver

Modified: tajo/site/docs/devel/_sources/sql_language/ddl.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/sql_language/ddl.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/sql_language/ddl.txt (original)
+++ tajo/site/docs/devel/_sources/sql_language/ddl.txt Sat Apr 18 08:35:49 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 TEXT WITH ('text.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:

Modified: tajo/site/docs/devel/_sources/table_management/file_formats.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/file_formats.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/file_formats.txt (original)
+++ tajo/site/docs/devel/_sources/table_management/file_formats.txt Sat Apr 18 08:35:49 2015
@@ -7,7 +7,7 @@ Currently, Tajo provides four file forma
 .. toctree::
     :maxdepth: 1
 
-    csv
+    text
     rcfile
     parquet
     sequencefile
\ No newline at end of file

Modified: tajo/site/docs/devel/_sources/table_management/table_overview.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/table_overview.txt?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/table_overview.txt (original)
+++ tajo/site/docs/devel/_sources/table_management/table_overview.txt Sat Apr 18 08:35:49 2015
@@ -29,9 +29,9 @@ The following example is to set a custom
   name text,
   score float,
   type text
- ) USING CSV WITH('text.delimiter'='\u0001',
-                  'text.null'='\\N',
-                  'compression.codec'='org.apache.hadoop.io.compress.SnappyCodec');
+ ) USING TEXT WITH('text.delimiter'='\u0001',
+                   'text.null'='\\N',
+                   'compression.codec'='org.apache.hadoop.io.compress.SnappyCodec');
 
 Each physical table layout has its own specialized properties. They will be addressed in :doc:`/table_management/file_formats`.
 

Modified: tajo/site/docs/devel/_static/basic.css
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/basic.css?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/basic.css (original)
+++ tajo/site/docs/devel/_static/basic.css Sat Apr 18 08:35:49 2015
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

Modified: tajo/site/docs/devel/_static/doctools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/doctools.js?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/doctools.js (original)
+++ tajo/site/docs/devel/_static/doctools.js Sat Apr 18 08:35:49 2015
@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilities for all documentation.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

Modified: tajo/site/docs/devel/_static/pygments.css
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/pygments.css?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/pygments.css (original)
+++ tajo/site/docs/devel/_static/pygments.css Sat Apr 18 08:35:49 2015
@@ -48,6 +48,7 @@
 .highlight .nv { color: #000000 } /* Name.Variable */
 .highlight .ow { color: #204a87; font-weight: bold } /* Operator.Word */
 .highlight .w { color: #f8f8f8; text-decoration: underline } /* Text.Whitespace */
+.highlight .mb { color: #0000cf; font-weight: bold } /* Literal.Number.Bin */
 .highlight .mf { color: #0000cf; font-weight: bold } /* Literal.Number.Float */
 .highlight .mh { color: #0000cf; font-weight: bold } /* Literal.Number.Hex */
 .highlight .mi { color: #0000cf; font-weight: bold } /* Literal.Number.Integer */

Modified: tajo/site/docs/devel/_static/searchtools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/searchtools.js?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/searchtools.js (original)
+++ tajo/site/docs/devel/_static/searchtools.js Sat Apr 18 08:35:49 2015
@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilties for the full-text search.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

Modified: tajo/site/docs/devel/_static/websupport.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/websupport.js?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/websupport.js (original)
+++ tajo/site/docs/devel/_static/websupport.js Sat Apr 18 08:35:49 2015
@@ -4,7 +4,7 @@
  *
  * sphinx.websupport utilties for all documentation.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

Modified: tajo/site/docs/devel/backup_and_restore.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/backup_and_restore.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/backup_and_restore.html (original)
+++ tajo/site/docs/devel/backup_and_restore.html Sat Apr 18 08:35:49 2015
@@ -108,10 +108,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -137,7 +135,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>

Modified: tajo/site/docs/devel/backup_and_restore/catalog.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/backup_and_restore/catalog.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/backup_and_restore/catalog.html (original)
+++ tajo/site/docs/devel/backup_and_restore/catalog.html Sat Apr 18 08:35:49 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"/> 
 
   
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>
@@ -222,7 +220,7 @@ $ cat table_backup.sql
 -- Name: customer; Type: TABLE; Storage: CSV
 -- 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 CSV LOCATION &#39;file:/home/hyunsik/tpch/customer&#39;;
+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;;
 </pre></div>
 </div>
 <p>If you want to restore the catalog from the SQL dump file, please type the below command:</p>
@@ -248,7 +246,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/devel/configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration.html (original)
+++ tajo/site/docs/devel/configuration.html Sat Apr 18 08:35:49 2015
@@ -108,10 +108,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -137,7 +135,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>

Modified: tajo/site/docs/devel/configuration/catalog-site-xml.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/catalog-site-xml.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/catalog-site-xml.html (original)
+++ tajo/site/docs/devel/configuration/catalog-site-xml.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/catalog_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/catalog_configuration.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/catalog_configuration.html (original)
+++ tajo/site/docs/devel/configuration/catalog_configuration.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>
@@ -206,8 +204,8 @@
 </ul>
 <table border="1" class="docutils">
 <colgroup>
-<col width="42%" />
-<col width="58%" />
+<col width="44%" />
+<col width="56%" />
 </colgroup>
 <thead valign="bottom">
 <tr class="row-odd"><th class="head">Driver Class</th>
@@ -229,7 +227,7 @@
 in unit tests to shorten the duration of unit
 tests.</td>
 </tr>
-<tr class="row-even"><td>tajo.catalog.store.HCatalogStore</td>
+<tr class="row-even"><td>tajo.catalog.store.HiveCatalogStore</td>
 <td>this storage class uses HiveMetaStore.</td>
 </tr>
 </tbody>
@@ -266,14 +264,14 @@ tests.</td>
 <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="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>;
-Query OK, 0 rows affected <span class="o">(</span>0.00 sec<span class="o">)</span>
+<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>
 
-mysql&gt; create database tajo;
-Query OK, 1 row affected <span class="o">(</span>0.00 sec<span class="o">)</span>
+mysql&gt; create database tajo<span class="p">;</span>
+Query OK, <span class="m">1</span> row affected <span class="o">(</span>0.00 sec<span class="o">)</span>
 
-mysql&gt; grant all on tajo.* to <span class="s1">&#39;tajo&#39;</span>@<span class="s1">&#39;localhost&#39;</span>;
-Query OK, 0 rows affected <span class="o">(</span>0.01 sec<span class="o">)</span>
+mysql&gt; grant all on tajo.* to <span class="s1">&#39;tajo&#39;</span>@<span class="s1">&#39;localhost&#39;</span><span class="p">;</span>
+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>
@@ -343,16 +341,15 @@ Query OK, 0 rows affected <span class="o
 </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>
-<p>Tajo support HCatalogStore to integrate with hive. If you want to use HCatalogStore, you just do as follows.</p>
+<div class="section" id="hivecatalogstore-configuration">
+<h2>HiveCatalogStore Configuration<a class="headerlink" href="#hivecatalogstore-configuration" title="Permalink to this headline">¶</a></h2>
+<p>Tajo support HiveCatalogStore to integrate with hive. If you want to use HiveCatalogStore, you just do as follows.</p>
 <p>First, you must compile source code and get a binary archive as follows:</p>
 <div class="highlight-sh"><div class="highlight"><pre><span class="nv">$ </span>git clone https://git-wip-us.apache.org/repos/asf/tajo.git tajo
-<span class="nv">$ </span>mvn clean install -DskipTests -Pdist -Dtar -Phcatalog-0.1x.0
+<span class="nv">$ </span>mvn clean install -DskipTests -Pdist -Dtar
 <span class="nv">$ </span>ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 </pre></div>
 </div>
-<p>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 <tt class="docutils literal"><span class="pre">-Phcatalog-0.12.0</span></tt>.</p>
 <p>Second, you must set your hive home directory to HIVE_HOME 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">HIVE_HOME</span><span class="o">=</span>/path/to/your/hive/directory
 </pre></div>
@@ -364,7 +361,7 @@ Query OK, 0 rows affected <span class="o
 <p>Lastly, you should add the following config to <tt class="docutils literal"><span class="pre">conf/catalog-site.xml</span></tt> :</p>
 <div class="highlight-xml"><div class="highlight"><pre><span class="nt">&lt;property&gt;</span>
   <span class="nt">&lt;name&gt;</span>tajo.catalog.store.class<span class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>org.apache.tajo.catalog.store.HCatalogStore<span class="nt">&lt;/value&gt;</span>
+  <span class="nt">&lt;value&gt;</span>org.apache.tajo.catalog.store.HiveCatalogStore<span class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
 </pre></div>
 </div>

Modified: tajo/site/docs/devel/configuration/cluster_setup.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/cluster_setup.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/cluster_setup.html (original)
+++ tajo/site/docs/devel/configuration/cluster_setup.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/ha_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/ha_configuration.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/ha_configuration.html (original)
+++ tajo/site/docs/devel/configuration/ha_configuration.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/preliminary.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/preliminary.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/preliminary.html (original)
+++ tajo/site/docs/devel/configuration/preliminary.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/service_config_defaults.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/service_config_defaults.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/service_config_defaults.html (original)
+++ tajo/site/docs/devel/configuration/service_config_defaults.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/tajo-site-xml.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/tajo-site-xml.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/tajo-site-xml.html (original)
+++ tajo/site/docs/devel/configuration/tajo-site-xml.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/tajo_master_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/tajo_master_configuration.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/tajo_master_configuration.html (original)
+++ tajo/site/docs/devel/configuration/tajo_master_configuration.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/configuration/worker_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/worker_configuration.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/worker_configuration.html (original)
+++ tajo/site/docs/devel/configuration/worker_configuration.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/faq.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/faq.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/faq.html (original)
+++ tajo/site/docs/devel/faq.html Sat Apr 18 08:35:49 2015
@@ -107,10 +107,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -136,7 +134,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>

Modified: tajo/site/docs/devel/functions.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/functions.html (original)
+++ tajo/site/docs/devel/functions.html Sat Apr 18 08:35:49 2015
@@ -108,10 +108,8 @@
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">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="#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -137,7 +135,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>
@@ -196,15 +194,70 @@
             
   <div class="section" id="functions">
 <h1>Functions<a class="headerlink" href="#functions" title="Permalink to this headline">¶</a></h1>
+<p>Tajo provides extensive supports for functions. It includes a lot of built-in functions and user-defined functions which is implemented in Python.</p>
+<div class="section" id="built-in-functions">
+<h2>Built-in Functions<a class="headerlink" href="#built-in-functions" title="Permalink to this headline">¶</a></h2>
 <div class="toctree-wrapper compound">
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="functions/math_func_and_operators.html">Math Functions and Operators</a></li>
 <li class="toctree-l1"><a class="reference internal" href="functions/string_func_and_operators.html">String Functions and Operators</a></li>
 <li class="toctree-l1"><a class="reference internal" href="functions/datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
 <li class="toctree-l1"><a class="reference internal" href="functions/network_func_and_operators.html">Network Functions and Operators</a></li>
+<li class="toctree-l1"><a class="reference internal" href="functions/json_func.html">JSON Functions</a></li>
 </ul>
 </div>
 </div>
+<div class="section" id="python-user-defined-functions">
+<h2>Python User-defined Functions<a class="headerlink" href="#python-user-defined-functions" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="function-registration">
+<h3>Function registration<a class="headerlink" href="#function-registration" title="Permalink to this headline">¶</a></h3>
+<p>To register Python UDFs, you must install script files in all cluster nodes.
+After that, you can register your functions by specifying the paths to those script files in <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt>. Here is an example of the configuration.</p>
+<div class="highlight-xml"><div class="highlight"><pre><span class="nt">&lt;property&gt;</span>
+  <span class="nt">&lt;name&gt;</span>tajo.function.python.code-dir<span class="nt">&lt;/name&gt;</span>
+  <span class="nt">&lt;value&gt;</span>/path/to/script1.py,/path/to/script2.py<span class="nt">&lt;/value&gt;</span>
+<span class="nt">&lt;/property&gt;</span>
+</pre></div>
+</div>
+<p>Please note that you can specify multiple paths with <tt class="docutils literal"><span class="pre">','</span></tt> as a delimiter. Each file can contain multiple functions. Here is a typical example of a script file.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># /path/to/script1.py</span>
+
+<span class="nd">@outputType</span><span class="p">(</span><span class="s">&#39;int4&#39;</span><span class="p">)</span>
+<span class="k">def</span> <span class="nf">return_one</span><span class="p">():</span>
+  <span class="k">return</span> <span class="mi">1</span>
+
+<span class="nd">@outputType</span><span class="p">(</span><span class="s">&quot;text&quot;</span><span class="p">)</span>
+<span class="k">def</span> <span class="nf">helloworld</span><span class="p">():</span>
+  <span class="k">return</span> <span class="s">&#39;Hello, World&#39;</span>
+
+<span class="c"># No decorator - blob</span>
+<span class="k">def</span> <span class="nf">concat_py</span><span class="p">(</span><span class="nb">str</span><span class="p">):</span>
+  <span class="k">return</span> <span class="nb">str</span><span class="o">+</span><span class="nb">str</span>
+
+<span class="nd">@outputType</span><span class="p">(</span><span class="s">&#39;int4&#39;</span><span class="p">)</span>
+<span class="k">def</span> <span class="nf">sum_py</span><span class="p">(</span><span class="n">a</span><span class="p">,</span><span class="n">b</span><span class="p">):</span>
+  <span class="k">return</span> <span class="n">a</span><span class="o">+</span><span class="n">b</span>
+</pre></div>
+</div>
+<p>If the configuration is set properly, every function in the script files are registered when the Tajo cluster starts up.</p>
+</div>
+<div class="section" id="decorators-and-types">
+<h3>Decorators and types<a class="headerlink" href="#decorators-and-types" title="Permalink to this headline">¶</a></h3>
+<p>By default, every function has a return type of <tt class="docutils literal"><span class="pre">BLOB</span></tt>.
+You can use Python decorators to define output types for the script functions. Tajo can figure out return types from the annotations of the Python script.</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">outputType</span></tt>: Defines the return data type for a script UDF in a format that Tajo can understand. The defined type must be one of the types supported by Tajo. For supported types, please refer to <a class="reference internal" href="sql_language/data_model.html"><em>Data Model</em></a>.</li>
+</ul>
+</div>
+<div class="section" id="query-example">
+<h3>Query example<a class="headerlink" href="#query-example" title="Permalink to this headline">¶</a></h3>
+<p>Once the Python UDFs are successfully registered, you can use them as other built-in functions.</p>
+<div class="highlight-sql"><div class="highlight"><pre><span class="k">default</span><span class="o">&gt;</span> <span class="k">select</span> <span class="n">concat_py</span><span class="p">(</span><span class="n">n_name</span><span class="p">)::</span><span class="nb">text</span> <span class="k">from</span> <span class="n">nation</span> <span class="k">where</span> <span class="n">sum_py</span><span class="p">(</span><span class="n">n_regionkey</span><span class="p">,</span><span class="mi">1</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">2</span><span class="p">;</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
 
 
           </div>

Modified: tajo/site/docs/devel/functions/datetime_func_and_operators.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions/datetime_func_and_operators.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/datetime_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/datetime_func_and_operators.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../functions.html">Functions</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="math_func_and_operators.html">Math Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="string_func_and_operators.html">String Functions and Operators</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="network_func_and_operators.html">Network Functions and Operators</a></li>
+<li class="toctree-l2 current"><a class="reference internal" href="../functions.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/functions/math_func_and_operators.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions/math_func_and_operators.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/math_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/math_func_and_operators.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../functions.html">Functions</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="">Math Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="string_func_and_operators.html">String Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="network_func_and_operators.html">Network Functions and Operators</a></li>
+<li class="toctree-l2 current"><a class="reference internal" href="../functions.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/functions/network_func_and_operators.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions/network_func_and_operators.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/network_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/network_func_and_operators.html Sat Apr 18 08:35:49 2015
@@ -30,7 +30,7 @@
   
     <link rel="top" title="Apache Tajo 0.11.0 documentation" href="../index.html"/>
         <link rel="up" title="Functions" href="../functions.html"/>
-        <link rel="next" title="Table Management" href="../table_management.html"/>
+        <link rel="next" title="JSON Functions" href="json_func.html"/>
         <link rel="prev" title="DateTime Functions and Operators" href="datetime_func_and_operators.html"/> 
 
   
@@ -109,10 +109,8 @@
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../functions.html">Functions</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="math_func_and_operators.html">Math Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="string_func_and_operators.html">String Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Network Functions and Operators</a></li>
+<li class="toctree-l2 current"><a class="reference internal" href="../functions.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>
@@ -323,7 +321,7 @@ as follows.</p>
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       
-        <a href="../table_management.html" class="btn btn-neutral float-right" title="Table Management"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="json_func.html" class="btn btn-neutral float-right" title="JSON Functions"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
         <a href="datetime_func_and_operators.html" class="btn btn-neutral" title="DateTime Functions and Operators"><span class="fa fa-arrow-circle-left"></span> Previous</a>

Modified: tajo/site/docs/devel/functions/string_func_and_operators.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions/string_func_and_operators.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/string_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/string_func_and_operators.html Sat Apr 18 08:35:49 2015
@@ -109,10 +109,8 @@
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="reference internal" href="../functions.html">Functions</a><ul class="current">
-<li class="toctree-l2"><a class="reference internal" href="math_func_and_operators.html">Math Functions and Operators</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">String Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="datetime_func_and_operators.html">DateTime Functions and Operators</a></li>
-<li class="toctree-l2"><a class="reference internal" href="network_func_and_operators.html">Network Functions and Operators</a></li>
+<li class="toctree-l2 current"><a class="reference internal" href="../functions.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../table_management.html">Table Management</a><ul>
@@ -138,7 +136,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>

Modified: tajo/site/docs/devel/genindex.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/genindex.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/genindex.html (original)
+++ tajo/site/docs/devel/genindex.html Sat Apr 18 08:35:49 2015
@@ -107,10 +107,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -136,7 +134,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>
@@ -202,6 +200,7 @@
  | <a href="#E"><strong>E</strong></a>
  | <a href="#F"><strong>F</strong></a>
  | <a href="#G"><strong>G</strong></a>
+ | <a href="#J"><strong>J</strong></a>
  | <a href="#L"><strong>L</strong></a>
  | <a href="#M"><strong>M</strong></a>
  | <a href="#N"><strong>N</strong></a>
@@ -350,6 +349,16 @@
   </dt>
 
   </dl></td>
+</tr></table>
+
+<h2 id="J">J</h2>
+<table style="width: 100%" class="indextable genindextable"><tr>
+  <td style="width: 33%" valign="top"><dl>
+      
+  <dt><a href="functions/json_func.html#json_extract_path_text">json_extract_path_text() (built-in function)</a>
+  </dt>
+
+  </dl></td>
 </tr></table>
 
 <h2 id="L">L</h2>

Modified: tajo/site/docs/devel/getting_started.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/getting_started.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/getting_started.html (original)
+++ tajo/site/docs/devel/getting_started.html Sat Apr 18 08:35:49 2015
@@ -108,10 +108,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -137,7 +135,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>
@@ -201,7 +199,7 @@
 <h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
 <blockquote>
 <div><ul class="simple">
-<li>Hadoop 2.3.0 or higher (up to 2.5.1)</li>
+<li>Hadoop 2.3.0 or higher (up to 2.6.0)</li>
 <li>Java 1.6 or 1.7</li>
 <li>Protocol buffer 2.5.0</li>
 </ul>
@@ -248,7 +246,7 @@ Download the file that ends in .tar.gz t
 </div>
 <p>Then, after you move some proper directory, discompress the tar.gz file as follows:</p>
 <div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span><span class="nb">cd</span> <span class="o">[</span>a directory to be parent of tajo binary<span class="o">]</span>
-<span class="nv">$ </span>tar xzvf <span class="k">${</span><span class="nv">TAJO_SRC</span><span class="k">}</span>/tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
+<span class="nv">$ </span>tar xzvf <span class="si">${</span><span class="nv">TAJO_SRC</span><span class="si">}</span>/tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 </pre></div>
 </div>
 </div>
@@ -282,11 +280,11 @@ Download the file that ends in .tar.gz t
 <div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>mkdir /home/x/table1
 <span class="nv">$ </span><span class="nb">cd</span> /home/x/table1
 <span class="nv">$ </span>cat &gt; 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
+1<span class="p">|</span>abc<span class="p">|</span>1.1<span class="p">|</span>a
+2<span class="p">|</span>def<span class="p">|</span>2.3<span class="p">|</span>b
+3<span class="p">|</span>ghi<span class="p">|</span>3.4<span class="p">|</span>c
+4<span class="p">|</span>jkl<span class="p">|</span>4.5<span class="p">|</span>d
+5<span class="p">|</span>mno<span class="p">|</span>5.6<span class="p">|</span>e
 &lt;CTRL + D&gt;
 </pre></div>
 </div>
@@ -303,7 +301,7 @@ tajo&gt; create external table table1 (
       name text,
       score float,
       type text)
-      using csv with (&#39;text.delimiter&#39;=&#39;|&#39;) location &#39;file:/home/x/table1&#39;;
+      using text with (&#39;text.delimiter&#39;=&#39;|&#39;) location &#39;file:/home/x/table1&#39;;
 </pre></div>
 </div>
 <p>To load an external table, you need to use ‘create external table’ statement.

Modified: tajo/site/docs/devel/hbase_integration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/hbase_integration.html?rev=1674454&r1=1674453&r2=1674454&view=diff
==============================================================================
--- tajo/site/docs/devel/hbase_integration.html (original)
+++ tajo/site/docs/devel/hbase_integration.html Sat Apr 18 08:35:49 2015
@@ -30,7 +30,7 @@
   
     <link rel="top" title="Apache Tajo 0.11.0 documentation" href="index.html"/>
         <link rel="next" title="OpenStack Swift Integration" href="swift_integration.html"/>
-        <link rel="prev" title="HCatalog Integration" href="hcatalog_integration.html"/> 
+        <link rel="prev" title="Hive Integration" href="hive_integration.html"/> 
 
   
   <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
@@ -108,10 +108,8 @@
 </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.html#built-in-functions">Built-in Functions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="functions.html#python-user-defined-functions">Python User-defined Functions</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="table_management.html">Table Management</a><ul>
@@ -137,7 +135,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 current"><a class="current reference internal" href="">HBase Integration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="#create-table">CREATE TABLE</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#drop-table">DROP TABLE</a></li>
@@ -346,7 +344,7 @@ blrunner-01,  Jaehwa Jung,  2014-10-31,
         <a href="swift_integration.html" class="btn btn-neutral float-right" title="OpenStack Swift Integration"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
-        <a href="hcatalog_integration.html" class="btn btn-neutral" title="HCatalog Integration"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="hive_integration.html" class="btn btn-neutral" title="Hive Integration"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       
     </div>
   



Mime
View raw message