Added: tajo/site/docs/current/configuration/storage-site-json.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/storage-site-json.html?rev=1728394&view=auto
==============================================================================
--- tajo/site/docs/current/configuration/storage-site-json.html (added)
+++ tajo/site/docs/current/configuration/storage-site-json.html Thu Feb  4 
00:29:05 2016
@@ -0,0 +1,334 @@
+
+
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>The storage-site.json File &mdash; Apache Tajo 0.11.0 
documentation</title>
+  
+
+  
+  
+
+  
+  <link 
href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700'
 rel='stylesheet' type='text/css'>
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+    <link rel="top" title="Apache Tajo 0.11.0 documentation" 
href="../index.html"/>
+        <link rel="up" title="Configuration" href="../configuration.html"/>
+        <link rel="next" title="Tajo Shell (TSQL)" href="../tsql.html"/>
+        <link rel="prev" title="The catalog-site.xml File" 
href="catalog-site-xml.html"/> 
+
+  
+  <script 
src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js";></script>
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        <a href="../index.html" class="fa fa-home"> Apache Tajo</a>
+        <div role="search">
+  <form id ="rtd-search-form" class="wy-form" action="../search.html" 
method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" 
aria-label="main navigation">
+        
+        
+            <ul class="current">
+<li class="toctree-l1"><a class="reference internal" 
href="../introduction.html">Introduction</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../getting_started.html">Getting Started</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../getting_started.html#prerequisites">Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../getting_started.html#dowload-and-unpack-the-source-code">Dowload and 
unpack the source code</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../getting_started.html#build-source-code">Build source code</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../getting_started.html#setting-up-a-local-tajo-cluster">Setting up a 
local Tajo cluster</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../getting_started.html#first-query-execution">First query 
execution</a></li>
+</ul>
+</li>
+<li class="toctree-l1 current"><a class="reference internal" 
href="../configuration.html">Configuration</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" 
href="preliminary.html">Preliminary</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="cluster_setup.html">Cluster Setup</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="tajo_master_configuration.html">Tajo Master Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="worker_configuration.html">Worker Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="catalog_configuration.html">Catalog Configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="ha_configuration.html">High Availability for TajoMaster</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="tajo-site-xml.html">The tajo-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" 
href="">The storage-site.json File</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/meta_command.html">Meta Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/dfs_command.html">Executing HDFS commands</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/variables.html">Session Variables</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/admin_command.html">Administration Commands</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/intro.html">Introducing to TSQL</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/single_command.html">Executing a single command</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/execute_file.html">Executing Queries from Files</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../tsql/background_command.html">Executing as background process</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="../sql_language.html">SQL Language</a><ul>
+<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>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../time_zone.html#server-cluster-time-zone">Server Cluster Time 
Zone</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../time_zone.html#table-time-zone">Table Time Zone</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../time_zone.html#client-time-zone">Client Time Zone</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../time_zone.html#time-zone-id">Time Zone ID</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../time_zone.html#examples-of-time-zone">Examples of Time Zone</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="../functions.html">Functions</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../functions.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/data_formats.html">Data Formats</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="../table_partitioning.html">Table Partitioning</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../partitioning/intro_to_partitioning.html">Introduction to 
Partitioning</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../partitioning/column_partitioning.html">Column Partitioning</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../partitioning/range_partitioning.html">Range Partitioning</a></li>
+<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>
+<li class="toctree-l2"><a class="reference internal" 
href="../index/future_work.html">Future Works</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="../backup_and_restore.html">Backup and Restore</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../backup_and_restore/catalog.html">Backup and Restore Catalog</a></li>
+</ul>
+</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>
+<li class="toctree-l2"><a class="reference internal" 
href="../hbase_integration.html#insert-overwrite-into">INSERT (OVERWRITE) 
INTO</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../hbase_integration.html#usage">Usage</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" 
href="../swift_integration.html">OpenStack Swift Integration</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../swift_integration.html#swift-configuration">Swift 
configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../swift_integration.html#hadoop-configurations">Hadoop 
configurations</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../swift_integration.html#tajo-configuration">Tajo configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../swift_integration.html#querying-on-swift">Querying on Swift</a></li>
+</ul>
+</li>
+<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>
+<li class="toctree-l1"><a class="reference internal" 
href="../tajo_client_api.html">Tajo Client API</a></li>
+<li class="toctree-l1"><a class="reference internal" 
href="../faq.html">FAQ</a></li>
+</ul>
+
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Apache Tajo</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+      
+          <li><a href="../configuration.html">Configuration</a> &raquo;</li>
+      
+    <li>The storage-site.json File</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          <a href="../_sources/configuration/storage-site-json.txt" 
rel="nofollow"> View page source</a>
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main">
+            
+  <div class="section" id="the-storage-site-json-file">
+<h1>The storage-site.json File<a class="headerlink" 
href="#the-storage-site-json-file" title="Permalink to this 
headline">¶</a></h1>
+<p>This file is for configuring <a class="reference internal" 
href="../table_management/tablespaces.html"><em>Tablespaces</em></a>.
+The syntax of <code class="docutils literal"><span 
class="pre">storage-site.json</span></code> is like this basically:</p>
+<div class="code json highlight-python"><div class="highlight"><pre>{
+  &quot;spaces&quot;: {
+    &lt;space config 1&gt;, &lt;space config 2&gt;, ...
+  },
+  &quot;storages&quot;: {
+    &lt;storage config 1&gt;, &lt;storage config 2&gt;, ...
+  }
+}
+</pre></div>
+</div>
+<div class="section" id="spaces">
+<h2>Spaces<a class="headerlink" href="#spaces" title="Permalink to this 
headline">¶</a></h2>
+<p>This is a section for registering tablespaces. Some space config example is 
here:</p>
+<div class="code json highlight-python"><div 
class="highlight"><pre>&quot;spaces&quot;: {
+  &quot;jdbc_pgsql&quot;: {
+    &quot;uri&quot;: &quot;jdbc:postgresql://127.0.0.1:5740/origin&quot;,
+    &quot;configs&quot;: {
+      &quot;mapped_database&quot;:&quot;tajo_pgsql_origin&quot;,
+      &quot;connection_properties&quot;: {
+        &quot;user&quot;:&quot;tajouser&quot;,
+        &quot;password&quot;:&quot;123456&quot;
+      }
+    }
+  },
+  ...
+}
+</pre></div>
+</div>
+<ul class="simple">
+<li><strong>space name</strong> : Your own tablespace name which indicates a 
specific tablespace. Alpha-numeric characters and underscore(_) are 
permitted.</li>
+<li><strong>uri</strong> : An URI address of a tablespace</li>
+<li><strong>configs</strong> : It is optional. You can specify it as JSON 
object to pass to each tablespace handler.</li>
+</ul>
+<p>After you specify a tablespace, you can use it in <a class="reference 
external" href="../sql_language/ddl.html#create-table">create table 
statement</a>.</p>
+</div>
+<div class="section" id="storages">
+<h2>Storages<a class="headerlink" href="#storages" title="Permalink to this 
headline">¶</a></h2>
+<p>This is for registering storage format and custom storage handler class.
+Tajo already supports HDFS, HBase, PostgreSQL, Amazon S3, Openstack Swift, 
etc, thus in usual cases using mentioned storages, you don&#8217;t have to add 
any <code class="docutils literal"><span class="pre">storages</span></code> 
configuration.
+However, if you want to use your custom storage as one of Tajo&#8217;s data 
source, you need to add a configuration for your storage. Here is an example of 
HDFS storage.
+See <code class="xref doc docutils literal"><span 
class="pre">storage_plugins/overview</span></code> for more information.</p>
+<div class="code json highlight-python"><div 
class="highlight"><pre>&quot;storages&quot;: {
+  &quot;hdfs&quot;: {
+    &quot;handler&quot;: &quot;org.apache.tajo.storage.FileTablespace&quot;,
+    &quot;default-format&quot;: &quot;text&quot;
+  },
+  ...
+}
+</pre></div>
+</div>
+</div>
+</div>
+
+
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer 
navigation">
+      
+        <a href="../tsql.html" class="btn btn-neutral float-right" title="Tajo 
Shell (TSQL)"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="catalog-site-xml.html" class="btn btn-neutral" title="The 
catalog-site.xml File"><span class="fa fa-arrow-circle-left"></span> 
Previous</a>
+      
+    </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+        &copy; Copyright 2015, Apache Tajo Team.
+    </p>
+  </div>
+
+  <a href="https://github.com/snide/sphinx_rtd_theme";>Sphinx theme</a> 
provided by <a href="https://readthedocs.org";>Read the Docs</a>
+</footer>
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
+    <script type="text/javascript">
+        var DOCUMENTATION_OPTIONS = {
+            URL_ROOT:'../',
+            VERSION:'0.11.0',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
+        };
+    </script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
+    <script type="text/javascript" src="../_static/js/theme.js"></script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
+</body>
+</html>
\ No newline at end of file

Modified: tajo/site/docs/current/configuration/tajo-site-xml.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/tajo-site-xml.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/tajo-site-xml.html (original)
+++ tajo/site/docs/current/configuration/tajo-site-xml.html Thu Feb  4 00:29:05 
2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
 <li class="toctree-l2 current"><a class="current reference internal" 
href="">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="storage-site-json.html">The storage-site.json File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -232,7 +234,7 @@ Also, catalog configurations are found h
 </div>
 </div>
 <div class="section" 
id="tajo-dist-query-broadcast-non-cross-join-threshold-kb">
-<h3><cite>tajo.dist-query.broadcast.non-cross-join.threshold-kb</cite><a 
class="headerlink" 
href="#tajo-dist-query-broadcast-non-cross-join-threshold-kb" title="Permalink 
to this headline">¶</a></h3>
+<span 
id="id1"></span><h3><cite>tajo.dist-query.broadcast.non-cross-join.threshold-kb</cite><a
 class="headerlink" 
href="#tajo-dist-query-broadcast-non-cross-join-threshold-kb" title="Permalink 
to this headline">¶</a></h3>
 <p>A threshold for non-cross joins. When a non-cross join query is executed 
with the broadcast join, the whole size of broadcasted tables won&#8217;t 
exceed this threshold.</p>
 <blockquote>
 <div><ul class="simple">
@@ -250,7 +252,7 @@ Also, catalog configurations are found h
 </div>
 </div>
 <div class="section" id="tajo-dist-query-broadcast-cross-join-threshold-kb">
-<h3><cite>tajo.dist-query.broadcast.cross-join.threshold-kb</cite><a 
class="headerlink" href="#tajo-dist-query-broadcast-cross-join-threshold-kb" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id2"></span><h3><cite>tajo.dist-query.broadcast.cross-join.threshold-kb</cite><a
 class="headerlink" href="#tajo-dist-query-broadcast-cross-join-threshold-kb" 
