Repository: tajo Updated Branches: refs/heads/master e12e038b5 -> 4209b83c2
TAJO-685: Add prerequisite to the document of network functions and operators. (jihoon) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4209b83c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4209b83c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4209b83c Branch: refs/heads/master Commit: 4209b83c2896672c01261bbe7dd929a8c7e5f5d8 Parents: e12e038 Author: Jihoon Son <[email protected]> Authored: Tue Mar 25 14:46:33 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Mar 25 14:46:33 2014 +0900 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../java/org/apache/tajo/conf/TajoConf.java | 2 +- .../functions/network_func_and_operators.rst | 25 ++++++++++++++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4209b83c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7d9862e..8c0254d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -132,6 +132,9 @@ Release 0.8.0 - unreleased IMPROVEMENTS + TAJO-685: Add prerequisite to the document of network functions and operators. + (jihoon) + TAJO-644: Support quoted identifiers. (hyunsik) TAJO-553: Add a method to the TajoClient to get finished query lists. http://git-wip-us.apache.org/repos/asf/tajo/blob/4209b83c/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java index befaa98..12f725c 100644 --- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java +++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java @@ -220,7 +220,7 @@ public class TajoConf extends Configuration { ////////////////////////////////// // GeoIP - GEOIP_DATA("tajo.geoip.data", ""), + GEOIP_DATA("tajo.function.geoip-database-location", ""), ////////////////////////////////// // Hive Configuration http://git-wip-us.apache.org/repos/asf/tajo/blob/4209b83c/tajo-docs/src/main/sphinx/functions/network_func_and_operators.rst ---------------------------------------------------------------------- diff --git a/tajo-docs/src/main/sphinx/functions/network_func_and_operators.rst b/tajo-docs/src/main/sphinx/functions/network_func_and_operators.rst index 029885d..d549244 100644 --- a/tajo-docs/src/main/sphinx/functions/network_func_and_operators.rst +++ b/tajo-docs/src/main/sphinx/functions/network_func_and_operators.rst @@ -2,11 +2,32 @@ Network Functions and Operators ******************************* +============= +Prerequisites +============= + +Apache Tajo provides network functions and operations using GeoIP databases. +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 http://dev.maxmind.com/geoip/legacy/downloadable/) + +Once the GeoIP database is installed, you should specify the install location in ``conf/tajo-site.xml`` +as follows. :: + + <property> + <name>tajo.function.geoip-database-location</name> + <value>/path/to/geoip/database/file</value> + </property> + +=================== +Supported Functions +=================== + .. function:: geoip_country_code (string addr) Convert an ipv4 address string to a geoip country code. - :param string: ipv4 address string + :param addr: ipv4 address string :rtype: text :example: @@ -19,7 +40,7 @@ Network Functions and Operators Convert an ipv4 address to a geoip country code. - :param string: ipv4 address + :param addr: ipv4 address :rtype: text :example:
