You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2014/12/12 09:22:19 UTC
[05/45] tajo git commit: TAJO-1243: *-site.xml.template should have
default configs commented out.
TAJO-1243: *-site.xml.template should have default configs commented out.
Closes #297
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/876adcfb
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/876adcfb
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/876adcfb
Branch: refs/heads/index_support
Commit: 876adcfbe358c6d91d9a50ba81847ebba1f0184d
Parents: adb34bd
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu Dec 11 23:36:30 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu Dec 11 23:36:30 2014 +0900
----------------------------------------------------------------------
CHANGES | 3 +
.../src/main/conf/catalog-site.xml.template | 76 +++++++++++++++++
tajo-dist/src/main/conf/tajo-site.xml.template | 90 ++++++++++++++++++++
3 files changed, 169 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/876adcfb/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 910c175..e039f97 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,9 @@ Release 0.9.1 - unreleased
IMPROVEMENT
+ TAJO-1243: *-site.xml.template should have default configs commented out.
+ (hyunsik)
+
TAJO-1143: TajoMaster, TajoWorker, and TajoClient should have
diagnosis phase at startup. (Jihun Kang via hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/876adcfb/tajo-dist/src/main/conf/catalog-site.xml.template
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/conf/catalog-site.xml.template b/tajo-dist/src/main/conf/catalog-site.xml.template
index 2d5710e..dddcc89 100644
--- a/tajo-dist/src/main/conf/catalog-site.xml.template
+++ b/tajo-dist/src/main/conf/catalog-site.xml.template
@@ -18,5 +18,81 @@
-->
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!-- Refer to http://tajo.apache.org/docs/current/configuration/catalog_configuration.html -->
+
<configuration>
+
+<!-- JDBC Common Settings -->
+
+<!-- Please remove comments if you want JDBC-based catalog store. -->
+<!--
+<property>
+ <name>tajo.catalog.jdbc.connection.id</name>
+ <value><mysql user name></value>
+</property>
+<property>
+ <name>tajo.catalog.jdbc.connection.password</name>
+ <value><mysql user password></value>
+</property>
+-->
+
+<!-- JDBC Store Section -->
+
+<!-- Please remove comments corresponding to your desired catalog store. -->
+<!-- You must choose only one catalog store driver among them. -->
+
+ <!-- MySQL Catalog Store Driver -->
+ <!--
+ <property>
+ <name>tajo.catalog.store.class</name>
+ <value>org.apache.tajo.catalog.store.MySQLStore</value>
+ </property>
+ <property>
+ <name>tajo.catalog.jdbc.uri</name>
+ <value>jdbc:mysql://<host name>:<mysql port>/<database name for tajo>?createDatabaseIfNotExist=true</value>
+ </property>
+ -->
+
+ <!-- MariaDB Catalog Store Driver -->
+ <!--
+ <property>
+ <name>tajo.catalog.store.class</name>
+ <value>org.apache.tajo.catalog.store.MariaDBStore</value>
+ </property>
+ <property>
+ <name>tajo.catalog.jdbc.uri</name>
+ <value>jdbc:mariadb://<mariadb host name>:<mariadb port>/<database name for tajo>?createDatabaseIfNotExist=true</value>
+ </property>
+ -->
+
+ <!-- PostgreSQL Catalog Store Driver -->
+ <!--
+ <property>
+ <name>tajo.catalog.store.class</name>
+ <value>org.apache.tajo.catalog.store.PostgreSQLStore</value>
+ </property>
+ <property>
+ <name>tajo.catalog.jdbc.uri</name>
+ <value>jdbc:mariadb://<mariadb host name>:<mariadb port>/<database name for tajo>?createDatabaseIfNotExist=true</value>
+ </property>
+ -->
+
+ <!-- Oracle Catalog Store Driver -->
+ <!--
+ <property>
+ <name>tajo.catalog.store.class</name>
+ <value>org.apache.tajo.catalog.store.OracleStore</value>
+ </property>
+ -->
+
+
+<!-- HCatalog Store Driver -->
+<!-- Please remove comment if you want to use HCatalog. -->
+<!--
+<property>
+ <name>tajo.catalog.store.class</name>
+ <value>org.apache.tajo.catalog.store.HCatalogStore</value>
+</property>
+-->
+
</configuration>
http://git-wip-us.apache.org/repos/asf/tajo/blob/876adcfb/tajo-dist/src/main/conf/tajo-site.xml.template
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/conf/tajo-site.xml.template b/tajo-dist/src/main/conf/tajo-site.xml.template
index 084cc30..a6f5dd6 100644
--- a/tajo-dist/src/main/conf/tajo-site.xml.template
+++ b/tajo-dist/src/main/conf/tajo-site.xml.template
@@ -20,4 +20,94 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<configuration>
+
+<!-- System Settings -->
+<!--
+
+ <property>
+ <name>tajo.rootdir</name>
+ <value>hdfs://namenode_hostname:port/path</value>
+ <description>Base directory including system directories.</description>
+</property>
+
+<property>
+ <name>tajo.master.umbilical-rpc.address</name>
+ <value>hostname:26001</value>
+ <description>TajoMaster binding address between master and workers.</description>
+</property>
+
+<property>
+ <name>tajo.master.client-rpc.address</name>
+ <value>hostname:26002</value>
+ <description>TajoMaster binding address between master and clients.</description>
+</property>
+
+<property>
+ <name>tajo.resource-tracker.rpc.address</name>
+ <value>hostname:26003</value>
+ <description>TajoMaster binding address between master and workers.</description>
+</property>
+
+<property>
+ <name>tajo.catalog.client-rpc.address</name>
+ <value>hostname:26005</value>
+ <description>CatalogServer binding address between catalog server and workers.</description>
+</property>
+-->
+
+
+<!-- Worker Settings -->
+<!--
+<property>
+ <name>tajo.worker.resource.cpu-cores</name>
+ <value>1</value>
+ <description>Number of CPU cores</description>
+</property>
+
+<property>
+ <name>tajo.worker.resource.memory-mb</name>
+ <value>1024</value>
+ <description>Available memory size (MB)</description>
+</property>
+
+<property>
+ <name>tajo.worker.resource.disks</name>
+ <value>1</value>
+ <description>Available disk capacity (usually number of disks)</description>
+</property>
+
+<property>
+ <name>tajo.worker.tmpdir.locations</name>
+ <value>/tmp/tajo-${user.name}/tmpdir</value>
+ <description>A base for other temporary directories.</description>
+</property>
+-->
+
+
+<!-- Date/Time -->
+<!--
+ <property>
+ <name>tajo.timezone</name>
+ <value>GMT</value>
+ <description>Global system time zone which affects all tables in which table time zones are not specified</description>
+ </property>
+
+ <property>
+ <name>tajo.datetime.date-order</name>
+ <value>YMD</value>
+ <description>Determine date order. One of them YMD, DMY, MDY should be here.</description>
+ </property>
+-->
+
+
+<!-- Debug -->
+<!--
+ <property>
+ <name>tajo.debug.enabled</name>
+ <value>false</value>
+ <description>Debug mode</description>
+ </property>
+-->
+
+
</configuration>