title="Permalink to this headline">¶</a></h3>
 <p>A threshold for cross joins. When a cross join query is executed, the whole 
size of broadcasted tables won&#8217;t exceed this threshold.</p>
 <blockquote>
 <div><ul class="simple">
@@ -272,7 +274,7 @@ Also, catalog configurations are found h
 </div>
 </div>
 <div class="section" id="tajo-dist-query-join-task-volume-mb">
-<h3><cite>tajo.dist-query.join.task-volume-mb</cite><a class="headerlink" 
href="#tajo-dist-query-join-task-volume-mb" title="Permalink to this 
headline">¶</a></h3>
+<span id="id3"></span><h3><cite>tajo.dist-query.join.task-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-join-task-volume-mb" title="Permalink 
to this headline">¶</a></h3>
 <p>The repartition join is executed in two stages. When a join query is 
executed with the repartition join, this value indicates the amount of input 
data processed by each task at the second stage.
 As a result, it determines the degree of the parallel processing of the join 
query.</p>
 <blockquote>
@@ -291,7 +293,7 @@ As a result, it determines the degree of
 </div>
 </div>
 <div class="section" id="tajo-dist-query-join-partition-volume-mb">
-<h3><cite>tajo.dist-query.join.partition-volume-mb</cite><a class="headerlink" 
href="#tajo-dist-query-join-partition-volume-mb" title="Permalink to this 
headline">¶</a></h3>
+<span 
id="id4"></span><h3><cite>tajo.dist-query.join.partition-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-join-partition-volume-mb" 
title="Permalink to this headline">¶</a></h3>
 <p>The repartition join is executed in two stages. When a join query is 
executed with the repartition join,
 this value indicates the output size of each task at the first stage, which 
determines the number of partitions to be shuffled between two stages.</p>
 <blockquote>
@@ -310,7 +312,7 @@ this value indicates the output size of
 </div>
 </div>
 <div class="section" 
id="tajo-executor-join-common-in-memory-hash-threshold-mb">
-<h3><cite>tajo.executor.join.common.in-memory-hash-threshold-mb</cite><a 
class="headerlink" 
href="#tajo-executor-join-common-in-memory-hash-threshold-mb" title="Permalink 
to this headline">¶</a></h3>
+<span 
id="id5"></span><h3><cite>tajo.executor.join.common.in-memory-hash-threshold-mb</cite><a
 class="headerlink" 
href="#tajo-executor-join-common-in-memory-hash-threshold-mb" title="Permalink 
to this headline">¶</a></h3>
 <p>This value provides the criterion to decide the algorithm to perform a join 
in a task.
 If the input data is smaller than this value, join is performed with the 
in-memory hash join.
 Otherwise, the sort-merge join is used.</p>
@@ -336,7 +338,7 @@ This value should be tuned carefully.</p
 </div>
 </div>
 <div class="section" id="tajo-executor-join-inner-in-memory-hash-threshold-mb">
-<h3><cite>tajo.executor.join.inner.in-memory-hash-threshold-mb</cite><a 
class="headerlink" href="#tajo-executor-join-inner-in-memory-hash-threshold-mb" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id6"></span><h3><cite>tajo.executor.join.inner.in-memory-hash-threshold-mb</cite><a
 class="headerlink" 
href="#tajo-executor-join-inner-in-memory-hash-threshold-mb" title="Permalink 
to this headline">¶</a></h3>
 <p>This value provides the criterion to decide the algorithm to perform an 
inner join in a task.
 If the input data is smaller than this value, the inner join is performed with 
the in-memory hash join.
 Otherwise, the sort-merge join is used.</p>
@@ -362,7 +364,7 @@ This value should be tuned carefully.</p
 </div>
 </div>
 <div class="section" id="tajo-executor-join-outer-in-memory-hash-threshold-mb">
-<h3><cite>tajo.executor.join.outer.in-memory-hash-threshold-mb</cite><a 
class="headerlink" href="#tajo-executor-join-outer-in-memory-hash-threshold-mb" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id7"></span><h3><cite>tajo.executor.join.outer.in-memory-hash-threshold-mb</cite><a
 class="headerlink" 
href="#tajo-executor-join-outer-in-memory-hash-threshold-mb" title="Permalink 
to this headline">¶</a></h3>
 <p>This value provides the criterion to decide the algorithm to perform an 
outer join in a task.
 If the input data is smaller than this value, the outer join is performed with 
the in-memory hash join.
 Otherwise, the sort-merge join is used.</p>
@@ -388,7 +390,7 @@ This value should be tuned carefully.</p
 </div>
 </div>
 <div class="section" id="tajo-executor-join-hash-table-size">
-<h3><cite>tajo.executor.join.hash-table.size</cite><a class="headerlink" 
href="#tajo-executor-join-hash-table-size" title="Permalink to this 
headline">¶</a></h3>
+<span id="id8"></span><h3><cite>tajo.executor.join.hash-table.size</cite><a 
class="headerlink" href="#tajo-executor-join-hash-table-size" title="Permalink 
to this headline">¶</a></h3>
 <p>The initial size of hash table for in-memory hash join.</p>
 <blockquote>
 <div><ul class="simple">
@@ -408,7 +410,7 @@ This value should be tuned carefully.</p
 <div class="section" id="sort-query-settings">
 <h2>Sort Query Settings<a class="headerlink" href="#sort-query-settings" 
