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/5096081a Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5096081a Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5096081a Branch: refs/heads/index_support Commit: 5096081a3561c477df75f16f3041441e9437ef71 Parents: 42bcf2d 2b4c161 Author: Jihoon Son <[email protected]> Authored: Fri May 8 14:53:14 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Fri May 8 14:53:14 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 + .../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 ++++++------- .../tajo/worker/ExecutionBlockContext.java | 32 ++----- .../src/main/proto/TajoWorkerProtocol.proto | 16 +--- .../apache/tajo/master/TestRepartitioner.java | 77 +++++++---------- .../tajo/querymaster/TestIntermediateEntry.java | 24 +++--- .../tajo/storage/HashShuffleAppender.java | 87 ++++++++++++++------ .../storage/HashShuffleAppenderManager.java | 12 +-- 12 files changed, 247 insertions(+), 178 deletions(-) ----------------------------------------------------------------------
