You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/05/28 14:22:20 UTC
svn commit: r1682226 [1/5] - in /tajo/site/docs/devel: ./
_sources/table_management/ _static/ configuration/ functions/ index/
partitioning/ sql_language/ table_management/ tsql/
Author: hyunsik
Date: Thu May 28 12:22:19 2015
New Revision: 1682226
URL: http://svn.apache.org/r1682226
Log:
Update by TAJO-1624
Modified:
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/down-pressed.png
tajo/site/docs/devel/_static/down.png
tajo/site/docs/devel/_static/file.png
tajo/site/docs/devel/_static/jquery.js
tajo/site/docs/devel/_static/minus.png
tajo/site/docs/devel/_static/plus.png
tajo/site/docs/devel/_static/searchtools.js
tajo/site/docs/devel/_static/up-pressed.png
tajo/site/docs/devel/_static/up.png
tajo/site/docs/devel/_static/websupport.js
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/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/functions/datetime_func_and_operators.html
tajo/site/docs/devel/functions/json_func.html
tajo/site/docs/devel/functions/math_func_and_operators.html
tajo/site/docs/devel/functions/network_func_and_operators.html
tajo/site/docs/devel/functions/python.html
tajo/site/docs/devel/functions/string_func_and_operators.html
tajo/site/docs/devel/getting_started.html
tajo/site/docs/devel/hbase_integration.html
tajo/site/docs/devel/hive_integration.html
tajo/site/docs/devel/index.html
tajo/site/docs/devel/index/types.html
tajo/site/docs/devel/index_overview.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/searchindex.js
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/swift_integration.html
tajo/site/docs/devel/table_management/parquet.html
tajo/site/docs/devel/table_management/rcfile.html
tajo/site/docs/devel/table_management/sequencefile.html
tajo/site/docs/devel/table_management/table_overview.html
tajo/site/docs/devel/table_management/text.html
tajo/site/docs/devel/time_zone.html
tajo/site/docs/devel/tsql/admin_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/table_management/table_overview.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_sources/table_management/table_overview.txt?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/_sources/table_management/table_overview.txt (original)
+++ tajo/site/docs/devel/_sources/table_management/table_overview.txt Thu May 28 12:22:19 2015
@@ -8,12 +8,37 @@ Overview
Managed Table
================
-.. todo::
+``CREATE TABLE`` statement with ``EXTERNAL`` keyword lets you create a table located in the warehouse directory specified by the configuration property ``tajo.warehouse.directory`` or ``${tajo.root}/warehouse`` by default. For example:
+
+.. code-block:: sql
+
+ CREATE TABLE employee (
+ id int,
+ name text,
+ age
+ );
+
External Table
================
-.. todo::
+``CREATE EXTERNAL TABLE`` statement lets you create a table located in a specify location so that Tajo does not use a default data warehouse location for the table. External tables are in common used if you already have data generated. LOCATION clause must be required for an external table.
+
+.. code-block:: sql
+
+ CREATE EXTERNAL TABLE employee (
+ id int,
+ name text,
+ age
+ ) LOCATION 'hdfs://table/path';
+
+
+The location can be a directory located in HDFS, Amazon S3, HBase, or local file system (if a Tajo cluster runs in a single machine). URI examples are as follows:
+
+ * HDFS - ``hdfs://hostname:8020/table1``
+ * Amazon S3 - ``s3://bucket-name/table1``
+ * local file system - ``file:///dir/table1``
+ * Openstack Swift - ``swift://bucket-name/table1``
Table Properties
================
Modified: tajo/site/docs/devel/_static/basic.css
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/basic.css?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/basic.css (original)
+++ tajo/site/docs/devel/_static/basic.css Thu May 28 12:22:19 2015
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -197,7 +197,10 @@ h3:hover > a.headerlink,
h4:hover > a.headerlink,
h5:hover > a.headerlink,
h6:hover > a.headerlink,
-dt:hover > a.headerlink {
+dt:hover > a.headerlink,
+caption:hover > a.headerlink,
+p.caption:hover > a.headerlink,
+div.code-block-caption:hover > a.headerlink {
visibility: visible;
}
@@ -314,6 +317,13 @@ table.docutils {
border-collapse: collapse;
}
+table caption span.caption-number {
+ font-style: italic;
+}
+
+table caption span.caption-text {
+}
+
table.docutils td, table.docutils th {
padding: 1px 8px 1px 5px;
border-top: 0;
@@ -344,6 +354,25 @@ table.citation td {
border-bottom: none;
}
+/* -- figures --------------------------------------------------------------- */
+
+div.figure {
+ margin: 0.5em;
+ padding: 0.5em;
+}
+
+div.figure p.caption {
+ padding: 0.3em;
+}
+
+div.figure p.caption span.caption-number {
+ font-style: italic;
+}
+
+div.figure p.caption span.caption-text {
+}
+
+
/* -- other body styles ----------------------------------------------------- */
ol.arabic {
@@ -406,6 +435,10 @@ dl.glossary dt {
font-size: 1.3em;
}
+.sig-paren {
+ font-size: larger;
+}
+
.versionmodified {
font-style: italic;
}
@@ -471,22 +504,51 @@ table.highlighttable td {
padding: 0 0.5em 0 0.5em;
}
-tt.descname {
+div.code-block-caption {
+ padding: 2px 5px;
+ font-size: small;
+}
+
+div.code-block-caption code {
+ background-color: transparent;
+}
+
+div.code-block-caption + div > div.highlight > pre {
+ margin-top: 0;
+}
+
+div.code-block-caption span.caption-number {
+ padding: 0.1em 0.3em;
+ font-style: italic;
+}
+
+div.code-block-caption span.caption-text {
+}
+
+div.literal-block-wrapper {
+ padding: 1em 1em 0;
+}
+
+div.literal-block-wrapper div.highlight {
+ margin: 0;
+}
+
+code.descname {
background-color: transparent;
font-weight: bold;
font-size: 1.2em;
}
-tt.descclassname {
+code.descclassname {
background-color: transparent;
}
-tt.xref, a tt {
+code.xref, a code {
background-color: transparent;
font-weight: bold;
}
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
background-color: transparent;
}
Modified: tajo/site/docs/devel/_static/doctools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/doctools.js?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/doctools.js (original)
+++ tajo/site/docs/devel/_static/doctools.js Thu May 28 12:22:19 2015
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -91,6 +91,30 @@ jQuery.fn.highlightText = function(text,
});
};
+/*
+ * backward compatibility for jQuery.browser
+ * This will be supported until firefox bug is fixed.
+ */
+if (!jQuery.browser) {
+ jQuery.uaMatch = function(ua) {
+ ua = ua.toLowerCase();
+
+ var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
+ /(webkit)[ \/]([\w.]+)/.exec(ua) ||
+ /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+ /(msie) ([\w.]+)/.exec(ua) ||
+ ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
+ [];
+
+ return {
+ browser: match[ 1 ] || "",
+ version: match[ 2 ] || "0"
+ };
+ };
+ jQuery.browser = {};
+ jQuery.browser[jQuery.uaMatch(navigator.userAgent).browser] = true;
+}
+
/**
* Small JavaScript module for the documentation.
*/
@@ -152,9 +176,10 @@ var Documentation = {
/**
* workaround a firefox stupidity
+ * see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
*/
fixFirefoxAnchorBug : function() {
- if (document.location.hash && $.browser.mozilla)
+ if (document.location.hash)
window.setTimeout(function() {
document.location.href += '';
}, 10);
Modified: tajo/site/docs/devel/_static/down-pressed.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/down-pressed.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/down.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/down.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/file.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/file.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/jquery.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/jquery.js?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/jquery.js (original)
+++ tajo/site/docs/devel/_static/jquery.js Thu May 28 12:22:19 2015
@@ -1,2 +1,4 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
[... 7 lines stripped ...]
Modified: tajo/site/docs/devel/_static/minus.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/minus.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/plus.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/plus.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/searchtools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/searchtools.js?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/searchtools.js (original)
+++ tajo/site/docs/devel/_static/searchtools.js Thu May 28 12:22:19 2015
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilties for the full-text search.
*
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -439,7 +439,7 @@ var Search = {
dataType: "text",
complete: function(jqxhr, textstatus) {
var data = jqxhr.responseText;
- if (data !== '') {
+ if (data !== '' && data !== undefined) {
listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
}
Search.output.append(listItem);
Modified: tajo/site/docs/devel/_static/up-pressed.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/up-pressed.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/up.png
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/up.png?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
Binary files - no diff available.
Modified: tajo/site/docs/devel/_static/websupport.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/_static/websupport.js?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/_static/websupport.js (original)
+++ tajo/site/docs/devel/_static/websupport.js Thu May 28 12:22:19 2015
@@ -4,7 +4,7 @@
*
* sphinx.websupport utilties for all documentation.
*
- * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -50,51 +50,51 @@
}
function initEvents() {
- $('a.comment-close').live("click", function(event) {
+ $(document).on("click", 'a.comment-close', function(event) {
event.preventDefault();
hide($(this).attr('id').substring(2));
});
- $('a.vote').live("click", function(event) {
+ $(document).on("click", 'a.vote', function(event) {
event.preventDefault();
handleVote($(this));
});
- $('a.reply').live("click", function(event) {
+ $(document).on("click", 'a.reply', function(event) {
event.preventDefault();
openReply($(this).attr('id').substring(2));
});
- $('a.close-reply').live("click", function(event) {
+ $(document).on("click", 'a.close-reply', function(event) {
event.preventDefault();
closeReply($(this).attr('id').substring(2));
});
- $('a.sort-option').live("click", function(event) {
+ $(document).on("click", 'a.sort-option', function(event) {
event.preventDefault();
handleReSort($(this));
});
- $('a.show-proposal').live("click", function(event) {
+ $(document).on("click", 'a.show-proposal', function(event) {
event.preventDefault();
showProposal($(this).attr('id').substring(2));
});
- $('a.hide-proposal').live("click", function(event) {
+ $(document).on("click", 'a.hide-proposal', function(event) {
event.preventDefault();
hideProposal($(this).attr('id').substring(2));
});
- $('a.show-propose-change').live("click", function(event) {
+ $(document).on("click", 'a.show-propose-change', function(event) {
event.preventDefault();
showProposeChange($(this).attr('id').substring(2));
});
- $('a.hide-propose-change').live("click", function(event) {
+ $(document).on("click", 'a.hide-propose-change', function(event) {
event.preventDefault();
hideProposeChange($(this).attr('id').substring(2));
});
- $('a.accept-comment').live("click", function(event) {
+ $(document).on("click", 'a.accept-comment', function(event) {
event.preventDefault();
acceptComment($(this).attr('id').substring(2));
});
- $('a.delete-comment').live("click", function(event) {
+ $(document).on("click", 'a.delete-comment', function(event) {
event.preventDefault();
deleteComment($(this).attr('id').substring(2));
});
- $('a.comment-markup').live("click", function(event) {
+ $(document).on("click", 'a.comment-markup', function(event) {
event.preventDefault();
toggleCommentMarkupBox($(this).attr('id').substring(2));
});
@@ -700,8 +700,8 @@
(<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
<div class="comment-markup-box" id="mb<%id%>">\
reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
- <tt>``code``</tt>, \
- code blocks: <tt>::</tt> and an indented block after blank line</div>\
+ <code>``code``</code>, \
+ code blocks: <code>::</code> and an indented block after blank line</div>\
<form method="post" id="cf<%id%>" class="comment-form" action="">\
<textarea name="comment" cols="80"></textarea>\
<p class="propose-button">\
Modified: tajo/site/docs/devel/configuration/catalog_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/catalog_configuration.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/catalog_configuration.html (original)
+++ tajo/site/docs/devel/configuration/catalog_configuration.html Thu May 28 12:22:19 2015
@@ -197,7 +197,7 @@
<div class="section" id="catalog-configuration">
<h1>Catalog Configuration<a class="headerlink" href="#catalog-configuration" title="Permalink to this headline">¶</a></h1>
-<p>If you want to customize the catalog service, copy <tt class="docutils literal"><span class="pre">$TAJO_HOME/conf/catalog-site.xml.template</span></tt> to <tt class="docutils literal"><span class="pre">catalog-site.xml</span></tt>. Then, add the following configs to catalog-site.xml. Note that the default configs are enough to launch Tajo cluster in most cases.</p>
+<p>If you want to customize the catalog service, copy <code class="docutils literal"><span class="pre">$TAJO_HOME/conf/catalog-site.xml.template</span></code> to <code class="docutils literal"><span class="pre">catalog-site.xml</span></code>. Then, add the following configs to catalog-site.xml. Note that the default configs are enough to launch Tajo cluster in most cases.</p>
<ul class="simple">
<li>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).</li>
<li>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:</li>
@@ -235,7 +235,7 @@ tests.</td>
<div class="section" id="derby-configuration">
<h2>Derby Configuration<a class="headerlink" href="#derby-configuration" title="Permalink to this headline">¶</a></h2>
<p>By default, Tajo uses <a class="reference external" href="http://db.apache.org/derby/">Apache Derby</a> as a persistent storage in order to manage table meta data. So, without any configuration, you can use Derby for catalog store.</p>
-<p>Also, you can set manually configs in <tt class="docutils literal"><span class="pre">conf/catalog-site.xml</span></tt> as follows:</p>
+<p>Also, you can set manually configs in <code class="docutils literal"><span class="pre">conf/catalog-site.xml</span></code> as follows:</p>
<div class="highlight-xml"><div class="highlight"><pre><property>
<name>tajo.catalog.store.class</name>
<value>org.apache.tajo.catalog.store.DerbyStore</value>
@@ -256,7 +256,7 @@ tests.</td>
</div>
<div class="admonition warning">
<p class="first admonition-title">Warning</p>
-<p class="last">By default, <em>Catalog server</em> stores catalog data into <tt class="docutils literal"><span class="pre">/tmp/tajo-catalog-${username}</span></tt> directory. But, some operating systems may remove all contents in <tt class="docutils literal"><span class="pre">/tmp</span></tt> when booting up. In order to ensure persistent store of your catalog data, you need to set a proper location of derby directory.</p>
+<p class="last">By default, <em>Catalog server</em> stores catalog data into <code class="docutils literal"><span class="pre">/tmp/tajo-catalog-${username}</span></code> directory. But, some operating systems may remove all contents in <code class="docutils literal"><span class="pre">/tmp</span></code> when booting up. In order to ensure persistent store of your catalog data, you need to set a proper location of derby directory.</p>
</div>
</div>
<div class="section" id="mysql-mariadb-postgresql-oracle-configuration">
@@ -274,7 +274,7 @@ mysql> grant all on tajo.* to <span c
Query OK, <span class="m">0</span> rows affected <span class="o">(</span>0.01 sec<span class="o">)</span>
</pre></div>
</div>
-<p>Second, you must install the proper JDBC driver on the TajoMaster node. And then, you need to set the <tt class="docutils literal"><span class="pre">TAJO_CLASSPATH</span></tt> variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> as follows:</p>
+<p>Second, you must install the proper JDBC driver on the TajoMaster node. And then, you need to set the <code class="docutils literal"><span class="pre">TAJO_CLASSPATH</span></code> variable in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> as follows:</p>
<div class="highlight-sh"><div class="highlight"><pre><span class="o">(</span>MySQL<span class="o">)</span>
<span class="nv">$ </span><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/local/mysql/lib/mysql-connector-java-x.x.x.jar
@@ -288,7 +288,7 @@ Query OK, <span class="m">0</span> rows
<span class="nv">$ </span><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/path/to/oracle/driver/ojdbc7.jar
</pre></div>
</div>
-<p>Alternatively, you can copy the jdbc driver into <tt class="docutils literal"><span class="pre">$TAJO_HOME/lib</span></tt>.</p>
+<p>Alternatively, you can copy the jdbc driver into <code class="docutils literal"><span class="pre">$TAJO_HOME/lib</span></code>.</p>
<p>Finally, you must add the following configurations to <cite>conf/catalog-site.xml</cite> :</p>
<div class="highlight-xml"><div class="highlight"><pre><property>
<name>tajo.catalog.connection.id</name>
@@ -350,15 +350,15 @@ Query OK, <span class="m">0</span> rows
<span class="nv">$ </span>ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
</pre></div>
</div>
-<p>Second, you must set your hive home directory to HIVE_HOME variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> with it as follows:</p>
+<p>Second, you must set your hive home directory to HIVE_HOME variable in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> with it as follows:</p>
<div class="highlight-sh"><div class="highlight"><pre><span class="nb">export </span><span class="nv">HIVE_HOME</span><span class="o">=</span>/path/to/your/hive/directory
</pre></div>
</div>
-<p>Third, if you need to use jdbc to connect HiveMetaStore, you have to prepare mysql jdbc driver on host which can be ran TajoMaster. If you prepare it, you should set jdbc driver file path to <tt class="docutils literal"><span class="pre">HIVE_JDBC_DRIVER_DIR</span></tt> variable in conf/tajo-env.sh with it as follows:</p>
+<p>Third, if you need to use jdbc to connect HiveMetaStore, you have to prepare mysql jdbc driver on host which can be ran TajoMaster. If you prepare it, you should set jdbc driver file path to <code class="docutils literal"><span class="pre">HIVE_JDBC_DRIVER_DIR</span></code> variable in conf/tajo-env.sh with it as follows:</p>
<div class="highlight-sh"><div class="highlight"><pre><span class="nb">export </span><span class="nv">HIVE_JDBC_DRIVER_DIR</span><span class="o">=</span>/path/to/your/mysql_jdbc_driver/mysql-connector-java-x.x.x-bin.jar
</pre></div>
</div>
-<p>Lastly, you should add the following config to <tt class="docutils literal"><span class="pre">conf/catalog-site.xml</span></tt> :</p>
+<p>Lastly, you should add the following config to <code class="docutils literal"><span class="pre">conf/catalog-site.xml</span></code> :</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>tajo.catalog.store.class<span class="nt"></name></span>
<span class="nt"><value></span>org.apache.tajo.catalog.store.HiveCatalogStore<span class="nt"></value></span>
Modified: tajo/site/docs/devel/configuration/cluster_setup.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/cluster_setup.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/cluster_setup.html (original)
+++ tajo/site/docs/devel/configuration/cluster_setup.html Thu May 28 12:22:19 2015
@@ -233,8 +233,8 @@
</div>
<div class="section" id="workers">
<h3>Workers<a class="headerlink" href="#workers" title="Permalink to this headline">¶</a></h3>
-<p>The file <tt class="docutils literal"><span class="pre">conf/workers</span></tt> lists all host names of workers, one per line.
-By default, this file contains the single entry <tt class="docutils literal"><span class="pre">localhost</span></tt>.
+<p>The file <code class="docutils literal"><span class="pre">conf/workers</span></code> lists all host names of workers, one per line.
+By default, this file contains the single entry <code class="docutils literal"><span class="pre">localhost</span></code>.
You can easily add host names of workers via your favorite text editor.</p>
<p>For example:</p>
<div class="highlight-python"><div class="highlight"><pre>$ cat > conf/workers
@@ -257,7 +257,7 @@ $ $HADOOP_HOME/bin/hadoop fs -chmod g+w
</div>
<div class="section" id="launch-a-tajo-cluster">
<h3>Launch a Tajo cluster<a class="headerlink" href="#launch-a-tajo-cluster" title="Permalink to this headline">¶</a></h3>
-<p>Then, execute <tt class="docutils literal"><span class="pre">start-tajo.sh</span></tt></p>
+<p>Then, execute <code class="docutils literal"><span class="pre">start-tajo.sh</span></code></p>
<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/start-tajo.sh
</pre></div>
</div>
Modified: tajo/site/docs/devel/configuration/ha_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/ha_configuration.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/ha_configuration.html (original)
+++ tajo/site/docs/devel/configuration/ha_configuration.html Thu May 28 12:22:19 2015
@@ -212,14 +212,14 @@
</div>
<div class="section" id="configuration-file-settings">
<h2>Configuration File Settings<a class="headerlink" href="#configuration-file-settings" title="Permalink to this headline">¶</a></h2>
-<p>If you want to use TajoMaster HA mode, specific your <tt class="docutils literal"><span class="pre">tajo.master.ha.enable</span></tt> as follows:</p>
+<p>If you want to use TajoMaster HA mode, specific your <code class="docutils literal"><span class="pre">tajo.master.ha.enable</span></code> as follows:</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>tajo.master.ha.enable<span class="nt"></name></span>
<span class="nt"><value></span>true<span class="nt"></value></span>
<span class="nt"></property></span>
</pre></div>
</div>
-<p>If you use HA mode, all back masters monitor the active master at 5 second intervals. If you update this period, specific your <tt class="docutils literal"><span class="pre">tajo.master.ha.monitor.interval</span></tt> as follows:</p>
+<p>If you use HA mode, all back masters monitor the active master at 5 second intervals. If you update this period, specific your <code class="docutils literal"><span class="pre">tajo.master.ha.monitor.interval</span></code> as follows:</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>tajo.master.ha.monitor.interval<span class="nt"></name></span>
<span class="nt"><value></span>monitor interval<span class="nt"></value></span>
@@ -229,7 +229,7 @@
</div>
<div class="section" id="backup-master-settings">
<h2>Backup Master Settings<a class="headerlink" href="#backup-master-settings" title="Permalink to this headline">¶</a></h2>
-<p>If you want to run masters with <tt class="docutils literal"><span class="pre">start-tajo.sh</span></tt>, specific your masters in <tt class="docutils literal"><span class="pre">conf/masters</span></tt>. The file lists all host names of masters, one per line.By default, this file contains the single entry <tt class="docutils literal"><span class="pre">localhost</span></tt>. You can easily add host names of workers via your favorite text editor.</p>
+<p>If you want to run masters with <code class="docutils literal"><span class="pre">start-tajo.sh</span></code>, specific your masters in <code class="docutils literal"><span class="pre">conf/masters</span></code>. The file lists all host names of masters, one per line.By default, this file contains the single entry <code class="docutils literal"><span class="pre">localhost</span></code>. You can easily add host names of workers via your favorite text editor.</p>
<p>For example:</p>
<div class="highlight-python"><div class="highlight"><pre>$ cat > conf/masters
host1.domain.com
@@ -242,7 +242,7 @@ host2.domain.com
<p>And then, you need to setup tarball and set configuration files on backup masters.</p>
<div class="admonition note">
<p class="first admonition-title">Note</p>
-<p>If you want to run active master and backup master on the same host, you may find TajoMaster port conflicts. To avoid this problem, you must convert backup master primary ports to another port in <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt> as follows:</p>
+<p>If you want to run active master and backup master on the same host, you may find TajoMaster port conflicts. To avoid this problem, you must convert backup master primary ports to another port in <code class="docutils literal"><span class="pre">tajo-site.xml</span></code> as follows:</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>tajo.master.umbilical-rpc.address<span class="nt"></name></span>
<span class="nt"><value></span>localhost:36001<span class="nt"></value></span>
@@ -274,12 +274,12 @@ host2.domain.com
<span class="nt"></property></span>
</pre></div>
</div>
-<p class="last">And you need to convert <tt class="docutils literal"><span class="pre">TAJO_PID_DIR</span></tt> to another directory in <tt class="docutils literal"><span class="pre">tajo-env.sh</span></tt>.</p>
+<p class="last">And you need to convert <code class="docutils literal"><span class="pre">TAJO_PID_DIR</span></code> to another directory in <code class="docutils literal"><span class="pre">tajo-env.sh</span></code>.</p>
</div>
</div>
<div class="section" id="launch-a-tajo-cluster">
<h2>Launch a Tajo cluster<a class="headerlink" href="#launch-a-tajo-cluster" title="Permalink to this headline">¶</a></h2>
-<p>Then, execute <tt class="docutils literal"><span class="pre">start-tajo.sh</span></tt></p>
+<p>Then, execute <code class="docutils literal"><span class="pre">start-tajo.sh</span></code></p>
<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/start-tajo.sh
</pre></div>
</div>
@@ -290,19 +290,19 @@ host2.domain.com
</div>
<div class="section" id="administration-ha-state">
<h2>Administration HA state<a class="headerlink" href="#administration-ha-state" title="Permalink to this headline">¶</a></h2>
-<p>If you want to transit any backup master to active master, execute <tt class="docutils literal"><span class="pre">tajo</span> <span class="pre">hadmin</span> <span class="pre">-transitionToActive</span></tt></p>
+<p>If you want to transit any backup master to active master, execute <code class="docutils literal"><span class="pre">tajo</span> <span class="pre">hadmin</span> <span class="pre">-transitionToActive</span></code></p>
<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/tajo haadmin -transitionToActive <target tajo.master.umbilical-rpc.address>
</pre></div>
</div>
-<p>If you want to transit any active master to backup master, execute <tt class="docutils literal"><span class="pre">tajo</span> <span class="pre">hadmin</span> <span class="pre">-transitionToBackup</span></tt></p>
+<p>If you want to transit any active master to backup master, execute <code class="docutils literal"><span class="pre">tajo</span> <span class="pre">hadmin</span> <span class="pre">-transitionToBackup</span></code></p>
<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/tajo haadmin -transitionToBackup <target tajo.master.umbilical-rpc.address>
</pre></div>
</div>
-<p>If you want to find the state of any master, execute <tt class="docutils literal"><span class="pre">tajo</span> <span class="pre">hadmin</span> <span class="pre">-getState</span></tt></p>
+<p>If you want to find the state of any master, execute <code class="docutils literal"><span class="pre">tajo</span> <span class="pre">hadmin</span> <span class="pre">-getState</span></code></p>
<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/tajo haadmin -getState <target tajo.master.umbilical-rpc.address>
</pre></div>
</div>
-<p>If you want to initiate HA information, execute <tt class="docutils literal"><span class="pre">tajo</span> <span class="pre">haadmin</span> <span class="pre">-formatHA</span></tt></p>
+<p>If you want to initiate HA information, execute <code class="docutils literal"><span class="pre">tajo</span> <span class="pre">haadmin</span> <span class="pre">-formatHA</span></code></p>
<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/tajo haadmin -formatHA
</pre></div>
</div>
@@ -314,7 +314,7 @@ host2.domain.com
<div class="section" id="how-to-test-automatic-failover">
<h2>How to Test Automatic Failover<a class="headerlink" href="#how-to-test-automatic-failover" title="Permalink to this headline">¶</a></h2>
<p>If you want to verify automatic failover of TajoMaster, you must deploy your Tajo cluster with TajoMaster HA enable. And then, you need to find which node is active from Tajo web UI.</p>
-<p>Once you find your active TajoMaster, you can cause a failure on that node. For example, you can use kill -9 <pid of TajoMaster> to simulate a JVM crash. Or you can shutdown the machine or disconnect network interface. And then, the backup TajoMaster will be automatically active within 5 seconds. The amount of time required to detect a failure and trigger a failover depends on the config <tt class="docutils literal"><span class="pre">tajo.master.ha.monitor.interval</span></tt>. If there is running queries, it will be finished successfully. Because your TajoClient will get the result data on TajoWorker. But you can’t find already query history. Because TajoMaster stores query history on memory. So, the other master can’t access already active master query history. And if there is no running query, the automatic failover run successfully.</p>
+<p>Once you find your active TajoMaster, you can cause a failure on that node. For example, you can use kill -9 <pid of TajoMaster> to simulate a JVM crash. Or you can shutdown the machine or disconnect network interface. And then, the backup TajoMaster will be automatically active within 5 seconds. The amount of time required to detect a failure and trigger a failover depends on the config <code class="docutils literal"><span class="pre">tajo.master.ha.monitor.interval</span></code>. If there is running queries, it will be finished successfully. Because your TajoClient will get the result data on TajoWorker. But you can’t find already query history. Because TajoMaster stores query history on memory. So, the other master can’t access already active master query history. And if there is no running query, the automatic failover run successfully.</p>
<div class="admonition note">
<p class="first admonition-title">Note</p>
<p class="last">TajoMaster HA does not consider TajoWorker failure. It guarantees the high availability of both TajoResourceManager and QueryMaster.</p>
Modified: tajo/site/docs/devel/configuration/preliminary.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/preliminary.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/preliminary.html (original)
+++ tajo/site/docs/devel/configuration/preliminary.html Thu May 28 12:22:19 2015
@@ -204,7 +204,7 @@
<li>catalog-site.xml - configuration for the catalog server.</li>
<li>tajo-site.xml - configuration for other tajo modules.</li>
</ul>
-<p>Each config consists of a pair of a name and a value. If you want to set the config name <tt class="docutils literal"><span class="pre">a.b.c</span></tt> with the value <tt class="docutils literal"><span class="pre">123</span></tt>, add the following element to an appropriate file.</p>
+<p>Each config consists of a pair of a name and a value. If you want to set the config name <code class="docutils literal"><span class="pre">a.b.c</span></code> with the value <code class="docutils literal"><span class="pre">123</span></code>, add the following element to an appropriate file.</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>a.b.c<span class="nt"></name></span>
<span class="nt"><value></span>123<span class="nt"></value></span>
@@ -212,7 +212,7 @@
</pre></div>
</div>
<p>Tajo has a variety of internal configs. If you don’t set some config explicitly, the default config will be used for for that config. Tajo is designed to use only a few of configs in usual cases. You may not be concerned with the configuration.</p>
-<p>In default, there is no <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt> in <tt class="docutils literal"><span class="pre">${TAJO}/conf</span></tt> directory. If you set some configs, first copy <tt class="docutils literal"><span class="pre">$TAJO_HOME/conf/tajo-site.xml.templete</span></tt> to <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt>. Then, add the configs to your tajo-site.</p>
+<p>In default, there is no <code class="docutils literal"><span class="pre">tajo-site.xml</span></code> in <code class="docutils literal"><span class="pre">${TAJO}/conf</span></code> directory. If you set some configs, first copy <code class="docutils literal"><span class="pre">$TAJO_HOME/conf/tajo-site.xml.templete</span></code> to <code class="docutils literal"><span class="pre">tajo-site.xml</span></code>. Then, add the configs to your tajo-site.</p>
</div>
<div class="section" id="tajo-env-sh">
<h2>tajo-env.sh<a class="headerlink" href="#tajo-env-sh" title="Permalink to this headline">¶</a></h2>
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=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/tajo-site-xml.html (original)
+++ tajo/site/docs/devel/configuration/tajo-site-xml.html Thu May 28 12:22:19 2015
@@ -197,7 +197,7 @@
<div class="section" id="the-tajo-site-xml-file">
<h1>The tajo-site.xml File<a class="headerlink" href="#the-tajo-site-xml-file" title="Permalink to this headline">¶</a></h1>
-<p>To the <tt class="docutils literal"><span class="pre">core-site.xml</span></tt> file on every host in your cluster, you must add the following information:</p>
+<p>To the <code class="docutils literal"><span class="pre">core-site.xml</span></code> file on every host in your cluster, you must add the following information:</p>
<div class="section" id="system-config">
<h2>System Config<a class="headerlink" href="#system-config" title="Permalink to this headline">¶</a></h2>
</div>
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=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/tajo_master_configuration.html (original)
+++ tajo/site/docs/devel/configuration/tajo_master_configuration.html Thu May 28 12:22:19 2015
@@ -206,12 +206,12 @@
<span class="nt"></property></span>
</pre></div>
</div>
-<p>Tajo rootdir must be a url form like <tt class="docutils literal"><span class="pre">scheme://hostname:port/path</span></tt>. The current implementaion only supports <tt class="docutils literal"><span class="pre">hdfs://</span></tt> and <tt class="docutils literal"><span class="pre">file://</span></tt> schemes. The default value is <tt class="docutils literal"><span class="pre">file:///tmp/tajo-${user.name}/</span></tt>.</p>
+<p>Tajo rootdir must be a url form like <code class="docutils literal"><span class="pre">scheme://hostname:port/path</span></code>. The current implementaion only supports <code class="docutils literal"><span class="pre">hdfs://</span></code> and <code class="docutils literal"><span class="pre">file://</span></code> schemes. The default value is <code class="docutils literal"><span class="pre">file:///tmp/tajo-${user.name}/</span></code>.</p>
</div>
<div class="section" id="tajomaster-heap-memory-size">
<h2>TajoMaster Heap Memory Size<a class="headerlink" href="#tajomaster-heap-memory-size" title="Permalink to this headline">¶</a></h2>
<p>The environment variable TAJO_MASTER_HEAPSIZE in conf/tajo-env.sh allow Tajo Master to use the specified heap memory size.</p>
-<p>If you want to adjust heap memory size, set <tt class="docutils literal"><span class="pre">TAJO_MASTER_HEAPSIZE</span></tt> variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> with a proper size as follows:</p>
+<p>If you want to adjust heap memory size, set <code class="docutils literal"><span class="pre">TAJO_MASTER_HEAPSIZE</span></code> variable in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> with a proper size as follows:</p>
<div class="highlight-sh"><div class="highlight"><pre><span class="nv">TAJO_MASTER_HEAPSIZE</span><span class="o">=</span>2000
</pre></div>
</div>
Modified: tajo/site/docs/devel/configuration/worker_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/configuration/worker_configuration.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/configuration/worker_configuration.html (original)
+++ tajo/site/docs/devel/configuration/worker_configuration.html Thu May 28 12:22:19 2015
@@ -199,8 +199,8 @@
<h1>Worker Configuration<a class="headerlink" href="#worker-configuration" title="Permalink to this headline">¶</a></h1>
<div class="section" id="worker-heap-memory-size">
<h2>Worker Heap Memory Size<a class="headerlink" href="#worker-heap-memory-size" title="Permalink to this headline">¶</a></h2>
-<p>The environment variable <tt class="docutils literal"><span class="pre">TAJO_WORKER_HEAPSIZE</span></tt> in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> allow Tajo Worker to use the specified heap memory size.</p>
-<p>If you want to adjust heap memory size, set <tt class="docutils literal"><span class="pre">TAJO_WORKER_HEAPSIZE</span></tt> variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> with a proper size as follows:</p>
+<p>The environment variable <code class="docutils literal"><span class="pre">TAJO_WORKER_HEAPSIZE</span></code> in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> allow Tajo Worker to use the specified heap memory size.</p>
+<p>If you want to adjust heap memory size, set <code class="docutils literal"><span class="pre">TAJO_WORKER_HEAPSIZE</span></code> variable in <code class="docutils literal"><span class="pre">conf/tajo-env.sh</span></code> with a proper size as follows:</p>
<div class="highlight-bash"><div class="highlight"><pre><span class="nv">TAJO_WORKER_HEAPSIZE</span><span class="o">=</span>8000
</pre></div>
</div>
@@ -209,7 +209,7 @@
<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>
<p>TajoWorker stores temporary data on local file system due to out-of-core algorithms. It is possible to specify one or more temporary data directories where temporary data will be stored.</p>
-<p><tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt></p>
+<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"><property></span>
<span class="nt"><name></span>tajo.worker.tmpdir.locations<span class="nt"></name></span>
<span class="nt"><value></span>/disk1/tmpdir,/disk2/tmpdir,/disk3/tmpdir<span class="nt"></value></span>
@@ -225,7 +225,7 @@
<h2>Worker Resources<a class="headerlink" href="#worker-resources" title="Permalink to this headline">¶</a></h2>
<p>Each worker can execute multiple tasks simultaneously.
In Tajo, users can specify the total size of memory and the number of disks for each worker. Available resources affect how many tasks are executed simultaneously.</p>
-<p>In order to specify the resource capacity of each worker, you should add the following configs to <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt> :</p>
+<p>In order to specify the resource capacity of each worker, you should add the following configs to <code class="docutils literal"><span class="pre">tajo-site.xml</span></code> :</p>
<table border="1" class="docutils">
<colgroup>
<col width="32%" />
@@ -264,13 +264,13 @@ In Tajo, users can specify the total siz
</div>
<div class="admonition note">
<p class="first admonition-title">Note</p>
-<p class="last">If <tt class="docutils literal"><span class="pre">tajo.worker.resource.dfs-dir-aware</span></tt> is set to <tt class="docutils literal"><span class="pre">true</span></tt> in <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt>, the worker will aware of and use the number of HDFS datanode’s data dirs in the node.
-In other words, <tt class="docutils literal"><span class="pre">tajo.worker.resource.disks</span></tt> is ignored.</p>
+<p class="last">If <code class="docutils literal"><span class="pre">tajo.worker.resource.dfs-dir-aware</span></code> is set to <code class="docutils literal"><span class="pre">true</span></code> in <code class="docutils literal"><span class="pre">tajo-site.xml</span></code>, the worker will aware of and use the number of HDFS datanode’s data dirs in the node.
+In other words, <code class="docutils literal"><span class="pre">tajo.worker.resource.disks</span></code> is ignored.</p>
</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 5120 MB memory, 4 disks, and 24 cores on each worker. The example configuration is as follows:</p>
-<p><tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt></p>
+<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"><property></span>
<span class="nt"><name></span>tajo.worker.resource.tajo.worker.resource.cpu-cores<span class="nt"></name></span>
<span class="nt"><value></span>24<span class="nt"></value></span>
@@ -290,7 +290,7 @@ In other words, <tt class="docutils lite
</div>
<div class="section" id="dedicated-mode">
<h3>Dedicated Mode<a class="headerlink" href="#dedicated-mode" title="Permalink to this headline">¶</a></h3>
-<p>Tajo provides a dedicated mode that allows each worker in a Tajo cluster to use whole available system resources including cpu-cores, memory, and disks. For this mode, a user should add the following config to <tt class="docutils literal"><span class="pre">tajo-site.xml</span></tt> :</p>
+<p>Tajo provides a dedicated mode that allows each worker in a Tajo cluster to use whole available system resources including cpu-cores, memory, and disks. For this mode, a user should add the following config to <code class="docutils literal"><span class="pre">tajo-site.xml</span></code> :</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>tajo.worker.resource.dedicated<span class="nt"></name></span>
<span class="nt"><value></span>true<span class="nt"></value></span>
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=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/datetime_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/datetime_func_and_operators.html Thu May 28 12:22:19 2015
@@ -204,7 +204,7 @@
</div></blockquote>
<dl class="function">
<dt id="add_days">
-<tt class="descname">add_days</tt><big>(</big><em>date date|timestamp</em>, <em>day int</em><big>)</big><a class="headerlink" href="#add_days" title="Permalink to this definition">¶</a></dt>
+<code class="descname">add_days</code><span class="sig-paren">(</span><em>date date|timestamp</em>, <em>day int</em><span class="sig-paren">)</span><a class="headerlink" href="#add_days" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns date value which is added with given day parameter.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -234,7 +234,7 @@
<dl class="function">
<dt id="add_months">
-<tt class="descname">add_months</tt><big>(</big><em>date date|timestamp</em>, <em>month int</em><big>)</big><a class="headerlink" href="#add_months" title="Permalink to this definition">¶</a></dt>
+<code class="descname">add_months</code><span class="sig-paren">(</span><em>date date|timestamp</em>, <em>month int</em><span class="sig-paren">)</span><a class="headerlink" href="#add_months" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns date value which is added with given month parameter.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -261,7 +261,7 @@
<dl class="function">
<dt id="current_date">
-<tt class="descname">current_date</tt><big>(</big><big>)</big><a class="headerlink" href="#current_date" title="Permalink to this definition">¶</a></dt>
+<code class="descname">current_date</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#current_date" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns current date</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -279,7 +279,7 @@
<dl class="function">
<dt id="current_time">
-<tt class="descname">current_time</tt><big>(</big><big>)</big><a class="headerlink" href="#current_time" title="Permalink to this definition">¶</a></dt>
+<code class="descname">current_time</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#current_time" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns current time</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -297,7 +297,7 @@
<dl class="function">
<dt id="extract">
-<tt class="descname">extract</tt><big>(</big><em>field FROM source</em><big>)</big><a class="headerlink" href="#extract" title="Permalink to this definition">¶</a></dt>
+<code class="descname">extract</code><span class="sig-paren">(</span><em>field FROM source</em><span class="sig-paren">)</span><a class="headerlink" href="#extract" title="Permalink to this definition">¶</a></dt>
<dd><p>The extract function retrieves subfields such as year or hour from date/time values. <em>source</em> must be a value expression of type <em>timestamp</em>, or <em>time</em>. (Expressions of type <em>date</em> are cast to <em>timestamp</em> and can therefore be used as well.) <em>field</em> is an identifier that selects what field to extract from the source value. The extract function returns values of type double precision. The following are valid field names:</p>
<p><strong>century</strong></p>
<p>The century</p>
@@ -413,7 +413,7 @@
<dl class="function">
<dt id="date_part">
-<tt class="descname">date_part</tt><big>(</big><em>'field'</em>, <em>source</em><big>)</big><a class="headerlink" href="#date_part" title="Permalink to this definition">¶</a></dt>
+<code class="descname">date_part</code><span class="sig-paren">(</span><em>'field'</em>, <em>source</em><span class="sig-paren">)</span><a class="headerlink" href="#date_part" title="Permalink to this definition">¶</a></dt>
<dd><p>Note that here the field parameter needs to be a string value, not a name. The valid field names for date_part are the same as for extract.</p>
<div class="highlight-sql"><div class="highlight"><pre><span class="k">select</span> <span class="n">date_part</span><span class="p">(</span><span class="s1">'day'</span><span class="p">,</span> <span class="k">timestamp</span> <span class="s1">'2001-02-16 20:38:40'</span><span class="p">);</span>
<span class="o">></span> <span class="mi">16</span><span class="p">.</span><span class="mi">0</span>
@@ -423,7 +423,7 @@
<dl class="function">
<dt id="now">
-<tt class="descname">now</tt><big>(</big><big>)</big><a class="headerlink" href="#now" title="Permalink to this definition">¶</a></dt>
+<code class="descname">now</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#now" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns current timestamp</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -443,7 +443,7 @@
<dl class="function">
<dt id="to_char">
-<tt class="descname">to_char</tt><big>(</big><em>src timestamp</em>, <em>format text</em><big>)</big><a class="headerlink" href="#to_char" title="Permalink to this definition">¶</a></dt>
+<code class="descname">to_char</code><span class="sig-paren">(</span><em>src timestamp</em>, <em>format text</em><span class="sig-paren">)</span><a class="headerlink" href="#to_char" title="Permalink to this definition">¶</a></dt>
<dd><p>Converts timestamp to text. For more detailed, see ‘Date/Time Formatting and Conversion’ section below.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -468,7 +468,7 @@
<dl class="function">
<dt id="to_date">
-<tt class="descname">to_date</tt><big>(</big><em>src text</em>, <em>format text</em><big>)</big><a class="headerlink" href="#to_date" title="Permalink to this definition">¶</a></dt>
+<code class="descname">to_date</code><span class="sig-paren">(</span><em>src text</em>, <em>format text</em><span class="sig-paren">)</span><a class="headerlink" href="#to_date" title="Permalink to this definition">¶</a></dt>
<dd><p>Converts text to date. For more detailed, see ‘Date/Time Formatting and Conversion’ section below.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -493,7 +493,7 @@
<dl class="function">
<dt id="to_timestamp">
-<tt class="descname">to_timestamp</tt><big>(</big><em>epoch int</em><big>)</big><a class="headerlink" href="#to_timestamp" title="Permalink to this definition">¶</a></dt>
+<code class="descname">to_timestamp</code><span class="sig-paren">(</span><em>epoch int</em><span class="sig-paren">)</span><a class="headerlink" href="#to_timestamp" title="Permalink to this definition">¶</a></dt>
<dd><p>Converts int(UNIX epoch) to timestamp.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -513,7 +513,7 @@
<dl class="function">
<dt>
-<tt class="descname">to_timestamp</tt><big>(</big><em>src text</em>, <em>format text</em><big>)</big></dt>
+<code class="descname">to_timestamp</code><span class="sig-paren">(</span><em>src text</em>, <em>format text</em><span class="sig-paren">)</span></dt>
<dd><p>Converts text timestamp. For more detailed, see ‘Date/Time Formatting and Conversion’ section below.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -538,7 +538,7 @@
<dl class="function">
<dt id="utc_usec_to">
-<tt class="descname">utc_usec_to</tt><big>(</big><em>string text</em>, <em>long timestamp</em>, <em>int dayOfWeek</em><big>)</big><a class="headerlink" href="#utc_usec_to" title="Permalink to this definition">¶</a></dt>
+<code class="descname">utc_usec_to</code><span class="sig-paren">(</span><em>string text</em>, <em>long timestamp</em>, <em>int dayOfWeek</em><span class="sig-paren">)</span><a class="headerlink" href="#utc_usec_to" title="Permalink to this definition">¶</a></dt>
<dd><ul>
<li><p class="first">If the <strong>first parameter</strong> is ‘day’.</p>
<p>Shifts and return a UNIX timestamp in microseconds to the beginning of the day it occurs in.
Modified: tajo/site/docs/devel/functions/json_func.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions/json_func.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/json_func.html (original)
+++ tajo/site/docs/devel/functions/json_func.html Thu May 28 12:22:19 2015
@@ -199,7 +199,7 @@
<h1>JSON Functions<a class="headerlink" href="#json-functions" title="Permalink to this headline">¶</a></h1>
<dl class="function">
<dt id="json_extract_path_text">
-<tt class="descname">json_extract_path_text</tt><big>(</big><em>string json</em>, <em>string xpath</em><big>)</big><a class="headerlink" href="#json_extract_path_text" title="Permalink to this definition">¶</a></dt>
+<code class="descname">json_extract_path_text</code><span class="sig-paren">(</span><em>string json</em>, <em>string xpath</em><span class="sig-paren">)</span><a class="headerlink" href="#json_extract_path_text" title="Permalink to this definition">¶</a></dt>
<dd><p>Extracts JSON string from a JSON string based on json path specified and returns JSON string pointed to by xPath</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
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=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/math_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/math_func_and_operators.html Thu May 28 12:22:19 2015
@@ -199,7 +199,7 @@
<h1>Math Functions and Operators<a class="headerlink" href="#math-functions-and-operators" title="Permalink to this headline">¶</a></h1>
<dl class="function">
<dt id="abs">
-<tt class="descname">abs</tt><big>(</big><em>number int|float</em><big>)</big><a class="headerlink" href="#abs" title="Permalink to this definition">¶</a></dt>
+<code class="descname">abs</code><span class="sig-paren">(</span><em>number int|float</em><span class="sig-paren">)</span><a class="headerlink" href="#abs" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns absolute value</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -221,7 +221,7 @@
<dl class="function">
<dt id="acos">
-<tt class="descname">acos</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#acos" title="Permalink to this definition">¶</a></dt>
+<code class="descname">acos</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#acos" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the arc cosine of number value</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -243,7 +243,7 @@
<dl class="function">
<dt id="asin">
-<tt class="descname">asin</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#asin" title="Permalink to this definition">¶</a></dt>
+<code class="descname">asin</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#asin" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the arc sine of number value</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -265,7 +265,7 @@
<dl class="function">
<dt id="atan">
-<tt class="descname">atan</tt><big>(</big><em>number float8</em><big>)</big><a class="headerlink" href="#atan" title="Permalink to this definition">¶</a></dt>
+<code class="descname">atan</code><span class="sig-paren">(</span><em>number float8</em><span class="sig-paren">)</span><a class="headerlink" href="#atan" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the arc tangent of number value</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -287,7 +287,7 @@
<dl class="function">
<dt id="atan2">
-<tt class="descname">atan2</tt><big>(</big><em>y float</em>, <em>x float</em><big>)</big><a class="headerlink" href="#atan2" title="Permalink to this definition">¶</a></dt>
+<code class="descname">atan2</code><span class="sig-paren">(</span><em>y float</em>, <em>x float</em><span class="sig-paren">)</span><a class="headerlink" href="#atan2" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the angle theta from the conversion of rectangular coordinates (x, y) to polar coordinates (r, theta)</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -314,7 +314,7 @@
<dl class="function">
<dt id="cbrt">
-<tt class="descname">cbrt</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#cbrt" title="Permalink to this definition">¶</a></dt>
+<code class="descname">cbrt</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#cbrt" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the cube root of a number</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -336,7 +336,7 @@
<dl class="function">
<dt id="ceil">
-<tt class="descname">ceil</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#ceil" title="Permalink to this definition">¶</a></dt>
+<code class="descname">ceil</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#ceil" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns a smallest integer not less than argument</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -358,7 +358,7 @@
<dl class="function">
<dt id="cos">
-<tt class="descname">cos</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#cos" title="Permalink to this definition">¶</a></dt>
+<code class="descname">cos</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#cos" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the cosine of a number</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -380,7 +380,7 @@
<dl class="function">
<dt id="degrees">
-<tt class="descname">degrees</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#degrees" title="Permalink to this definition">¶</a></dt>
+<code class="descname">degrees</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#degrees" title="Permalink to this definition">¶</a></dt>
<dd><p>Converts radians to degrees</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -402,7 +402,7 @@
<dl class="function">
<dt id="div">
-<tt class="descname">div</tt><big>(</big><em>num1 int</em>, <em>num2 int</em><big>)</big><a class="headerlink" href="#div" title="Permalink to this definition">¶</a></dt>
+<code class="descname">div</code><span class="sig-paren">(</span><em>num1 int</em>, <em>num2 int</em><span class="sig-paren">)</span><a class="headerlink" href="#div" title="Permalink to this definition">¶</a></dt>
<dd><p>Integer division truncates resut</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -429,7 +429,7 @@
<dl class="function">
<dt id="exp">
-<tt class="descname">exp</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#exp" title="Permalink to this definition">¶</a></dt>
+<code class="descname">exp</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#exp" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns Euler’s number e raised to the power of a number</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -451,7 +451,7 @@
<dl class="function">
<dt id="floor">
-<tt class="descname">floor</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#floor" title="Permalink to this definition">¶</a></dt>
+<code class="descname">floor</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#floor" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns a largest integer not greater than argument</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -473,7 +473,7 @@
<dl class="function">
<dt id="mod">
-<tt class="descname">mod</tt><big>(</big><em>num1 int</em>, <em>num2 int</em><big>)</big><a class="headerlink" href="#mod" title="Permalink to this definition">¶</a></dt>
+<code class="descname">mod</code><span class="sig-paren">(</span><em>num1 int</em>, <em>num2 int</em><span class="sig-paren">)</span><a class="headerlink" href="#mod" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns remainder of num1 / num2</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -500,7 +500,7 @@
<dl class="function">
<dt id="pi">
-<tt class="descname">pi</tt><big>(</big><big>)</big><a class="headerlink" href="#pi" title="Permalink to this definition">¶</a></dt>
+<code class="descname">pi</code><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#pi" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns constant value of pi</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -520,7 +520,7 @@
<dl class="function">
<dt id="pow">
-<tt class="descname">pow</tt><big>(</big><em>x float</em>, <em>y float</em><big>)</big><a class="headerlink" href="#pow" title="Permalink to this definition">¶</a></dt>
+<code class="descname">pow</code><span class="sig-paren">(</span><em>x float</em>, <em>y float</em><span class="sig-paren">)</span><a class="headerlink" href="#pow" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns value of x raised to the power of y</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -547,7 +547,7 @@
<dl class="function">
<dt id="radians">
-<tt class="descname">radians</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#radians" title="Permalink to this definition">¶</a></dt>
+<code class="descname">radians</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#radians" title="Permalink to this definition">¶</a></dt>
<dd><p>Converts degrees to radians</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -569,7 +569,7 @@
<dl class="function">
<dt id="round">
-<tt class="descname">round</tt><big>(</big><em>number int|float</em><big>)</big><a class="headerlink" href="#round" title="Permalink to this definition">¶</a></dt>
+<code class="descname">round</code><span class="sig-paren">(</span><em>number int|float</em><span class="sig-paren">)</span><a class="headerlink" href="#round" title="Permalink to this definition">¶</a></dt>
<dd><p>Rounds to nearest integer</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -591,7 +591,7 @@
<dl class="function">
<dt id="sign">
-<tt class="descname">sign</tt><big>(</big><em>number int|float</em><big>)</big><a class="headerlink" href="#sign" title="Permalink to this definition">¶</a></dt>
+<code class="descname">sign</code><span class="sig-paren">(</span><em>number int|float</em><span class="sig-paren">)</span><a class="headerlink" href="#sign" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns sign of argument as -1, 0, 1</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -613,7 +613,7 @@
<dl class="function">
<dt id="sin">
-<tt class="descname">sin</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#sin" title="Permalink to this definition">¶</a></dt>
+<code class="descname">sin</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#sin" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the sine of number value</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -635,7 +635,7 @@
<dl class="function">
<dt id="sqrt">
-<tt class="descname">sqrt</tt><big>(</big><em>number float8</em><big>)</big><a class="headerlink" href="#sqrt" title="Permalink to this definition">¶</a></dt>
+<code class="descname">sqrt</code><span class="sig-paren">(</span><em>number float8</em><span class="sig-paren">)</span><a class="headerlink" href="#sqrt" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the square root of a number</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -657,7 +657,7 @@
<dl class="function">
<dt id="tan">
-<tt class="descname">tan</tt><big>(</big><em>number float</em><big>)</big><a class="headerlink" href="#tan" title="Permalink to this definition">¶</a></dt>
+<code class="descname">tan</code><span class="sig-paren">(</span><em>number float</em><span class="sig-paren">)</span><a class="headerlink" href="#tan" title="Permalink to this definition">¶</a></dt>
<dd><p>Returns the tangent of number value</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
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=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/network_func_and_operators.html (original)
+++ tajo/site/docs/devel/functions/network_func_and_operators.html Thu May 28 12:22:19 2015
@@ -203,7 +203,7 @@
To use these functions and operations, the GeoIP database should be precedently installed in local disks of
all the workers.
(Please refer the install instruction in <a class="reference external" href="http://dev.maxmind.com/geoip/legacy/downloadable/">http://dev.maxmind.com/geoip/legacy/downloadable/</a>)</p>
-<p>Once the GeoIP database is installed, you should specify the install location in <tt class="docutils literal"><span class="pre">conf/tajo-site.xml</span></tt>
+<p>Once the GeoIP database is installed, you should specify the install location in <code class="docutils literal"><span class="pre">conf/tajo-site.xml</span></code>
as follows.</p>
<div class="highlight-python"><div class="highlight"><pre><property>
<name>tajo.function.geoip-database-location</name>
@@ -216,7 +216,7 @@ as follows.</p>
<h2>Supported Functions<a class="headerlink" href="#supported-functions" title="Permalink to this headline">¶</a></h2>
<dl class="function">
<dt id="geoip_country_code">
-<tt class="descname">geoip_country_code</tt><big>(</big><em>string addr</em><big>)</big><a class="headerlink" href="#geoip_country_code" title="Permalink to this definition">¶</a></dt>
+<code class="descname">geoip_country_code</code><span class="sig-paren">(</span><em>string addr</em><span class="sig-paren">)</span><a class="headerlink" href="#geoip_country_code" title="Permalink to this definition">¶</a></dt>
<dd><p>Convert an ipv4 address string to a geoip country code.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -238,7 +238,7 @@ as follows.</p>
<dl class="function">
<dt>
-<tt class="descname">geoip_country_code</tt><big>(</big><em>inet4 addr</em><big>)</big></dt>
+<code class="descname">geoip_country_code</code><span class="sig-paren">(</span><em>inet4 addr</em><span class="sig-paren">)</span></dt>
<dd><p>Convert an ipv4 address to a geoip country code.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -260,7 +260,7 @@ as follows.</p>
<dl class="function">
<dt id="geoip_in_country">
-<tt class="descname">geoip_in_country</tt><big>(</big><em>string addr</em>, <em>string code</em><big>)</big><a class="headerlink" href="#geoip_in_country" title="Permalink to this definition">¶</a></dt>
+<code class="descname">geoip_in_country</code><span class="sig-paren">(</span><em>string addr</em>, <em>string code</em><span class="sig-paren">)</span><a class="headerlink" href="#geoip_in_country" title="Permalink to this definition">¶</a></dt>
<dd><p>If the given country code is same with the country code of the given address, it returns true. Otherwise, returns false.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
@@ -287,7 +287,7 @@ as follows.</p>
<dl class="function">
<dt>
-<tt class="descname">geoip_in_country</tt><big>(</big><em>inet4 addr</em>, <em>string code</em><big>)</big></dt>
+<code class="descname">geoip_in_country</code><span class="sig-paren">(</span><em>inet4 addr</em>, <em>string code</em><span class="sig-paren">)</span></dt>
<dd><p>If the given country code is same with the country code of the given address, it returns true. Otherwise, returns false.</p>
<table class="docutils field-list" frame="void" rules="none">
<col class="field-name" />
Modified: tajo/site/docs/devel/functions/python.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/devel/functions/python.html?rev=1682226&r1=1682225&r2=1682226&view=diff
==============================================================================
--- tajo/site/docs/devel/functions/python.html (original)
+++ tajo/site/docs/devel/functions/python.html Thu May 28 12:22:19 2015
@@ -202,14 +202,14 @@
<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>
+After that, you can register your functions by specifying the paths to those script files in <code class="docutils literal"><span class="pre">tajo-site.xml</span></code>. Here is an example of the configuration.</p>
<div class="highlight-xml"><div class="highlight"><pre><span class="nt"><property></span>
<span class="nt"><name></span>tajo.function.python.code-dir<span class="nt"></name></span>
<span class="nt"><value></span>/path/to/script1.py,/path/to/script2.py<span class="nt"></value></span>
<span class="nt"></property></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>
+<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>
<span class="nd">@output_type</span><span class="p">(</span><span class="s">'int4'</span><span class="p">)</span>
@@ -233,10 +233,10 @@ After that, you can register your functi
</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>.
+<p>By default, every function has a return type of <code class="docutils literal"><span class="pre">BLOB</span></code>.
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">output_type</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>
+<li><code class="docutils literal"><span class="pre">output_type</span></code>: 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">
@@ -313,13 +313,13 @@ Followings are typical examples of Pytho
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">cnt</span>
</pre></div>
</div>
-<p>These classes must provide <tt class="docutils literal"><span class="pre">reset()</span></tt>, <tt class="docutils literal"><span class="pre">eval()</span></tt>, <tt class="docutils literal"><span class="pre">merge()</span></tt>, <tt class="docutils literal"><span class="pre">get_partial_result()</span></tt>, and <tt class="docutils literal"><span class="pre">get_final_result()</span></tt> functions.</p>
+<p>These classes must provide <code class="docutils literal"><span class="pre">reset()</span></code>, <code class="docutils literal"><span class="pre">eval()</span></code>, <code class="docutils literal"><span class="pre">merge()</span></code>, <code class="docutils literal"><span class="pre">get_partial_result()</span></code>, and <code class="docutils literal"><span class="pre">get_final_result()</span></code> functions.</p>
<ul class="simple">
-<li><tt class="docutils literal"><span class="pre">reset()</span></tt> resets the aggregation state.</li>
-<li><tt class="docutils literal"><span class="pre">eval()</span></tt> evaluates input tuples in the first stage.</li>
-<li><tt class="docutils literal"><span class="pre">merge()</span></tt> merges intermediate results of the first stage.</li>
-<li><tt class="docutils literal"><span class="pre">get_partial_result()</span></tt> returns intermediate results of the first stage. Output type must be same with the input type of <tt class="docutils literal"><span class="pre">merge()</span></tt>.</li>
-<li><tt class="docutils literal"><span class="pre">get_final_result()</span></tt> returns the final aggregation result.</li>
+<li><code class="docutils literal"><span class="pre">reset()</span></code> resets the aggregation state.</li>
+<li><code class="docutils literal"><span class="pre">eval()</span></code> evaluates input tuples in the first stage.</li>
+<li><code class="docutils literal"><span class="pre">merge()</span></code> merges intermediate results of the first stage.</li>
+<li><code class="docutils literal"><span class="pre">get_partial_result()</span></code> returns intermediate results of the first stage. Output type must be same with the input type of <code class="docutils literal"><span class="pre">merge()</span></code>.</li>
+<li><code class="docutils literal"><span class="pre">get_final_result()</span></code> returns the final aggregation result.</li>
</ul>
</div>
<div class="section" id="id2">