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/14c0482a Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/14c0482a Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/14c0482a Branch: refs/heads/index_support Commit: 14c0482afccc2816072ac101eb3b7f85d6a5d9f5 Parents: e6ed695 044fd49 Author: Jihoon Son <[email protected]> Authored: Mon Apr 20 14:09:16 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Apr 20 14:09:16 2015 +0900 ---------------------------------------------------------------------- CHANGES | 22 +++ tajo-algebra/pom.xml | 12 +- .../org/apache/tajo/catalog/CatalogUtil.java | 8 +- .../java/org/apache/tajo/catalog/Schema.java | 3 - .../java/org/apache/tajo/util/NumberUtil.java | 26 ++-- .../apache/tajo/master/TajoContainerProxy.java | 9 +- .../java/org/apache/tajo/querymaster/Stage.java | 141 +++++++++++-------- .../apache/tajo/util/history/HistoryWriter.java | 30 ++-- .../tajo/worker/ExecutionBlockContext.java | 46 +++--- .../java/org/apache/tajo/worker/Fetcher.java | 47 +++---- .../tajo/worker/TajoWorkerManagerService.java | 3 +- .../apache/tajo/worker/TaskRunnerManager.java | 16 ++- .../tajo/worker/event/TaskRunnerStartEvent.java | 10 +- .../src/main/proto/TajoWorkerProtocol.proto | 1 + .../java/org/apache/tajo/QueryTestCaseBase.java | 8 +- .../apache/tajo/querymaster/TestKillQuery.java | 3 +- tajo-plan/pom.xml | 12 +- .../org/apache/tajo/rpc/BlockingRpcClient.java | 7 +- .../src/main/proto/DummyProtos.proto | 14 +- .../src/main/proto/RpcProtos.proto | 14 +- .../src/main/proto/TestProtocol.proto | 14 +- .../src/main/proto/TestProtos.proto | 14 +- .../org/apache/tajo/rpc/TestBlockingRpc.java | 16 +++ tajo-storage/pom.xml | 12 +- .../org/apache/tajo/storage/BufferPool.java | 65 ++++++++- tajo-storage/tajo-storage-hbase/pom.xml | 26 ++-- tajo-storage/tajo-storage-hdfs/pom.xml | 26 ++-- 27 files changed, 379 insertions(+), 226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/14c0482a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/14c0482a/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/14c0482a/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java ----------------------------------------------------------------------
