Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/9a5c760c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/9a5c760c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/9a5c760c Branch: refs/heads/index_support Commit: 9a5c760cefb592395c153d449758f7ffc52943b4 Parents: 14c0482 1434072 Author: Jihoon Son <[email protected]> Authored: Mon Apr 27 13:39:59 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Apr 27 13:39:59 2015 +0900 ---------------------------------------------------------------------- CHANGES | 12 ++++++ .../main/java/org/apache/tajo/SessionVars.java | 2 +- .../java/org/apache/tajo/datum/Inet4Datum.java | 3 +- .../org/apache/tajo/cli/tsql/TestTajoCli.java | 40 ++++++++++++++++++++ .../TestTajoCli/testHelpSessionVars.result | 2 +- tajo-dist/src/main/conf/tajo-env.sh | 5 +-- .../src/main/sphinx/sql_language/data_model.rst | 4 +- 7 files changed, 60 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/9a5c760c/tajo-common/src/main/java/org/apache/tajo/SessionVars.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/9a5c760c/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result ---------------------------------------------------------------------- diff --cc tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result index 90f948e,bcd8970..06c9073 --- a/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result +++ b/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result @@@ -34,8 -34,6 +34,8 @@@ Available Session Variables \set MAX_OUTPUT_FILE_SIZE [int value] - Maximum per-output file size (mb). 0 means infinite. \set NULL_CHAR [text value] - null char of text file output \set CODEGEN [true or false] - Runtime code generation enabled (experiment) +\set INDEX_ENABLED [true or false] - index scan enabled +\set INDEX_SELECTIVITY_THRESHOLD [real value] - the selectivity threshold for index scan \set ARITHABORT [true or false] - If true, a running query will be terminated when an overflow or divide-by-zero occurs. \set FETCH_ROWNUM [int value] - Sets the number of rows at a time from Master - \set DEBUG_ENABLED [true or false] - (debug only) debug mode enabled + \set DEBUG_ENABLED [true or false] - (debug only) debug mode enabled
