tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [2/2] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Mon, 12 Jan 2015 04:38:08 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support

Conflicts:
	tajo-core/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/35453bbd
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/35453bbd
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/35453bbd

Branch: refs/heads/index_support
Commit: 35453bbda747a25d95d9d443a751b45c0063fcaf
Parents: ad78d2f bc478ba
Author: Jihoon Son <jihoonson@apache.org>
Authored: Mon Jan 12 13:37:57 2015 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Mon Jan 12 13:37:57 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |   3 +
 .../apache/tajo/worker/InterDataRetriever.java  | 113 ------
 .../tajo/worker/PartitionRetrieverHandler.java  |  44 ---
 .../tajo/worker/RangeRetrieverHandler.java      | 163 --------
 .../FileAccessForbiddenException.java           |  40 --
 .../tajo/worker/dataserver/HttpDataServer.java  |  87 -----
 .../dataserver/HttpDataServerHandler.java       | 199 ----------
 .../HttpDataServerPipelineFactory.java          |  55 ---
 .../apache/tajo/worker/dataserver/HttpUtil.java |  69 ----
 .../retriever/AdvancedDataRetriever.java        | 128 -------
 .../dataserver/retriever/DataRetriever.java     |  29 --
 .../retriever/DirectoryRetriever.java           |  56 ---
 .../worker/dataserver/retriever/FileChunk.java  |  51 ---
 .../dataserver/retriever/RetrieverHandler.java  |  33 --
 .../planner/physical/TestPhysicalPlanner.java   | 103 +----
 .../tajo/worker/TestRangeRetrieverHandler.java  | 381 -------------------
 .../worker/dataserver/TestHttpDataServer.java   | 172 ---------
 .../tajo/worker/dataserver/TestHttpUtil.java    |  49 ---
 18 files changed, 4 insertions(+), 1771 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/35453bbd/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
----------------------------------------------------------------------


Mime
View raw message