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/10/10 06:33:28 UTC

[22/43] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1062

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1062


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/03847cf4
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/03847cf4
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/03847cf4

Branch: refs/heads/index_support
Commit: 03847cf497779d18d323bf94a9e2f0d79dadcb96
Parents: 28b4cbc ecc2b05
Author: Jaehwa Jung <bl...@apache.org>
Authored: Sun Oct 5 22:16:12 2014 +0900
Committer: Jaehwa Jung <bl...@apache.org>
Committed: Sun Oct 5 22:16:12 2014 +0900

----------------------------------------------------------------------
 CHANGES                                         |  26 ++
 .../apache/tajo/catalog/CatalogConstants.java   |   2 +
 .../tajo/cli/DefaultTajoCliOutputFormatter.java |  34 +-
 .../org/apache/tajo/cli/DescTableCommand.java   |   6 +-
 .../java/org/apache/tajo/cli/HelpCommand.java   |  30 +-
 .../main/java/org/apache/tajo/cli/TajoCli.java  | 109 +++--
 .../java/org/apache/tajo/client/TajoAdmin.java  |  40 +-
 .../java/org/apache/tajo/client/TajoClient.java |   4 +-
 .../apache/tajo/jdbc/TajoResultSetMetaData.java |   8 +-
 .../apache/tajo/common/type/TajoTypeUtil.java   | 183 +++++++++
 .../apache/tajo/engine/planner/PlannerUtil.java |   3 +-
 .../engine/planner/PreLogicalPlanVerifier.java  |  14 +
 .../org/apache/tajo/master/GlobalEngine.java    |  27 ++
 .../apache/tajo/master/querymaster/Query.java   |  12 +-
 .../main/java/org/apache/tajo/util/JSPUtil.java |   2 +-
 .../planner/TestPreLogicalPlanVerifier.java     |  74 ++++
 .../tajo/jdbc/TestTajoDatabaseMetaData.java     | 111 ++++-
 .../master/querymaster/TestQueryProgress.java   |  73 ++++
 .../configuration/catalog_configuration.rst     |  33 ++
 .../functions/datetime_func_and_operators.rst   | 409 ++++++++++++++++++-
 .../main/sphinx/getting_started/local_setup.rst |   6 +
 .../src/main/sphinx/sql_language/data_model.rst |   8 +-
 .../src/main/sphinx/sql_language/queries.rst    | 232 ++++++++++-
 .../apache/tajo/jdbc/TajoDatabaseMetaData.java  | 101 ++++-
 tajo-project/pom.xml                            |   7 +-
 .../tajo/storage/AbstractStorageManager.java    |   2 +-
 26 files changed, 1406 insertions(+), 150 deletions(-)
----------------------------------------------------------------------