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/a72ef4a5 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/a72ef4a5 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/a72ef4a5 Branch: refs/heads/index_support Commit: a72ef4a575c45b7cc344e3b1a2f193d7d92ce4e4 Parents: 5866c36 4d1006d Author: Jihoon Son <[email protected]> Authored: Tue Jan 20 22:04:08 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Jan 20 22:04:08 2015 +0900 ---------------------------------------------------------------------- CHANGES | 11 +- .../java/org/apache/tajo/TajoConstants.java | 2 +- .../org/apache/tajo/engine/utils/TupleUtil.java | 18 +- .../tajo/engine/query/TestHBaseTable.java | 20 ++ .../apache/tajo/engine/query/TestSortQuery.java | 28 +++ .../TestTajoDatabaseMetaData/getSchemas1.result | 2 +- .../TestTajoDatabaseMetaData/getSchemas2.result | 2 +- .../TestTajoDatabaseMetaData/getTables1.result | 4 +- .../TestTajoDatabaseMetaData/getTables2.result | 4 +- tajo-dist/src/main/bin/tajo | 26 +++ tajo-dist/src/main/conf/tajo-env.sh | 5 +- tajo-docs/src/main/sphinx/hbase_integration.rst | 181 +++++++++++++++++++ tajo-docs/src/main/sphinx/index.rst | 3 +- .../tajo/storage/hbase/HBaseStorageManager.java | 9 +- 14 files changed, 298 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