title="Permalink to this headline">¶</a></h2>
 <div class="section" id="tajo-dist-query-sort-task-volume-mb">
-<h3><cite>tajo.dist-query.sort.task-volume-mb</cite><a class="headerlink" 
href="#tajo-dist-query-sort-task-volume-mb" title="Permalink to this 
headline">¶</a></h3>
+<span id="id9"></span><h3><cite>tajo.dist-query.sort.task-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-sort-task-volume-mb" title="Permalink 
to this headline">¶</a></h3>
 <p>The sort operation is executed in two stages. When a sort query is 
executed, this value indicates the amount of input data processed by each task 
at the second stage.
 As a result, it determines the degree of the parallel processing of the sort 
query.</p>
 <blockquote>
@@ -427,7 +429,7 @@ As a result, it determines the degree of
 </div>
 </div>
 <div class="section" id="tajo-executor-external-sort-buffer-mb">
-<h3><cite>tajo.executor.external-sort.buffer-mb</cite><a class="headerlink" 
href="#tajo-executor-external-sort-buffer-mb" title="Permalink to this 
headline">¶</a></h3>
+<span 
id="id10"></span><h3><cite>tajo.executor.external-sort.buffer-mb</cite><a 
class="headerlink" href="#tajo-executor-external-sort-buffer-mb" 
title="Permalink to this headline">¶</a></h3>
 <p>A threshold to choose the sort algorithm. If the input data is larger than 
this threshold, the external sort algorithm is used.</p>
 <blockquote>
 <div><ul class="simple">
@@ -445,7 +447,7 @@ As a result, it determines the degree of
 </div>
 </div>
 <div class="section" id="tajo-executor-sort-list-size">
-<h3><cite>tajo.executor.sort.list.size</cite><a class="headerlink" 
href="#tajo-executor-sort-list-size" title="Permalink to this 
headline">¶</a></h3>
+<span id="id11"></span><h3><cite>tajo.executor.sort.list.size</cite><a 
class="headerlink" href="#tajo-executor-sort-list-size" title="Permalink to 
this headline">¶</a></h3>
 <p>The initial size of list for in-memory sort.</p>
 <blockquote>
 <div><ul class="simple">
@@ -465,7 +467,7 @@ As a result, it determines the degree of
 <div class="section" id="group-by-query-settings">
 <h2>Group by Query Settings<a class="headerlink" 
href="#group-by-query-settings" title="Permalink to this headline">¶</a></h2>
 <div class="section" id="tajo-dist-query-groupby-multi-level-aggr">
-<h3><cite>tajo.dist-query.groupby.multi-level-aggr</cite><a class="headerlink" 
href="#tajo-dist-query-groupby-multi-level-aggr" title="Permalink to this 
headline">¶</a></h3>
+<span 
id="id12"></span><h3><cite>tajo.dist-query.groupby.multi-level-aggr</cite><a 
class="headerlink" href="#tajo-dist-query-groupby-multi-level-aggr" 
title="Permalink to this headline">¶</a></h3>
 <p>A flag to enable the multi-level algorithm for distinct aggregation. If 
this value is set, 3-phase aggregation algorithm is used.
 Otherwise, 2-phase aggregation algorithm is used.</p>
 <blockquote>
@@ -483,7 +485,7 @@ Otherwise, 2-phase aggregation algorithm
 </div>
 </div>
 <div class="section" id="tajo-dist-query-groupby-partition-volume-mb">
-<h3><cite>tajo.dist-query.groupby.partition-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-groupby-partition-volume-mb" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id13"></span><h3><cite>tajo.dist-query.groupby.partition-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-groupby-partition-volume-mb" 
title="Permalink to this headline">¶</a></h3>
 <p>The aggregation is executed in two stages. When an aggregation query is 
executed,
 this value indicates the output size of each task at the first stage, which 
determines the number of partitions to be shuffled between two stages.</p>
 <blockquote>
@@ -502,7 +504,7 @@ this value indicates the output size of
 </div>
 </div>
 <div class="section" id="tajo-dist-query-groupby-task-volume-mb">
-<h3><cite>tajo.dist-query.groupby.task-volume-mb</cite><a class="headerlink" 
href="#tajo-dist-query-groupby-task-volume-mb" title="Permalink to this 
headline">¶</a></h3>
+<span 
id="id14"></span><h3><cite>tajo.dist-query.groupby.task-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-groupby-task-volume-mb" 
title="Permalink to this headline">¶</a></h3>
 <p>The aggregation operation is executed in two stages. When an aggregation 
query is executed, this value indicates the amount of input data processed by 
each task at the second stage.
 As a result, it determines the degree of the parallel processing of the 
aggregation query.</p>
 <blockquote>
@@ -521,7 +523,7 @@ As a result, it determines the degree of
 </div>
 </div>
 <div class="section" id="tajo-executor-groupby-in-memory-hash-threshold-mb">
-<h3><cite>tajo.executor.groupby.in-memory-hash-threshold-mb</cite><a 
class="headerlink" href="#tajo-executor-groupby-in-memory-hash-threshold-mb" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id15"></span><h3><cite>tajo.executor.groupby.in-memory-hash-threshold-mb</cite><a
 class="headerlink" href="#tajo-executor-groupby-in-memory-hash-threshold-mb" 
title="Permalink to this headline">¶</a></h3>
 <p>This value provides the criterion to decide the algorithm to perform an 
