Merge branch 'master' of github.com:apache/tajo into TAJO-1591
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d9776b32 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d9776b32 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d9776b32 Branch: refs/heads/index_support Commit: d9776b32df0ef79b99087310ece41277ae517e9a Parents: 285b179 1baf8dc Author: Hyunsik Choi <[email protected]> Authored: Fri May 8 00:56:05 2015 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Fri May 8 00:56:05 2015 -0700 ---------------------------------------------------------------------- CHANGES | 10 +++ .../apache/tajo/function/FunctionSignature.java | 10 ++- .../org/apache/tajo/function/FunctionUtil.java | 39 +++++++++ .../cli/tsql/DefaultTajoCliOutputFormatter.java | 4 +- .../cli/tsql/commands/DescFunctionCommand.java | 18 +--- .../java/org/apache/tajo/util/ClassSize.java | 18 +++- .../java/org/apache/tajo/util/NumberUtil.java | 54 ++++++++++++ .../java/org/apache/tajo/util/UnsafeUtil.java | 28 +++++++ .../apache/tajo/querymaster/Repartitioner.java | 18 ++-- .../java/org/apache/tajo/querymaster/Task.java | 56 ++++++------- .../main/java/org/apache/tajo/util/JSPUtil.java | 14 ---- .../tajo/worker/ExecutionBlockContext.java | 32 ++----- .../src/main/proto/TajoWorkerProtocol.proto | 16 +--- .../main/resources/webapps/admin/functions.jsp | 3 +- .../cli/tsql/TestDefaultCliOutputFormatter.java | 13 ++- .../apache/tajo/master/TestRepartitioner.java | 77 +++++++---------- .../tajo/querymaster/TestIntermediateEntry.java | 24 +++--- .../tajo/storage/HashShuffleAppender.java | 87 ++++++++++++++------ .../storage/HashShuffleAppenderManager.java | 12 +-- 19 files changed, 316 insertions(+), 217 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d9776b32/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d9776b32/tajo-core/src/main/proto/TajoWorkerProtocol.proto ----------------------------------------------------------------------
