tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blrun...@apache.org
Subject svn commit: r1627192 [1/3] - in /tajo/site/docs/current: ./ _sources/ _sources/configuration/ _sources/functions/ _static/ backup_and_restore/ configuration/ functions/ getting_started/ partitioning/ sql_language/ table_management/
Date Wed, 24 Sep 2014 02:16:43 GMT
Author: blrunner
Date: Wed Sep 24 02:16:42 2014
New Revision: 1627192

URL: http://svn.apache.org/r1627192
Log:
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo

Modified:
    tajo/site/docs/current/_sources/configuration.txt
    tajo/site/docs/current/_sources/configuration/catalog_configuration.txt
    tajo/site/docs/current/_sources/functions/math_func_and_operators.txt
    tajo/site/docs/current/_static/basic.css
    tajo/site/docs/current/_static/doctools.js
    tajo/site/docs/current/_static/jquery.js
    tajo/site/docs/current/_static/searchtools.js
    tajo/site/docs/current/_static/underscore.js
    tajo/site/docs/current/_static/websupport.js
    tajo/site/docs/current/backup_and_restore.html
    tajo/site/docs/current/backup_and_restore/catalog.html
    tajo/site/docs/current/cli.html
    tajo/site/docs/current/configuration.html
    tajo/site/docs/current/configuration/catalog_configuration.html
    tajo/site/docs/current/configuration/cluster_setup.html
    tajo/site/docs/current/configuration/configuration_defaults.html
    tajo/site/docs/current/configuration/preliminary.html
    tajo/site/docs/current/configuration/tajo_master_configuration.html
    tajo/site/docs/current/configuration/worker_configuration.html
    tajo/site/docs/current/faq.html
    tajo/site/docs/current/functions.html
    tajo/site/docs/current/functions/datetime_func_and_operators.html
    tajo/site/docs/current/functions/math_func_and_operators.html
    tajo/site/docs/current/functions/network_func_and_operators.html
    tajo/site/docs/current/functions/string_func_and_operators.html
    tajo/site/docs/current/genindex.html
    tajo/site/docs/current/getting_started.html
    tajo/site/docs/current/getting_started/building.html
    tajo/site/docs/current/getting_started/downloading_source.html
    tajo/site/docs/current/getting_started/first_query.html
    tajo/site/docs/current/getting_started/local_setup.html
    tajo/site/docs/current/getting_started/prerequisites.html
    tajo/site/docs/current/hcatalog_integration.html
    tajo/site/docs/current/index.html
    tajo/site/docs/current/introduction.html
    tajo/site/docs/current/jdbc_driver.html
    tajo/site/docs/current/partitioning/column_partitioning.html
    tajo/site/docs/current/partitioning/hash_partitioning.html
    tajo/site/docs/current/partitioning/intro_to_partitioning.html
    tajo/site/docs/current/partitioning/range_partitioning.html
    tajo/site/docs/current/search.html
    tajo/site/docs/current/sql_language.html
    tajo/site/docs/current/sql_language/data_model.html
    tajo/site/docs/current/sql_language/ddl.html
    tajo/site/docs/current/sql_language/insert.html
    tajo/site/docs/current/sql_language/predicates.html
    tajo/site/docs/current/sql_language/queries.html
    tajo/site/docs/current/sql_language/sql_expression.html
    tajo/site/docs/current/table_management.html
    tajo/site/docs/current/table_management/compression.html
    tajo/site/docs/current/table_management/csv.html
    tajo/site/docs/current/table_management/file_formats.html
    tajo/site/docs/current/table_management/parquet.html
    tajo/site/docs/current/table_management/rcfile.html
    tajo/site/docs/current/table_management/sequencefile.html
    tajo/site/docs/current/table_partitioning.html
    tajo/site/docs/current/tajo_client_api.html

Modified: tajo/site/docs/current/_sources/configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/configuration.txt?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration.txt (original)
+++ tajo/site/docs/current/_sources/configuration.txt Wed Sep 24 02:16:42 2014
@@ -10,4 +10,5 @@ Configuration
     configuration/tajo_master_configuration
     configuration/worker_configuration
     configuration/catalog_configuration
-    configuration/configuration_defaults
\ No newline at end of file
+    configuration/configuration_defaults
+    configuration/ha_configuration

Modified: tajo/site/docs/current/_sources/configuration/catalog_configuration.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/configuration/catalog_configuration.txt?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/configuration/catalog_configuration.txt (original)
+++ tajo/site/docs/current/_sources/configuration/catalog_configuration.txt Wed Sep 24 02:16:42 2014
@@ -107,7 +107,7 @@ First, you must compile source code and 
   $ mvn clean install -DskipTests -Pdist -Dtar -Phcatalog-0.1x.0
   $ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 
-Currently Tajo supports only hive 0.12.0. If you enables HCatalogStore, you set the maven profile as ``-Phcatalog-0.12.0``.
+Currently Tajo supports hive 0.12.0, hive 0.13.0, hive 0.13.1. If you enables HCatalogStore, you set the maven profile as ``-Phcatalog-0.12.0``.
 
 Second, you must set your hive home directory to HIVE_HOME variable in ``conf/tajo-env.sh`` with it as follows:
 

Modified: tajo/site/docs/current/_sources/functions/math_func_and_operators.txt
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_sources/functions/math_func_and_operators.txt?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_sources/functions/math_func_and_operators.txt (original)
+++ tajo/site/docs/current/_sources/functions/math_func_and_operators.txt Wed Sep 24 02:16:42 2014
@@ -2,4 +2,278 @@
 Math Functions and Operators
 *****************************
 
