Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1730
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/825e25fd Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/825e25fd Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/825e25fd Branch: refs/heads/TAJO-1730 Commit: 825e25fddabe0051fd97fa94e314256cef90f177 Parents: 57466e3 2a850cf Author: Hyunsik Choi <[email protected]> Authored: Wed Aug 19 23:26:18 2015 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Wed Aug 19 23:26:18 2015 +0900 ---------------------------------------------------------------------- CHANGES | 37 +- pom.xml | 1 + .../tajo/catalog/store/HCatalogStore.java | 32 ++ tajo-client-example/pom.xml | 217 ++++++++++++ .../v2/example/TajoClientAsyncExample.java | 70 ++++ .../client/v2/example/TajoClientExample.java | 65 ++++ .../tajo/client/v2/LegacyClientDelegate.java | 4 +- .../org/apache/tajo/client/v2/QueryFuture.java | 4 +- .../org/apache/tajo/client/v2/TajoClient.java | 12 +- .../java/org/apache/tajo/QueryTestCaseBase.java | 103 +++++- .../test/java/org/apache/tajo/TpchTestBase.java | 3 - .../apache/tajo/exception/ErrorMessages.java | 15 +- .../apache/tajo/client/v2/TestTajoClientV2.java | 4 +- .../apache/tajo/engine/query/TestJoinQuery.java | 5 - .../tajo/engine/query/TestSelectQuery.java | 10 + .../TestSelectQuery/nagative/operations.sql | 1 + .../queries/TestSelectQuery/nagative/tables.sql | 1 + .../TestSelectQuery/positive/operations.sql | 1 + .../java/org/apache/tajo/benchmark/TPCH.java | 6 - tajo-dist/pom.xml | 1 + tajo-docs/src/main/sphinx/functions.rst | 25 +- .../src/main/sphinx/functions/agg_func.rst | 91 +++++ .../functions/data_type_func_and_operators.rst | 43 +++ .../functions/datetime_func_and_operators.rst | 18 +- .../src/main/sphinx/functions/json_func.rst | 8 +- .../functions/math_func_and_operators.rst | 14 + .../functions/network_func_and_operators.rst | 8 +- .../functions/string_func_and_operators.rst | 347 +++++++++++++++++-- .../src/main/sphinx/functions/window_func.rst | 47 +++ .../src/main/sphinx/sql_language/joins.rst | 2 +- .../main/sphinx/sql_language/sql_expression.rst | 14 +- tajo-project/pom.xml | 5 + .../tajo/storage/ByteBufInputChannel.java | 2 +- .../apache/tajo/storage/FSDataInputChannel.java | 6 +- .../tajo/storage/json/JsonLineDeserializer.java | 15 +- .../tajo/storage/text/DelimitedLineReader.java | 2 +- .../org/apache/tajo/storage/TestLineReader.java | 8 +- .../apache/tajo/storage/json/TestJsonSerDe.java | 32 ++ .../testUnicodeWithControlChar.json | 1 + 39 files changed, 1177 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/825e25fd/tajo-project/pom.xml ----------------------------------------------------------------------