aggregation in a task.
 If the input data is smaller than this value, the aggregation is performed 
with the in-memory hash aggregation.
 Otherwise, the sort-based aggregation is used.</p>
@@ -547,7 +549,7 @@ This value should be tuned carefully.</p
 </div>
 </div>
 <div class="section" id="tajo-executor-aggregate-hash-table-size">
-<h3><cite>tajo.executor.aggregate.hash-table.size</cite><a class="headerlink" 
href="#tajo-executor-aggregate-hash-table-size" title="Permalink to this 
headline">¶</a></h3>
+<span 
id="id16"></span><h3><cite>tajo.executor.aggregate.hash-table.size</cite><a 
class="headerlink" href="#tajo-executor-aggregate-hash-table-size" 
title="Permalink to this headline">¶</a></h3>
 <p>The initial size of hash table for in-memory aggregation.</p>
 <blockquote>
 <div><ul class="simple">
@@ -567,7 +569,7 @@ This value should be tuned carefully.</p
 <div class="section" id="date-time-settings">
 <h2>Date/Time Settings<a class="headerlink" href="#date-time-settings" 
title="Permalink to this headline">¶</a></h2>
 <div class="section" id="tajo-timezone">
-<h3><cite>tajo.timezone</cite><a class="headerlink" href="#tajo-timezone" 
title="Permalink to this headline">¶</a></h3>
+<span id="id17"></span><h3><cite>tajo.timezone</cite><a class="headerlink" 
href="#tajo-timezone" title="Permalink to this headline">¶</a></h3>
 <p>Refer to <a class="reference internal" href="../time_zone.html"><em>Time 
Zone</em></a>.</p>
 <blockquote>
 <div><ul class="simple">
@@ -584,7 +586,7 @@ This value should be tuned carefully.</p
 </div>
 </div>
 <div class="section" id="tajo-datetime-date-order">
-<h3><cite>tajo.datetime.date-order</cite><a class="headerlink" 
href="#tajo-datetime-date-order" title="Permalink to this headline">¶</a></h3>
+<span id="id18"></span><h3><cite>tajo.datetime.date-order</cite><a 
class="headerlink" href="#tajo-datetime-date-order" title="Permalink to this 
headline">¶</a></h3>
 <p>Date order specification.</p>
 <blockquote>
 <div><ul class="simple">
@@ -604,7 +606,7 @@ This value should be tuned carefully.</p
 <div class="section" id="table-partitions">
 <h2>Table partitions<a class="headerlink" href="#table-partitions" 
title="Permalink to this headline">¶</a></h2>
 <div class="section" id="tajo-partition-overwrite-even-if-no-result">
-<h3><cite>tajo.partition.overwrite.even-if-no-result</cite><a 
class="headerlink" href="#tajo-partition-overwrite-even-if-no-result" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id19"></span><h3><cite>tajo.partition.overwrite.even-if-no-result</cite><a 
class="headerlink" href="#tajo-partition-overwrite-even-if-no-result" 
title="Permalink to this headline">¶</a></h3>
 <p>If this value is true, a partitioned table is overwritten even if a 
subquery leads to no result. Otherwise, the table data will be kept if there is 
no result.</p>
 <blockquote>
 <div><ul class="simple">
@@ -621,7 +623,7 @@ This value should be tuned carefully.</p
 </div>
 </div>
 <div class="section" id="tajo-dist-query-table-partition-task-volume-mb">
-<h3><cite>tajo.dist-query.table-partition.task-volume-mb</cite><a 
class="headerlink" href="#tajo-dist-query-table-partition-task-volume-mb" 
title="Permalink to this headline">¶</a></h3>
+<span 
id="id20"></span><h3><cite>tajo.dist-query.table-partition.task-volume-mb</cite><a
 class="headerlink" href="#tajo-dist-query-table-partition-task-volume-mb" 
title="Permalink to this headline">¶</a></h3>
 <p>In Tajo, storing a partition table is executed in two stages.
 This value indicates the output size of a task of the former stage, which 
determines the number of partitions to be shuffled between two stages.</p>
 <blockquote>
@@ -643,7 +645,7 @@ This value indicates the output size of
 <div class="section" id="arithmetic-settings">
 <h2>Arithmetic Settings<a class="headerlink" href="#arithmetic-settings" 
title="Permalink to this headline">¶</a></h2>
 <div class="section" id="tajo-behavior-arithmetic-abort">
-<h3><cite>tajo.behavior.arithmetic-abort</cite><a class="headerlink" 
href="#tajo-behavior-arithmetic-abort" title="Permalink to this 
headline">¶</a></h3>
+<span id="id21"></span><h3><cite>tajo.behavior.arithmetic-abort</cite><a 
class="headerlink" href="#tajo-behavior-arithmetic-abort" title="Permalink to 
this headline">¶</a></h3>
 <p>A flag to indicate how to handle the errors caused by invalid arithmetic 
operations. If true, a running query will be terminated with an overflow or a 
divide-by-zero.</p>
 <blockquote>
 <div><ul class="simple">
@@ -680,7 +682,7 @@ This value indicates the output size of
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/configuration/tajo_master_configuration.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/tajo_master_configuration.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/tajo_master_configuration.html 
(original)
+++ tajo/site/docs/current/configuration/tajo_master_configuration.html Thu Feb 
 4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="storage-site-json.html">The storage-site.json File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -249,7 +251,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/configuration/worker_configuration.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/worker_configuration.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/worker_configuration.html (original)