-.. todo::
\ No newline at end of file
+.. function:: abs (number int|float)
+
+  Returns absolute value
+
+  :param number: input number
+  :rtype: same as a parameter type
+  :example:
+  
+  .. code-block:: sql
+
+    select abs(-9); 
+    > 9
+
+.. function:: acos (number float)
+
+  Returns the arc cosine of number value
+
+  :param number: input number as radian
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select acos(0.3); 
+    > 1.2661036727794992 
+
+.. function:: asin (number float)
+
+  Returns the arc sine of number value
+
+  :param number: input number as radian
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select acos(0.8); 
+    > 0.9272952180016123
+
+.. function:: atan (number float8)
+
+  Returns the arc tangent of number value
+
+  :param number: input number as radian
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select atan(0.8); 
+    > 0.6747409422235527
+
+.. function:: atan2 (y float, x float)
+
+  Returns the angle theta from the conversion of rectangular coordinates (x, y) to polar coordinates (r, theta)
+
+  :param y: the ordinate(y axis) coordinate
+  :param x: the abscissa(x axis) coordinate
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select atan2(2.7, 0.3);
+    > 1.460139105621001
+
+.. function:: cbrt (number float)
+
+  Returns the cube root of a number
+
+  :param number: target real number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select cbrt(27.0); 
+    > 3.0
+
+.. function:: ceil (number float)
+
+  Returns a smallest integer not less than argument
+
+  :param number: target real number
+  :rtype: int8
+  :example:
+
+  .. code-block:: sql
+
+    select ceil(-42.8); 
+    > -42
+
+.. function:: cos (number float)
+
+  Returns the cosine of a number
+
+  :param number: target real number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select cos(0.7);
+    > 0.7648421872844885
+
+.. function:: degrees (number float)
+
+  Converts radians to degrees
+
+  :param number: radian value
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select degrees(0.8);
+    > 45.83662361046586
+
+.. function:: div (num1 int, num2 int)
+
+  Integer division truncates resut
+
+  :param num1: number to be divided
+  :param num2: number to divide
+  :rtype: int8
+  :example:
+
+  .. code-block:: sql
+
+    select div(8,3);
+    > 2
+
+.. function:: exp (number float)
+
+  Returns Euler's number e raised to the power of a number
+
+  :param number: input number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select exp(1.0);
+    > 2.718281828459045
+
+.. function:: floor (number float)
+
+  Returns a largest integer not greater than argument
+
+  :param number: target real number
+  :rtype: int8
+  :example:
+
+  .. code-block:: sql
+
+    select floor(53.1); 
+    > 53
+
+.. function:: mod (num1 int, num2 int)
+
+  Returns remainder of num1 / num2
+
+  :param num1: number to be divided
+  :param num2: number to divide
+  :rtype: int8
+  :example:
+
+  .. code-block:: sql
+
+    select mod(10,3);
+    > 1
+
+.. function:: pi ()
+
+  Returns constant value of pi
+
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select pi();
+    > 3.141592653589793
+
+.. function:: pow (x float, y float)
+
+  Returns value of x raised to the power of y
+
+  :param x: base number
+  :param y: exponent
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select pow(2.0, 10.0);
+    > 1024.0
+
+.. function:: radians (number float)
+
+  Converts degrees to radians
+
+  :param number: degree value
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select radians(45.0);
+    > 0.7853981633974483
+
+.. function:: round (number int|float)
+
+  Rounds to nearest integer
+
+  :param number: target number
+  :rtype: int8
+  :example:
+
+  .. code-block:: sql
+
+    select round(5.1); 
+    > 5
+
+.. function:: sign (number int|float)
+
+  Returns sign of argument as -1, 0, 1
+
+  :param number: target number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select sign(-8.4); 
+    > -1.0
+
+.. function:: sin (number float)
+
+  Returns the sine of number value
+
+  :param number: target number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select sin(1.0); 
+    > 0.8414709848078965
+
+.. function:: sqrt (number float8)
+
+  Returns the square root of a number
+
+  :param number: target number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select sqrt(256.0); 
+    > 16.0
+
+.. function:: tan (number float)
+
+  Returns the tangent of number value
+
+  :param number: target number
+  :rtype: float8
+  :example:
+
+  .. code-block:: sql
+
+    select tan(0.2); 
+    > 0.2027100355086725

Modified: tajo/site/docs/current/_static/basic.css
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_static/basic.css?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_static/basic.css (original)
+++ tajo/site/docs/current/_static/basic.css Wed Sep 24 02:16:42 2014
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -79,17 +79,16 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
-div.sphinxsidebar #searchbox input[type="text"] {
+div.sphinxsidebar input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar #searchbox input[type="submit"] {
+div.sphinxsidebar input[type="submit"] {
     width: 30px;
 }
 
 img {
     border: 0;
-    max-width: 100%;
 }
 
 /* -- search page ----------------------------------------------------------- */
@@ -402,6 +401,10 @@ dl.glossary dt {
     margin: 0;
 }
 
+.refcount {
+    color: #060;
+}
+
 .optional {
     font-size: 1.3em;
 }

Modified: tajo/site/docs/current/_static/doctools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_static/doctools.js?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_static/doctools.js (original)
+++ tajo/site/docs/current/_static/doctools.js Wed Sep 24 02:16:42 2014
@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilities for all documentation.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -32,7 +32,7 @@ if (!window.console || !console.firebug)
  */
 jQuery.urldecode = function(x) {
   return decodeURIComponent(x).replace(/\+/g, ' ');
-};
+}
 
 /**
  * small helper function to urlencode strings
@@ -62,6 +62,18 @@ jQuery.getQueryParameters = function(s) 
 };
 
 /**
+ * small function to check if an array contains
+ * a given item.
+ */
+jQuery.contains = function(arr, item) {
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i] == item)
+      return true;
+  }
+  return false;
+};
+
+/**
  * highlight a given string on a jquery object by wrapping it in
  * span elements with the given class name.
  */