+++ tajo/site/docs/current/configuration/worker_configuration.html Thu Feb  4 
00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="storage-site-json.html">The storage-site.json File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -216,7 +218,7 @@
 <div class="highlight-bash"><div class="highlight"><pre><span 
class="nv">TAJO_WORKER_HEAPSIZE</span><span class="o">=</span>8000
 </pre></div>
 </div>
-<p>The default size is 1000 (1GB).</p>
+<p>The default size is 5000 (5GB).</p>
 </div>
 <div class="section" id="temporary-data-directory">
 <h2>Temporary Data Directory<a class="headerlink" 
href="#temporary-data-directory" title="Permalink to this headline">¶</a></h2>
@@ -266,12 +268,12 @@ CPU cores are a unit for expressing CPU
 </tr>
 <tr class="row-even"><td>tajo.worker.resource.disks</td>
 <td>Integer</td>
-<td>1</td>
+<td>2</td>
 <td>the number of disks</td>
 </tr>
 <tr class="row-odd"><td>tajo.task.resource.min.memory-mb</td>
 <td>Integer</td>
-<td>500</td>
+<td>1000</td>
 <td>minimum allocatable memory per task</td>
 </tr>
 <tr class="row-even"><td>tajo.qm.resource.min.memory-mb</td>
@@ -293,20 +295,20 @@ In other words, <code class="docutils li
 </div>
 <div class="section" id="example">
 <h3>Example<a class="headerlink" href="#example" title="Permalink to this 
headline">¶</a></h3>
-<p>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:</p>
+<p>Assume that you want to give 15GB Jvm heap, 2GB memory per task, 4 disks, 
and 12 cores on each worker. The example configuration is as follows:</p>
 <p><code class="docutils literal"><span 
class="pre">tajo-env.sh</span></code></p>
-<div class="highlight-bash"><div class="highlight"><pre><span 
class="nb">export </span><span class="nv">TAJO_WORKER_HEAPSIZE</span><span 
class="o">=</span>15000
+<div class="highlight-bash"><div class="highlight"><pre><span 
class="nb">export</span> <span class="nv">TAJO_WORKER_HEAPSIZE</span><span 
class="o">=</span>15000
 </pre></div>
 </div>
 <p><code class="docutils literal"><span 
class="pre">tajo-site.xml</span></code></p>
 <div class="highlight-xml"><div class="highlight"><pre><span 
class="nt">&lt;property&gt;</span>
-  <span 
class="nt">&lt;name&gt;</span>tajo.worker.resource.tajo.worker.resource.cpu-cores<span
 class="nt">&lt;/name&gt;</span>
+  <span class="nt">&lt;name&gt;</span>tajo.worker.resource.cpu-cores<span 
class="nt">&lt;/name&gt;</span>
   <span class="nt">&lt;value&gt;</span>12<span class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
 
  <span class="nt">&lt;property&gt;</span>
   <span class="nt">&lt;name&gt;</span>tajo.task.resource.min.memory-mb<span 
class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>1000<span 
class="nt">&lt;/value&gt;</span>
+  <span class="nt">&lt;value&gt;</span>2000<span 
class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
 
 <span class="nt">&lt;property&gt;</span>
@@ -319,13 +321,13 @@ In other words, <code class="docutils li
 <li>Example with HDFS</li>
 </ul>
 <p><code class="docutils literal"><span 
class="pre">tajo-env.sh</span></code></p>
-<div class="highlight-bash"><div class="highlight"><pre><span 
class="nb">export </span><span class="nv">TAJO_WORKER_HEAPSIZE</span><span 
class="o">=</span>15000
+<div class="highlight-bash"><div class="highlight"><pre><span 
class="nb">export</span> <span class="nv">TAJO_WORKER_HEAPSIZE</span><span 
class="o">=</span>15000
 </pre></div>
 </div>
 <p><code class="docutils literal"><span 
class="pre">tajo-site.xml</span></code></p>
 <div class="highlight-xml"><div class="highlight"><pre> <span 
class="nt">&lt;property&gt;</span>
   <span class="nt">&lt;name&gt;</span>tajo.task.resource.min.memory-mb<span 
class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>1000<span 
class="nt">&lt;/value&gt;</span>
+  <span class="nt">&lt;value&gt;</span>2000<span 
class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
 
 <span class="nt">&lt;property&gt;</span>
@@ -338,13 +340,13 @@ In other words, <code class="docutils li
 <li>Example with S3</li>
 </ul>
 <p><code class="docutils literal"><span 
class="pre">tajo-env.sh</span></code></p>
-<div class="highlight-bash"><div class="highlight"><pre><span 
class="nb">export </span><span class="nv">TAJO_WORKER_HEAPSIZE</span><span 
class="o">=</span>15000
+<div class="highlight-bash"><div class="highlight"><pre><span 
class="nb">export</span> <span class="nv">TAJO_WORKER_HEAPSIZE</span><span 
class="o">=</span>15000
 </pre></div>
 </div>
 <p><code class="docutils literal"><span 
class="pre">tajo-site.xml</span></code></p>
 <div class="highlight-xml"><div class="highlight"><pre> <span 
class="nt">&lt;property&gt;</span>
   <span class="nt">&lt;name&gt;</span>tajo.task.resource.min.memory-mb<span 
class="nt">&lt;/name&gt;</span>
-  <span class="nt">&lt;value&gt;</span>1000<span 
class="nt">&lt;/value&gt;</span>
+  <span class="nt">&lt;value&gt;</span>2000<span 
class="nt">&lt;/value&gt;</span>
 <span class="nt">&lt;/property&gt;</span>
 
 <span class="nt">&lt;property&gt;</span>
@@ -375,7 +377,7 @@ In other words, <code class="docutils li
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/faq.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/faq.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/faq.html (original)
+++ tajo/site/docs/current/faq.html Thu Feb  4 00:29:05 2016
@@ -76,6 +76,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="configuration/storage-site-json.html">The storage-site.json File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -98,6 +99,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="time_zone.html">Time Zone</a><ul>
@@ -118,7 +120,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -226,7 +228,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions.html (original)
+++ tajo/site/docs/current/functions.html Thu Feb  4 00:29:05 2016
@@ -77,6 +77,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="configuration/storage-site-json.html">The storage-site.json File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -99,6 +100,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="time_zone.html">Time Zone</a><ul>
@@ -119,7 +121,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -264,7 +266,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/agg_func.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/agg_func.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/agg_func.html (original)
+++ tajo/site/docs/current/functions/agg_func.html Thu Feb  4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -408,7 +410,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/data_type_func_and_operators.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/data_type_func_and_operators.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/data_type_func_and_operators.html 
(original)
+++ tajo/site/docs/current/functions/data_type_func_and_operators.html Thu Feb  
4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -300,7 +302,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/datetime_func_and_operators.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/datetime_func_and_operators.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/datetime_func_and_operators.html (original)
+++ tajo/site/docs/current/functions/datetime_func_and_operators.html Thu Feb  
4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -871,7 +873,7 @@ For example, if unix_timestamp occurs on
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/json_func.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/json_func.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/json_func.html (original)
+++ tajo/site/docs/current/functions/json_func.html Thu Feb  4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -336,7 +338,7 @@ Returns null if either argument is null.
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/math_func_and_operators.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/math_func_and_operators.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/math_func_and_operators.html (original)
+++ tajo/site/docs/current/functions/math_func_and_operators.html Thu Feb  4 
00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -733,7 +735,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/network_func_and_operators.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/network_func_and_operators.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/network_func_and_operators.html (original)
+++ tajo/site/docs/current/functions/network_func_and_operators.html Thu Feb  4 
00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -345,7 +347,7 @@ as follows.</p>
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/python.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/python.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/python.html (original)
+++ tajo/site/docs/current/functions/python.html Thu Feb  4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -222,21 +224,21 @@ After that, you can register your functi
 </pre></div>
 </div>
 <p>Please note that you can specify multiple paths with <code class="docutils 
literal"><span class="pre">','</span></code> 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/udf1.py</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="c1"># 
/path/to/udf1.py</span>
 
-<span class="nd">@output_type</span><span class="p">(</span><span 
class="s">&#39;int4&#39;</span><span class="p">)</span>
+<span class="nd">@output_type</span><span class="p">(</span><span 
class="s1">&#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">@output_type</span><span class="p">(</span><span 
class="s">&quot;text&quot;</span><span class="p">)</span>
+<span class="nd">@output_type</span><span class="p">(</span><span 
class="s2">&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="k">return</span> <span class="s1">&#39;Hello, World&#39;</span>
 
-<span class="c"># No decorator - blob</span>
+<span class="c1"># 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">@output_type</span><span class="p">(</span><span 
class="s">&#39;int4&#39;</span><span class="p">)</span>
+<span class="nd">@output_type</span><span class="p">(</span><span 
class="s1">&#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>
@@ -265,7 +267,7 @@ You can use Python decorators to define
 <h3>Function registration<a class="headerlink" href="#id1" title="Permalink to 
this headline">¶</a></h3>
 <p>To define your Python aggregation functions, you should write Python 
classes for each function.
 Followings are typical examples of Python UDAFs.</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="c"># 
/path/to/udaf1.py</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="c1"># 
/path/to/udaf1.py</span>
 
 <span class="k">class</span> <span class="nc">AvgPy</span><span 
class="p">:</span>
   <span class="nb">sum</span> <span class="o">=</span> <span 
class="mi">0</span>
@@ -278,22 +280,22 @@ Followings are typical examples of Pytho
       <span class="bp">self</span><span class="o">.</span><span 
class="n">sum</span> <span class="o">=</span> <span class="mi">0</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span> <span class="o">=</span> <span class="mi">0</span>
 
-  <span class="c"># eval at the first stage</span>
+  <span class="c1"># eval at the first stage</span>
   <span class="k">def</span> <span class="nf">eval</span><span 
class="p">(</span><span class="bp">self</span><span class="p">,</span> <span 
class="n">item</span><span class="p">):</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">sum</span> <span class="o">+=</span> <span class="n">item</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span> <span class="o">+=</span> <span class="mi">1</span>
 
-  <span class="c"># get intermediate result</span>
+  <span class="c1"># get intermediate result</span>
   <span class="k">def</span> <span class="nf">get_partial_result</span><span 
class="p">(</span><span class="bp">self</span><span class="p">):</span>
       <span class="k">return</span> <span class="p">[</span><span 
class="bp">self</span><span class="o">.</span><span class="n">sum</span><span 
class="p">,</span> <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span><span class="p">]</span>
 
-  <span class="c"># merge intermediate results</span>
+  <span class="c1"># merge intermediate results</span>
   <span class="k">def</span> <span class="nf">merge</span><span 
class="p">(</span><span class="bp">self</span><span class="p">,</span> <span 
class="nb">list</span><span class="p">):</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">sum</span> <span class="o">+=</span> <span 
class="nb">list</span><span class="p">[</span><span class="mi">0</span><span 
class="p">]</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span> <span class="o">+=</span> <span 
class="nb">list</span><span class="p">[</span><span class="mi">1</span><span 
class="p">]</span>
 
-  <span class="c"># get final result</span>
-  <span class="nd">@output_type</span><span class="p">(</span><span 
class="s">&#39;float8&#39;</span><span class="p">)</span>
+  <span class="c1"># get final result</span>
+  <span class="nd">@output_type</span><span class="p">(</span><span 
class="s1">&#39;float8&#39;</span><span class="p">)</span>
   <span class="k">def</span> <span class="nf">get_final_result</span><span 
class="p">(</span><span class="bp">self</span><span class="p">):</span>
       <span class="k">return</span> <span class="bp">self</span><span 
class="o">.</span><span class="n">sum</span> <span class="o">/</span> <span 
class="nb">float</span><span class="p">(</span><span 
class="bp">self</span><span class="o">.</span><span class="n">cnt</span><span 
class="p">)</span>
 
@@ -307,20 +309,20 @@ Followings are typical examples of Pytho
   <span class="k">def</span> <span class="nf">reset</span><span 
class="p">(</span><span class="bp">self</span><span class="p">):</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span> <span class="o">=</span> <span class="mi">0</span>
 
-  <span class="c"># eval at the first stage</span>
+  <span class="c1"># eval at the first stage</span>
   <span class="k">def</span> <span class="nf">eval</span><span 
class="p">(</span><span class="bp">self</span><span class="p">):</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span> <span class="o">+=</span> <span class="mi">1</span>
 
-  <span class="c"># get intermediate result</span>
+  <span class="c1"># get intermediate result</span>
   <span class="k">def</span> <span class="nf">get_partial_result</span><span 
class="p">(</span><span class="bp">self</span><span class="p">):</span>
       <span class="k">return</span> <span class="bp">self</span><span 
class="o">.</span><span class="n">cnt</span>
 
-  <span class="c"># merge intermediate results</span>
+  <span class="c1"># merge intermediate results</span>
   <span class="k">def</span> <span class="nf">merge</span><span 
class="p">(</span><span class="bp">self</span><span class="p">,</span> <span 
class="n">cnt</span><span class="p">):</span>
       <span class="bp">self</span><span class="o">.</span><span 
class="n">cnt</span> <span class="o">+=</span> <span class="n">cnt</span>
 
-  <span class="c"># get final result</span>
-  <span class="nd">@output_type</span><span class="p">(</span><span 
class="s">&#39;int4&#39;</span><span class="p">)</span>
+  <span class="c1"># get final result</span>
+  <span class="nd">@output_type</span><span class="p">(</span><span 
class="s1">&#39;int4&#39;</span><span class="p">)</span>
   <span class="k">def</span> <span class="nf">get_final_result</span><span 
class="p">(</span><span class="bp">self</span><span class="p">):</span>
       <span class="k">return</span> <span class="bp">self</span><span 
class="o">.</span><span class="n">cnt</span>
 </pre></div>
@@ -366,7 +368,7 @@ Followings are typical examples of Pytho
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/string_func_and_operators.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/string_func_and_operators.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/string_func_and_operators.html (original)
+++ tajo/site/docs/current/functions/string_func_and_operators.html Thu Feb  4 
00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -1000,7 +1002,7 @@ For other multibyte encodings, the argum
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/functions/window_func.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/functions/window_func.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/functions/window_func.html (original)
+++ tajo/site/docs/current/functions/window_func.html Thu Feb  4 00:29:05 2016
@@ -78,6 +78,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/service_config_defaults.html">Cluster Service 
Configuration Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../configuration/storage-site-json.html">The storage-site.json 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -100,6 +101,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="../time_zone.html">Time Zone</a><ul>
@@ -120,7 +122,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -333,7 +335,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 

Modified: tajo/site/docs/current/genindex.html
URL: 
http://svn.apache.org/viewvc/tajo/site/docs/current/genindex.html?rev=1728394&r1=1728393&r2=1728394&view=diff
==============================================================================
--- tajo/site/docs/current/genindex.html (original)
+++ tajo/site/docs/current/genindex.html Thu Feb  4 00:29:05 2016
@@ -76,6 +76,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/service_config_defaults.html">Cluster Service Configuration 
Defaults</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/tajo-site-xml.html">The tajo-site.xml File</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="configuration/catalog-site-xml.html">The catalog-site.xml File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="configuration/storage-site-json.html">The storage-site.json File</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="tsql.html">Tajo 
Shell (TSQL)</a><ul>
@@ -98,6 +99,7 @@
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/joins.html">Joins</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/sql_expression.html">SQL Expressions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="sql_language/predicates.html">Predicates</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="sql_language/explain.html">EXPLAIN</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" 
href="time_zone.html">Time Zone</a><ul>
@@ -118,7 +120,7 @@
 <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/data_formats.html">Data Formats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="table_management/compression.html">Compression</a></li>
 </ul>
 </li>
@@ -729,7 +731,7 @@
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014, Apache Tajo Team.
+        &copy; Copyright 2015, Apache Tajo Team.
     </p>
   </div>
 


Reply via email to