@@ -168,9 +180,6 @@ var Documentation = {
     var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
     if (terms.length) {
       var body = $('div.body');
-      if (!body.length) {
-        body = $('body');
-      }
       window.setTimeout(function() {
         $.each(terms, function() {
           body.highlightText(this.toLowerCase(), 'highlighted');

Modified: tajo/site/docs/current/_static/jquery.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_static/jquery.js?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_static/jquery.js (original)
+++ tajo/site/docs/current/_static/jquery.js Wed Sep 24 02:16:42 2014
@@ -1,2 +1,154 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */

[... 157 lines stripped ...]
Modified: tajo/site/docs/current/_static/searchtools.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_static/searchtools.js?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_static/searchtools.js (original)
+++ tajo/site/docs/current/_static/searchtools.js Wed Sep 24 02:16:42 2014
@@ -4,11 +4,38 @@
  *
  * Sphinx JavaScript utilties for the full-text search.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
 
+/**
+ * helper function to return a node containing the
+ * search summary for a given text. keywords is a list
+ * of stemmed words, hlwords is the list of normal, unstemmed
+ * words. the first one is used to find the occurance, the
+ * latter for highlighting it.
+ */
+
+jQuery.makeSearchSummary = function(text, keywords, hlwords) {
+  var textLower = text.toLowerCase();
+  var start = 0;
+  $.each(keywords, function() {
+    var i = textLower.indexOf(this.toLowerCase());
+    if (i > -1)
+      start = i;
+  });
+  start = Math.max(start - 120, 0);
+  var excerpt = ((start > 0) ? '...' : '') +
+  $.trim(text.substr(start, 240)) +
+  ((start + 240 - text.length) ? '...' : '');
+  var rv = $('<div class="context"></div>').text(excerpt);
+  $.each(hlwords, function() {
+    rv = rv.highlightText(this, 'highlighted');
+  });
+  return rv;
+}
+
 
 /**
  * Porter Stemmer
@@ -193,38 +220,6 @@ var Stemmer = function() {
 }
 
 
-
-/**
- * Simple result scoring code.
- */
-var Scorer = {
-  // Implement the following function to further tweak the score for each result
-  // The function takes a result array [filename, title, anchor, descr, score]
-  // and returns the new score.
-  /*
-  score: function(result) {
-    return result[4];
-  },
-  */
-
-  // query matches the full name of an object
-  objNameMatch: 11,
-  // or matches in the last dotted part of the object name
-  objPartialMatch: 6,
-  // Additive scores depending on the priority of the object
-  objPrio: {0:  15,   // used to be importantResults
-            1:  5,   // used to be objectResults
-            2: -5},  // used to be unimportantResults
-  //  Used when the priority is not in the mapping.
-  objPrioDefault: 0,
-
-  // query found in title
-  title: 15,
-  // query found in terms
-  term: 5
-};
-
-
 /**
  * Search Module
  */
@@ -244,13 +239,8 @@ var Search = {
   },
 
   loadIndex : function(url) {
-    $.ajax({type: "GET", url: url, data: null,
-            dataType: "script", cache: true,
-            complete: function(jqxhr, textstatus) {
-              if (textstatus != "success") {
-                document.getElementById("searchindexloader").src = url;
-              }
-            }});
+    $.ajax({type: "GET", url: url, data: null, success: null,
+            dataType: "script", cache: true});
   },
 
   setIndex : function(index) {
@@ -278,20 +268,19 @@ var Search = {
     if (this._pulse_status >= 0)
         return;
     function pulse() {
-      var i;
       Search._pulse_status = (Search._pulse_status + 1) % 4;
       var dotString = '';
-      for (i = 0; i < Search._pulse_status; i++)
+      for (var i = 0; i < Search._pulse_status; i++)
         dotString += '.';
       Search.dots.text(dotString);
       if (Search._pulse_status > -1)
         window.setTimeout(pulse, 500);
-    }
+    };
     pulse();
   },
 
   /**
-   * perform a search for something (or wait until index is loaded)
+   * perform a search for something
    */
   performSearch : function(query) {
     // create the required interface elements
@@ -311,46 +300,41 @@ var Search = {
       this.deferQuery(query);
   },
 
-  /**
-   * execute search (requires search index to be loaded)
-   */
   query : function(query) {
-    var i;
-    var stopwords = ["a","and","are","as","at","be","but","by","for","if","in","into","is","it","near","no","not","of","on","or","such","that","the","their","then","there","these","they","this","to","was","will","with"];
+    var stopwords = ["near","by","as","of","is","are","this","but","in","into","with","the","a","then","it","if","at","their","be","will","or","for","such","to","that","and","was","these","not","there","on","they","no"];
 
-    // stem the searchterms and add them to the correct list
+    // Stem the searchterms and add them to the correct list
     var stemmer = new Stemmer();
     var searchterms = [];
     var excluded = [];
     var hlterms = [];
     var tmp = query.split(/\s+/);
     var objectterms = [];
-    for (i = 0; i < tmp.length; i++) {
-      if (tmp[i] !== "") {
+    for (var i = 0; i < tmp.length; i++) {
+      if (tmp[i] != "") {
           objectterms.push(tmp[i].toLowerCase());
       }
 
-      if ($u.indexOf(stopwords, tmp[i].toLowerCase()) != -1 || tmp[i].match(/^\d+$/) ||
-          tmp[i] === "") {
+      if ($u.indexOf(stopwords, tmp[i]) != -1 || tmp[i].match(/^\d+$/) ||
+          tmp[i] == "") {
         // skip this "word"
         continue;
       }
       // stem the word
-      var word = stemmer.stemWord(tmp[i].toLowerCase());
-      var toAppend;
+      var word = stemmer.stemWord(tmp[i]).toLowerCase();
       // select the correct list
       if (word[0] == '-') {
-        toAppend = excluded;
+        var toAppend = excluded;
         word = word.substr(1);
       }
       else {
-        toAppend = searchterms;
+        var toAppend = searchterms;
         hlterms.push(tmp[i].toLowerCase());
       }
       // only add if not already in the list
-      if (!$u.contains(toAppend, word))
+      if (!$.contains(toAppend, word))
         toAppend.push(word);
-    }
+    };
     var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
 
     // console.debug('SEARCH: searching for:');
@@ -358,51 +342,89 @@ var Search = {
     // console.info('excluded: ', excluded);
 
     // prepare search
+    var filenames = this._index.filenames;
+    var titles = this._index.titles;
     var terms = this._index.terms;
-    var titleterms = this._index.titleterms;
-
-    // array of [filename, title, anchor, descr, score]
-    var results = [];
+    var fileMap = {};
+    var files = null;
+    // different result priorities
+    var importantResults = [];
+    var objectResults = [];
+    var regularResults = [];
+    var unimportantResults = [];
     $('#search-progress').empty();
 
     // lookup as object
-    for (i = 0; i < objectterms.length; i++) {
-      var others = [].concat(objectterms.slice(0, i),
-                             objectterms.slice(i+1, objectterms.length));
-      results = results.concat(this.performObjectSearch(objectterms[i], others));
-    }
-
-    // lookup as search terms in fulltext
-    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
-                     .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
-
-    // let the scorer override scores with a custom scoring function
-    if (Scorer.score) {
-      for (i = 0; i < results.length; i++)
-        results[i][4] = Scorer.score(results[i]);
-    }
-
-    // now sort the results by score (in opposite order of appearance, since the
-    // display function below uses pop() to retrieve items) and then
-    // alphabetically
-    results.sort(function(a, b) {
-      var left = a[4];
-      var right = b[4];
-      if (left > right) {
-        return 1;
-      } else if (left < right) {
-        return -1;
-      } else {
-        // same score: sort alphabetically
-        left = a[1].toLowerCase();
-        right = b[1].toLowerCase();
-        return (left > right) ? -1 : ((left < right) ? 1 : 0);
+    for (var i = 0; i < objectterms.length; i++) {
+      var others = [].concat(objectterms.slice(0,i),
+                             objectterms.slice(i+1, objectterms.length))
+      var results = this.performObjectSearch(objectterms[i], others);
+      // Assume first word is most likely to be the object,
+      // other words more likely to be in description.
+      // Therefore put matches for earlier words first.
+      // (Results are eventually used in reverse order).
+      objectResults = results[0].concat(objectResults);
+      importantResults = results[1].concat(importantResults);
+      unimportantResults = results[2].concat(unimportantResults);
+    }
+
+    // perform the search on the required terms
+    for (var i = 0; i < searchterms.length; i++) {
+      var word = searchterms[i];
+      // no match but word was a required one
+      if ((files = terms[word]) == null)
+        break;
+      if (files.length == undefined) {
+        files = [files];
       }
+      // create the mapping
+      for (var j = 0; j < files.length; j++) {
+        var file = files[j];
+        if (file in fileMap)
+          fileMap[file].push(word);
+        else
+          fileMap[file] = [word];
+      }
+    }
+
+    // now check if the files don't contain excluded terms
+    for (var file in fileMap) {
+      var valid = true;
+
+      // check if all requirements are matched
+      if (fileMap[file].length != searchterms.length)
+        continue;
+
+      // ensure that none of the excluded terms is in the
+      // search result.
+      for (var i = 0; i < excluded.length; i++) {
+        if (terms[excluded[i]] == file ||
+            $.contains(terms[excluded[i]] || [], file)) {
+          valid = false;
+          break;
+        }
+      }
+
+      // if we have still a valid result we can add it
+      // to the result list
+      if (valid)
+        regularResults.push([filenames[file], titles[file], '', null]);
+    }
+
+    // delete unused variables in order to not waste
+    // memory until list is retrieved completely
+    delete filenames, titles, terms;
+
+    // now sort the regular results descending by title
+    regularResults.sort(function(a, b) {
+      var left = a[1].toLowerCase();
+      var right = b[1].toLowerCase();
+      return (left > right) ? -1 : ((left < right) ? 1 : 0);
     });
 
-    // for debugging
-    //Search.lastresults = results.slice();  // a copy
-    //console.info('search results:', Search.lastresults);
+    // combine all results
+    var results = unimportantResults.concat(regularResults)
+      .concat(objectResults).concat(importantResults);
 
     // print the results
     var resultCount = results.length;
@@ -411,7 +433,7 @@ var Search = {
       if (results.length) {
         var item = results.pop();
         var listItem = $('<li style="display:none"></li>');
-        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX === '') {
+        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX == '') {
           // dirhtml builder
           var dirname = item[0] + '/';
           if (dirname.match(/\/index\/$/)) {
@@ -435,18 +457,16 @@ var Search = {
             displayNextItem();
           });
         } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
-          $.ajax({url: DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + item[0] + '.txt',
-                  dataType: "text",
-                  complete: function(jqxhr, textstatus) {
-                    var data = jqxhr.responseText;
-                    if (data !== '') {
-                      listItem.append(Search.makeSearchSummary(data, searchterms, hlterms));
-                    }
-                    Search.output.append(listItem);
-                    listItem.slideDown(5, function() {
-                      displayNextItem();
-                    });
-                  }});
+          $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' +
+                item[0] + '.txt', function(data) {
+            if (data != '') {
+              listItem.append($.makeSearchSummary(data, searchterms, hlterms));
+              Search.output.append(listItem);
+            }
+            listItem.slideDown(5, function() {
+              displayNextItem();
+            });
+          }, "text");
         } else {
           // no source available, just display title
           Search.output.append(listItem);
@@ -469,32 +489,20 @@ var Search = {
     displayNextItem();
   },
 
-  /**
-   * search for object names
-   */
   performObjectSearch : function(object, otherterms) {
     var filenames = this._index.filenames;
     var objects = this._index.objects;
     var objnames = this._index.objnames;
     var titles = this._index.titles;
 
-    var i;
-    var results = [];
+    var importantResults = [];
+    var objectResults = [];
+    var unimportantResults = [];
 
     for (var prefix in objects) {
       for (var name in objects[prefix]) {
         var fullname = (prefix ? prefix + '.' : '') + name;
         if (fullname.toLowerCase().indexOf(object) > -1) {
-          var score = 0;
-          var parts = fullname.split('.');
-          // check for different match types: exact matches of full name or
-          // "last name" (i.e. last dotted part)
-          if (fullname == object || parts[parts.length - 1] == object) {
-            score += Scorer.objNameMatch;
-          // matches in last name
-          } else if (parts[parts.length - 1].indexOf(object) > -1) {
-            score += Scorer.objPartialMatch;
-          }
           var match = objects[prefix][name];
           var objname = objnames[match[1]][2];
           var title = titles[match[0]];
@@ -504,7 +512,7 @@ var Search = {
             var haystack = (prefix + ' ' + name + ' ' +
                             objname + ' ' + title).toLowerCase();
             var allfound = true;
-            for (i = 0; i < otherterms.length; i++) {
+            for (var i = 0; i < otherterms.length; i++) {
               if (haystack.indexOf(otherterms[i]) == -1) {
                 allfound = false;
                 break;
@@ -515,107 +523,37 @@ var Search = {
             }
           }
           var descr = objname + _(', in ') + title;
-
-          var anchor = match[3];
-          if (anchor === '')
+          anchor = match[3];
+          if (anchor == '')
             anchor = fullname;
           else if (anchor == '-')
             anchor = objnames[match[1]][1] + '-' + fullname;
-          // add custom score for some objects according to scorer
-          if (Scorer.objPrio.hasOwnProperty(match[2])) {
-            score += Scorer.objPrio[match[2]];
-          } else {
-            score += Scorer.objPrioDefault;
+          result = [filenames[match[0]], fullname, '#'+anchor, descr];
+          switch (match[2]) {
+          case 1: objectResults.push(result); break;
+          case 0: importantResults.push(result); break;
+          case 2: unimportantResults.push(result); break;
           }
-          results.push([filenames[match[0]], fullname, '#'+anchor, descr, score]);
         }
       }
     }
 
-    return results;
-  },
-
-  /**
-   * search for full-text terms in the index
-   */
-  performTermsSearch : function(searchterms, excluded, terms, score) {
-    var filenames = this._index.filenames;
-    var titles = this._index.titles;
-
-    var i, j, file, files;
-    var fileMap = {};
-    var results = [];
-
-    // perform the search on the required terms
-    for (i = 0; i < searchterms.length; i++) {
-      var word = searchterms[i];
-      // no match but word was a required one
-      if ((files = terms[word]) === undefined)
-        break;
-      if (files.length === undefined) {
-        files = [files];
-      }
-      // create the mapping
-      for (j = 0; j < files.length; j++) {
-        file = files[j];
-        if (file in fileMap)
-          fileMap[file].push(word);
-        else
-          fileMap[file] = [word];
-      }
-    }
-
-    // now check if the files don't contain excluded terms
-    for (file in fileMap) {
-      var valid = true;
-
-      // check if all requirements are matched
-      if (fileMap[file].length != searchterms.length)
-          continue;
-
-      // ensure that none of the excluded terms is in the search result
-      for (i = 0; i < excluded.length; i++) {
-        if (terms[excluded[i]] == file ||
-          $u.contains(terms[excluded[i]] || [], file)) {
-          valid = false;
-          break;
-        }
-      }
-
-      // if we have still a valid result we can add it to the result list
-      if (valid) {
-        results.push([filenames[file], titles[file], '', null, score]);
-      }
-    }
-    return results;
-  },
+    // sort results descending
+    objectResults.sort(function(a, b) {
+      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
+    });
 
-  /**
-   * helper function to return a node containing the
-   * search summary for a given text. keywords is a list
-   * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurance, the
-   * latter for highlighting it.
-   */
-  makeSearchSummary : function(text, keywords, hlwords) {
-    var textLower = text.toLowerCase();
-    var start = 0;
-    $.each(keywords, function() {
-      var i = textLower.indexOf(this.toLowerCase());
-      if (i > -1)
-        start = i;
+    importantResults.sort(function(a, b) {
+      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
     });
-    start = Math.max(start - 120, 0);
-    var excerpt = ((start > 0) ? '...' : '') +
-      $.trim(text.substr(start, 240)) +
-      ((start + 240 - text.length) ? '...' : '');
-    var rv = $('<div class="context"></div>').text(excerpt);
-    $.each(hlwords, function() {
-      rv = rv.highlightText(this, 'highlighted');
+
+    unimportantResults.sort(function(a, b) {
+      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
     });
-    return rv;
+
+    return [importantResults, objectResults, unimportantResults]
   }
-};
+}
 
 $(document).ready(function() {
   Search.init();

Modified: tajo/site/docs/current/_static/underscore.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_static/underscore.js?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_static/underscore.js (original)
+++ tajo/site/docs/current/_static/underscore.js Wed Sep 24 02:16:42 2014
@@ -1,31 +1,23 @@
-// Underscore.js 1.3.1
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
+// Underscore.js 0.5.5
+// (c) 2009 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the terms of the MIT license.
+// Portions of Underscore are inspired by or borrowed from Prototype.js,
 // Oliver Steele's Functional, and John Resig's Micro-Templating.
 // For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&q(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&q(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,
-h)&&!f--)break;g=!f}}d.pop();return g}var r=this,G=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,H=k.unshift,l=o.toString,I=o.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,p=k.indexOf,D=k.lastIndexOf,o=Array.isArray,J=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else r._=b;b.VERSION="1.3.1";var j=b.each=
-b.forEach=function(a,c,d){if(a!=null)if(w&&a.forEach===w)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===n)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===n)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(x&&a.map===x)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==
-null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=
-function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e=
-e&&c.call(b,a,g,h)))return n});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return n});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return p&&a.indexOf===p?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&(e={value:a,computed:b})});
-return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){f==0?b[0]=a:(d=Math.floor(Math.random()*(f+1)),b[f]=b[d],b[d]=a)});return b};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,g){return{value:a,criteria:c.call(d,a,b,g)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,
-c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:a.toArray?a.toArray():b.isArray(a)?i.call(a):b.isArguments(a)?i.call(a):b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=
-b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,e=[];b.reduce(d,function(d,g,h){if(0==h||(c===true?b.last(d)!=g:!b.include(d,g)))d[d.length]=g,e[e.length]=a[h];return d},[]);
-return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,
-d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(p&&a.indexOf===p)return a.indexOf(c);for(d=0,e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(D&&a.lastIndexOf===D)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};
-var F=function(){};b.bind=function(a,c){var d,e;if(a.bind===s&&s)return s.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));F.prototype=a.prototype;var b=new F,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,
-c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i=b.debounce(function(){h=g=false},c);return function(){d=this;e=arguments;var b;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);i()},c));g?h=true:
-a.apply(d,e);i();g=true}};b.debounce=function(a,b){var d;return function(){var e=this,f=arguments;clearTimeout(d);d=setTimeout(function(){d=null;a.apply(e,f)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};
-b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=J||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.defaults=function(a){j(i.call(arguments,
-1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};
-b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!b.has(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};
-b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,b){return I.call(a,b)};b.noConflict=function(){r._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;").replace(/\//g,"&#x2F;")};b.mixin=function(a){j(b.functions(a),
-function(c){K(c,b[c]=a[c])})};var L=0;b.uniqueId=function(a){var b=L++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var t=/.^/,u=function(a){return a.replace(/\\\\/g,"\\").replace(/\\'/g,"'")};b.template=function(a,c){var d=b.templateSettings,d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.escape||t,function(a,b){return"',_.escape("+
-u(b)+"),'"}).replace(d.interpolate||t,function(a,b){return"',"+u(b)+",'"}).replace(d.evaluate||t,function(a,b){return"');"+u(b).replace(/[\r\n\t]/g," ")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var v=function(a,c){return c?b(a).chain():a},K=function(a,c){m.prototype[a]=
-function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=
-true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
+// http://documentcloud.github.com/underscore/
+(function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.5";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)||b.isArguments(a))for(var e=0,f=a.length;e<f;e++)c.call(d,
+a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bind(d,e),c);
+var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.every))return a.every(c,
+d);var e=true;b.each(a,function(f,g,h){(e=e&&c.call(d,f,g,h))||b.breakLoop()});return e};b.any=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.some))return a.some(c,d);var e=false;b.each(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(b.isArray(a))return b.indexOf(a,c)!=-1;var d=false;b.each(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply(e,d)})};b.pluck=
+function(a,c){return b.map(a,function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,
+function(e,f,g){return{value:e,criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return k.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return c&&!d?k.call(a,
+0,c):a[0]};b.rest=function(a,c,d){return k.call(a,b.isUndefined(c)||d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.select(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.select(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f||(c===true?b.last(d)!=e:!b.include(d,
+e)))d.push(e);return d})};b.intersect=function(a){var c=b.rest(arguments);return b.select(b.uniq(a),function(d){return b.all(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(a.indexOf)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(a.lastIndexOf)return a.lastIndexOf(c);for(var d=
+a.length;d--;)if(a[d]===c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]||1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;1;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind(a[d],a)});
+return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.range(0,a.length);
+var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c||a&&!c)return false;
+if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){return b.keys(a).length==
+0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&&
+a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.template=function(a,c){a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g,
+" ").replace(/'(?=[^%]*%>)/g,"\t").split("'").join("\\'").split("\t").join("'").replace(/<%=(.+?)%>/g,"',$1,'").split("<%").join("');").split("%>").join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b.toArray(arguments);
+o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.value=function(){return this._wrapped}})();

Modified: tajo/site/docs/current/_static/websupport.js
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/_static/websupport.js?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/_static/websupport.js (original)
+++ tajo/site/docs/current/_static/websupport.js Wed Sep 24 02:16:42 2014
@@ -4,7 +4,7 @@
  *
  * sphinx.websupport utilties for all documentation.
  *
- * :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

Modified: tajo/site/docs/current/backup_and_restore.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/backup_and_restore.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/backup_and_restore.html (original)
+++ tajo/site/docs/current/backup_and_restore.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -74,6 +75,7 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="cli.html">Tajo Shell (TSQL)</a><ul>
@@ -204,7 +206,7 @@
 
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
+            URL_ROOT:'',
             VERSION:'0.8.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',

Modified: tajo/site/docs/current/backup_and_restore/catalog.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/backup_and_restore/catalog.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/backup_and_restore/catalog.html (original)
+++ tajo/site/docs/current/backup_and_restore/catalog.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <li class="toctree-l2"><a class="reference internal" href="../configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>
@@ -171,11 +173,10 @@
 <div class="section" id="sql-dump">
 <h2>SQL dump<a class="headerlink" href="#sql-dump" title="Permalink to this headline">¶</a></h2>
 <p>SQL dump is an easy and strong way. If you use this approach, you don&#8217;t need to concern database-level compatiblities. If you want to backup your catalog, just use bin/tajo-dump command. The basic usage of this command is:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ tajo-dump table_name &gt; outfile
-</pre></div>
+<div class="highlight-python"><pre>$ tajo-dump table_name &gt; outfile</pre>
 </div>
 <p>For example, if you want to backup a table customer, you should type a command as follows:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ bin/tajo-dump customer &gt; table_backup.sql
+<div class="highlight-python"><pre>$ bin/tajo-dump customer &gt; table_backup.sql
 $
 $ cat table_backup.sql
 -- Tajo database dump
@@ -186,16 +187,13 @@ $ cat table_backup.sql
 -- Name: customer; Type: TABLE; Storage: CSV
 -- Path: file:/home/hyunsik/tpch/customer
 --
-CREATE EXTERNAL TABLE customer (c_custkey INT8, c_name TEXT, c_address TEXT, c_nationkey INT8, c_phone TEXT, c_acctbal FLOAT8, c_mktsegment TEXT, c_comment TEXT) USING CSV LOCATION &#39;file:/home/hyunsik/tpch/customer&#39;;
-</pre></div>
+CREATE EXTERNAL TABLE customer (c_custkey INT8, c_name TEXT, c_address TEXT, c_nationkey INT8, c_phone TEXT, c_acctbal FLOAT8, c_mktsegment TEXT, c_comment TEXT) USING CSV LOCATION 'file:/home/hyunsik/tpch/customer';</pre>
 </div>
 <p>If you want to restore the catalog from the SQL dump file, please type the below command:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ bin/tsql -f table_backup.sql
-</pre></div>
+<div class="highlight-python"><pre>$ bin/tsql -f table_backup.sql</pre>
 </div>
 <p>If you use an option &#8216;-a&#8217;, tajo-dump will dump all table DDLs.</p>
-<div class="highlight-python"><div class="highlight"><pre>$ bin/tajo-dump -a &gt; all_backup.sql
-</pre></div>
+<div class="highlight-python"><pre>$ bin/tajo-dump -a &gt; all_backup.sql</pre>
 </div>
 </div>
 <div class="section" id="database-level-backup">

Modified: tajo/site/docs/current/cli.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/cli.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/cli.html (original)
+++ tajo/site/docs/current/cli.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -30,7 +31,7 @@
   
     <link rel="top" title="Apache Tajo 0.8.0 documentation" href="index.html"/>
         <link rel="next" title="SQL Language" href="sql_language.html"/>
-        <link rel="prev" title="Configuration Defaults" href="configuration/configuration_defaults.html"/> 
+        <link rel="prev" title="High Availability for TajoMaster" href="configuration/ha_configuration.html"/> 
 
   
   <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
@@ -74,6 +75,7 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1 current"><a class="current reference internal" href="">Tajo Shell (TSQL)</a><ul>
@@ -177,15 +179,15 @@
 <div class="section" id="entering-tsql-shell">
 <h2>Entering tsql shell<a class="headerlink" href="#entering-tsql-shell" title="Permalink to this headline">¶</a></h2>
 <p>If the hostname and the port num are not given, tsql will try to connect the Tajo master specified in ${TAJO_HOME}/conf/tajo-site.xml.</p>
-<div class="highlight-python"><div class="highlight"><pre>bin/tsql
+<div class="highlight-python"><div class="highlight"><pre><span class="nb">bin</span><span class="o">/</span><span class="n">tsql</span>
 
-default&gt;
+<span class="n">default</span><span class="o">&gt;</span>
 </pre></div>
 </div>
 <p>If you want to connect a specified TajoMaster, you should use &#8216;-h&#8217; and (or) &#8216;p&#8217; options as follows:</p>
-<div class="highlight-python"><div class="highlight"><pre>bin/tsql -h localhost -p 9004
+<div class="highlight-python"><div class="highlight"><pre><span class="nb">bin</span><span class="o">/</span><span class="n">tsql</span> <span class="o">-</span><span class="n">h</span> <span class="n">localhost</span> <span class="o">-</span><span class="n">p</span> <span class="mi">9004</span>
 
-default&gt;
+<span class="n">default</span><span class="o">&gt;</span>
 </pre></div>
 </div>
 <p>The prompt indicates the current database.</p>
@@ -194,7 +196,7 @@ default&gt;
 <h2>Meta Commands<a class="headerlink" href="#meta-commands" title="Permalink to this headline">¶</a></h2>
 <p>In tsql, anything command that begins with an unquoted backslash (&#8216;&#8217;) is a tsql meta-command that is processed by tsql itself.</p>
 <p>In the current implementation, there are meta commands as follows:</p>
-<div class="highlight-python"><div class="highlight"><pre>default&gt; \?
+<div class="highlight-python"><pre>default&gt; \?
 
 General
   \copyright  show Apache License 2.0
@@ -223,18 +225,16 @@ Documentations
   Query language    http://tajo.apache.org/docs/0.8.0/sql_language.html
   Functions         http://tajo.apache.org/docs/0.8.0/functions.html
   Backup &amp; restore  http://tajo.apache.org/docs/0.8.0/backup_and_restore.html
-  Configuration     http://tajo.apache.org/docs/0.8.0/configuration.html
-</pre></div>
+  Configuration     http://tajo.apache.org/docs/0.8.0/configuration.html</pre>
 </div>
 <div class="section" id="basic-usages">
 <h3>Basic usages<a class="headerlink" href="#basic-usages" title="Permalink to this headline">¶</a></h3>
 <p><tt class="docutils literal"><span class="pre">\l</span></tt> command shows a list of all databases.</p>
-<div class="highlight-sql"><div class="highlight"><pre>default&gt; \l
+<div class="highlight-sql"><pre>default&gt; \l
 default
 tpch
 work1
-default&gt;
-</pre></div>
+default&gt;</pre>
 </div>
 <p><tt class="docutils literal"><span class="pre">\d</span></tt> command shows a list of tables in the current database as follows: ..</p>
 <blockquote>
@@ -267,32 +267,31 @@ o_shippriority  INT4
 o_comment       TEXT</p>
 </div></blockquote>
 <p>The prompt <tt class="docutils literal"><span class="pre">default&gt;</span></tt> indicates the current database. Basically, all SQL statements and meta commands work in the current database. Also, you can change the current database with <tt class="docutils literal"><span class="pre">\c</span></tt> command.</p>
-<div class="highlight-sql"><div class="highlight"><pre>default&gt; \c work1
-You are now connected to database &quot;test&quot; as user &quot;hyunsik&quot;.
-work1&gt;
-</pre></div>
+<div class="highlight-sql"><pre>default&gt; \c work1
+You are now connected to database "test" as user "hyunsik".
+work1&gt;</pre>
 </div>
 </div>
 <div class="section" id="session-variables">
 <h3>Session Variables<a class="headerlink" href="#session-variables" title="Permalink to this headline">¶</a></h3>
 <p>Each client connection to TajoMaster creates a unique session, and the client and TajoMaster uses the session until disconnect. A session provides session variables which are used for various configs per session.</p>
 <p><tt class="docutils literal"><span class="pre">tsql</span></tt> provides the meta command <tt class="docutils literal"><span class="pre">\set</span></tt> to manipulate session variables. Just <tt class="docutils literal"><span class="pre">\set</span></tt> command shows all session variables.</p>
-<div class="highlight-python"><div class="highlight"><pre>default&gt; \set
-&#39;name1&#39;=&#39;val1&#39;
-&#39;name2&#39;=&#39;val2&#39;
-&#39;name3&#39;=&#39;val3&#39;
-     ...
+<div class="highlight-python"><div class="highlight"><pre><span class="n">default</span><span class="o">&gt;</span> \<span class="nb">set</span>
+<span class="s">&#39;name1&#39;</span><span class="o">=</span><span class="s">&#39;val1&#39;</span>
+<span class="s">&#39;name2&#39;</span><span class="o">=</span><span class="s">&#39;val2&#39;</span>
+<span class="s">&#39;name3&#39;</span><span class="o">=</span><span class="s">&#39;val3&#39;</span>
+     <span class="o">...</span>
 </pre></div>
 </div>
 <p><tt class="docutils literal"><span class="pre">\set</span> <span class="pre">key</span> <span class="pre">val</span></tt> will set the session variable named <em>key</em> with the value <em>val</em>.</p>
-<div class="highlight-python"><div class="highlight"><pre>default&gt; \set
-&#39;CURRENT_DATABASE&#39;=&#39;default&#39;
+<div class="highlight-python"><div class="highlight"><pre><span class="n">default</span><span class="o">&gt;</span> \<span class="nb">set</span>
+<span class="s">&#39;CURRENT_DATABASE&#39;</span><span class="o">=</span><span class="s">&#39;default&#39;</span>
 
-default&gt; \set key1 val1
+<span class="n">default</span><span class="o">&gt;</span> \<span class="nb">set</span> <span class="n">key1</span> <span class="n">val1</span>
 
-default&gt; \set
-&#39;CURRENT_DATABASE&#39;=&#39;default&#39;
-&#39;key1&#39;=&#39;val1&#39;
+<span class="n">default</span><span class="o">&gt;</span> \<span class="nb">set</span>
+<span class="s">&#39;CURRENT_DATABASE&#39;</span><span class="o">=</span><span class="s">&#39;default&#39;</span>
+<span class="s">&#39;key1&#39;</span><span class="o">=</span><span class="s">&#39;val1&#39;</span>
 </pre></div>
 </div>
 <p>Also, <tt class="docutils literal"><span class="pre">\unset</span> <span class="pre">key</span></tt> will unset the session variable named <em>key</em>.</p>
@@ -309,7 +308,7 @@ default&gt; \set
         <a href="sql_language.html" class="btn btn-neutral float-right" title="SQL Language"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
-        <a href="configuration/configuration_defaults.html" class="btn btn-neutral" title="Configuration Defaults"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="configuration/ha_configuration.html" class="btn btn-neutral" title="High Availability for TajoMaster"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       
     </div>
   
@@ -337,7 +336,7 @@ default&gt; \set
 
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
+            URL_ROOT:'',
             VERSION:'0.8.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',

Modified: tajo/site/docs/current/configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration.html (original)
+++ tajo/site/docs/current/configuration.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -74,6 +75,7 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="cli.html">Tajo Shell (TSQL)</a><ul>
@@ -168,6 +170,7 @@
 <li class="toctree-l1"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l1"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l1"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </div>
 </div>
@@ -209,7 +212,7 @@
 
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
+            URL_ROOT:'',
             VERSION:'0.8.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',

Modified: tajo/site/docs/current/configuration/catalog_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/catalog_configuration.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/catalog_configuration.html (original)
+++ tajo/site/docs/current/configuration/catalog_configuration.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <li class="toctree-l2"><a class="reference internal" href="worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2 current"><a class="current reference internal" href="">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>
@@ -217,7 +219,7 @@ Query OK, 0 rows affected <span class="o
 </div>
 <p>Or you just can copy jdbc driver into <tt class="docutils literal"><span class="pre">$TAJO_HOME/lib</span></tt>.</p>
 <p>Finally, you should add the following config to <cite>conf/catalog-site.xml</cite> :</p>
-<div class="highlight-xml"><div class="highlight"><pre>&lt;property&gt;
+<div class="highlight-xml"><pre>&lt;property&gt;
   &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
   &lt;value&gt;org.apache.tajo.catalog.store.MySQLStore&lt;/value&gt;
 &lt;/property&gt;
@@ -232,8 +234,7 @@ Query OK, 0 rows affected <span class="o
 &lt;property&gt;
   &lt;name&gt;tajo.catalog.jdbc.uri&lt;/name&gt;
   &lt;value&gt;jdbc:mysql://&lt;mysql host name&gt;:&lt;mysql port&gt;/&lt;database name for tajo&gt;?createDatabaseIfNotExist=true&lt;/value&gt;
-&lt;/property&gt;
-</pre></div>
+&lt;/property&gt;</pre>
 </div>
 </div>
 <div class="section" id="mariadbstore-configuration">
@@ -242,15 +243,14 @@ Query OK, 0 rows affected <span class="o
 <div class="highlight-sh"><div class="highlight"><pre><span class="nb">export </span><span class="nv">TAJO_CLASSPATH</span><span class="o">=</span>/usr/local/mariadb/lib/mariadb-java-client-x.x.x.jar
 </pre></div>
 </div>
-<div class="highlight-xml"><div class="highlight"><pre>&lt;property&gt;
+<div class="highlight-xml"><pre>&lt;property&gt;
   &lt;name&gt;tajo.catalog.store.class&lt;/name&gt;
   &lt;value&gt;org.apache.tajo.catalog.store.MariaDBStore&lt;/value&gt;
 &lt;/property&gt;
 &lt;property&gt;
   &lt;name&gt;tajo.catalog.jdbc.uri&lt;/name&gt;
   &lt;value&gt;jdbc:mariadb://&lt;mariadb host name&gt;:&lt;mariadb port&gt;/&lt;database name for tajo&gt;?createDatabaseIfNotExist=true&lt;/value&gt;
-&lt;/property&gt;
-</pre></div>
+&lt;/property&gt;</pre>
 </div>
 <div class="section" id="hcatalogstore-configuration">
 <h3>HCatalogStore Configuration<a class="headerlink" href="#hcatalogstore-configuration" title="Permalink to this headline">¶</a></h3>
@@ -261,7 +261,7 @@ Query OK, 0 rows affected <span class="o
 <span class="nv">$ </span>ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 </pre></div>
 </div>
-<p>Currently Tajo supports only hive 0.12.0. If you enables HCatalogStore, you set the maven profile as <tt class="docutils literal"><span class="pre">-Phcatalog-0.12.0</span></tt>.</p>
+<p>Currently Tajo supports hive 0.12.0, hive 0.13.0, hive 0.13.1. If you enables HCatalogStore, you set the maven profile as <tt class="docutils literal"><span class="pre">-Phcatalog-0.12.0</span></tt>.</p>
 <p>Second, you must set your hive home directory to HIVE_HOME variable in <tt class="docutils literal"><span class="pre">conf/tajo-env.sh</span></tt> with it as follows:</p>
 <div class="highlight-sh"><div class="highlight"><pre><span class="nb">export </span><span class="nv">HIVE_HOME</span><span class="o">=</span>/path/to/your/hive/directory
 </pre></div>

Modified: tajo/site/docs/current/configuration/cluster_setup.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/cluster_setup.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/cluster_setup.html (original)
+++ tajo/site/docs/current/configuration/cluster_setup.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <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="configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>
@@ -203,29 +205,26 @@
 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>For example:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ cat &gt; conf/workers
+<div class="highlight-python"><pre>$ cat &gt; conf/workers
 host1.domain.com
 host2.domain.com
 ....
 
-&lt;ctrl + d&gt;
-</pre></div>
+&lt;ctrl + d&gt;</pre>
 </div>
 </div>
 <div class="section" id="make-base-directories-and-set-permissions">
 <h3>Make base directories and set permissions<a class="headerlink" href="#make-base-directories-and-set-permissions" title="Permalink to this headline">¶</a></h3>
 <p>If you want to know Tajo’s configuration in more detail, see Configuration page.
 Before launching the tajo, you should create the tajo root dir and set the permission as follows:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ $HADOOP_HOME/bin/hadoop fs -mkdir       /tajo
-$ $HADOOP_HOME/bin/hadoop fs -chmod g+w   /tajo
-</pre></div>
+<div class="highlight-python"><pre>$ $HADOOP_HOME/bin/hadoop fs -mkdir       /tajo
+$ $HADOOP_HOME/bin/hadoop fs -chmod g+w   /tajo</pre>
 </div>
 </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>
-<div class="highlight-python"><div class="highlight"><pre>$ $TAJO_HOME/bin/start-tajo.sh
-</pre></div>
+<div class="highlight-python"><pre>$ $TAJO_HOME/bin/start-tajo.sh</pre>
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>

Modified: tajo/site/docs/current/configuration/configuration_defaults.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/configuration_defaults.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/configuration_defaults.html (original)
+++ tajo/site/docs/current/configuration/configuration_defaults.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -30,7 +31,7 @@
   
     <link rel="top" title="Apache Tajo 0.8.0 documentation" href="../index.html"/>
         <link rel="up" title="Configuration" href="../configuration.html"/>
-        <link rel="next" title="Tajo Shell (TSQL)" href="../cli.html"/>
+        <link rel="next" title="High Availability for TajoMaster" href="ha_configuration.html"/>
         <link rel="prev" title="Catalog Configuration" href="catalog_configuration.html"/> 
 
   
@@ -75,6 +76,7 @@
 <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 current"><a class="current reference internal" href="">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>
@@ -251,7 +253,7 @@
   
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       
-        <a href="../cli.html" class="btn btn-neutral float-right" title="Tajo Shell (TSQL)"/>Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="ha_configuration.html" class="btn btn-neutral float-right" title="High Availability for TajoMaster"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
         <a href="catalog_configuration.html" class="btn btn-neutral" title="Catalog Configuration"><span class="fa fa-arrow-circle-left"></span> Previous</a>

Modified: tajo/site/docs/current/configuration/preliminary.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/preliminary.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/preliminary.html (original)
+++ tajo/site/docs/current/configuration/preliminary.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <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="configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>

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=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/tajo_master_configuration.html (original)
+++ tajo/site/docs/current/configuration/tajo_master_configuration.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <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="configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>

Modified: tajo/site/docs/current/configuration/worker_configuration.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/configuration/worker_configuration.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/configuration/worker_configuration.html (original)
+++ tajo/site/docs/current/configuration/worker_configuration.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <li class="toctree-l2 current"><a class="current reference internal" href="">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="configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>

Modified: tajo/site/docs/current/faq.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/faq.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/faq.html (original)
+++ tajo/site/docs/current/faq.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -73,6 +74,7 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="cli.html">Tajo Shell (TSQL)</a><ul>
@@ -199,7 +201,7 @@
 
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
+            URL_ROOT:'',
             VERSION:'0.8.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',

Modified: tajo/site/docs/current/functions.html
URL: http://svn.apache.org/viewvc/tajo/site/docs/current/functions.html?rev=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/functions.html (original)
+++ tajo/site/docs/current/functions.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -74,6 +75,7 @@
 <li class="toctree-l2"><a class="reference internal" href="configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="cli.html">Tajo Shell (TSQL)</a><ul>
@@ -207,7 +209,7 @@
 
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'./',
+            URL_ROOT:'',
             VERSION:'0.8.0',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',

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=1627192&r1=1627191&r2=1627192&view=diff
==============================================================================
--- tajo/site/docs/current/functions/datetime_func_and_operators.html (original)
+++ tajo/site/docs/current/functions/datetime_func_and_operators.html Wed Sep 24 02:16:42 2014
@@ -1,5 +1,6 @@
 
 
+
 <!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]-->
@@ -75,6 +76,7 @@
 <li class="toctree-l2"><a class="reference internal" href="../configuration/worker_configuration.html">Worker Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/catalog_configuration.html">Catalog Configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../configuration/configuration_defaults.html">Configuration Defaults</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../configuration/ha_configuration.html">High Availability for TajoMaster</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="../cli.html">Tajo Shell (TSQL)</a><ul>
@@ -202,10 +204,10 @@ For example, if unix_timestamp occurs on
 <tr class="field-even field"><th class="field-name">Return type:</th><td class="field-body"><p class="first">long</p>
 </td>
 </tr>
-<tr class="field-odd field"><th class="field-name">Alias:</th><td class="field-body"><p class="first">utc_usec_to</p>
+<tr class="field-odd field"><th class="field-name">Alias :</th><td class="field-body"><p class="first">utc_usec_to</p>
 </td>
 </tr>
-<tr class="field-even field"><th class="field-name">Example:</th><td class="field-body"></td>
+<tr class="field-even field"><th class="field-name">Example :</th><td class="field-body"></td>
 </tr>
 </tbody>
 </table>



Mime
View raw message