Merge branch 'master' of https://github.com/apache/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/767b9a4b Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/767b9a4b Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/767b9a4b Branch: refs/heads/index_support Commit: 767b9a4b7894f0545fca18569865299130ce190a Parents: e04c65f 807868b Author: SonJihoon <[email protected]> Authored: Fri Jan 9 23:29:49 2015 +0900 Committer: SonJihoon <[email protected]> Committed: Fri Jan 9 23:29:49 2015 +0900 ---------------------------------------------------------------------- CHANGES | 16 + .../java/org/apache/tajo/conf/TajoConf.java | 3 +- tajo-core/pom.xml | 2 +- .../engine/planner/physical/WindowAggExec.java | 11 +- .../tajo/master/QueryCoordinatorService.java | 160 ++++++++++ .../org/apache/tajo/master/QueryInProgress.java | 228 ++++++++++++++ .../org/apache/tajo/master/QueryJobManager.java | 311 ------------------ .../org/apache/tajo/master/QueryManager.java | 315 +++++++++++++++++++ .../apache/tajo/master/TajoContainerProxy.java | 12 +- .../java/org/apache/tajo/master/TajoMaster.java | 16 +- .../tajo/master/TajoMasterClientService.java | 9 +- .../apache/tajo/master/TajoMasterService.java | 168 ---------- .../tajo/master/event/StageEventType.java | 3 +- .../master/event/StageShuffleReportEvent.java | 38 +++ .../apache/tajo/master/exec/QueryExecutor.java | 4 +- .../tajo/master/rm/TajoResourceTracker.java | 12 +- .../master/rm/TajoWorkerResourceManager.java | 16 +- .../tajo/master/rm/WorkerResourceManager.java | 19 +- .../apache/tajo/master/scheduler/Scheduler.java | 2 +- .../master/scheduler/SimpleFifoScheduler.java | 11 +- .../java/org/apache/tajo/querymaster/Query.java | 2 +- .../tajo/querymaster/QueryInProgress.java | 301 ------------------ .../apache/tajo/querymaster/QueryJobEvent.java | 5 +- .../apache/tajo/querymaster/QueryMaster.java | 97 ++---- .../querymaster/QueryMasterManagerService.java | 2 +- .../tajo/querymaster/QueryMasterTask.java | 47 +-- .../java/org/apache/tajo/querymaster/Stage.java | 223 ++++++++----- .../org/apache/tajo/querymaster/StageState.java | 1 + .../main/java/org/apache/tajo/util/JSPUtil.java | 2 +- .../tajo/worker/TajoResourceAllocator.java | 37 ++- .../java/org/apache/tajo/worker/TajoWorker.java | 20 +- .../tajo/worker/WorkerHeartbeatService.java | 27 +- .../ConnectivityCheckerRuleForTajoWorker.java | 14 +- .../main/proto/QueryCoordinatorProtocol.proto | 147 +++++++++ .../main/proto/ResourceTrackerProtocol.proto | 2 +- .../src/main/proto/TajoMasterProtocol.proto | 148 --------- .../src/main/resources/webapps/admin/index.jsp | 2 +- .../src/main/resources/webapps/admin/query.jsp | 2 +- .../org/apache/tajo/TajoTestingCluster.java | 2 +- .../tajo/engine/query/TestWindowQuery.java | 29 ++ .../tajo/master/rm/TestTajoResourceManager.java | 3 +- .../apache/tajo/querymaster/TestKillQuery.java | 2 +- tajo-dist/pom.xml | 28 ++ tajo-jdbc/pom.xml | 6 +- .../org/apache/tajo/jdbc/JdbcConnection.java | 3 +- .../tajo/jdbc/util/QueryStringDecoder.java | 139 ++++++++ .../tajo/jdbc/util/TestQueryStringDecoder.java | 94 ++++++ .../java/org/apache/tajo/storage/CSVFile.java | 4 +- .../java/org/apache/tajo/storage/RowFile.java | 3 +- .../apache/tajo/storage/avro/AvroAppender.java | 3 +- .../tajo/storage/parquet/ParquetAppender.java | 3 +- .../sequencefile/SequenceFileAppender.java | 4 +- .../tajo/storage/text/DelimitedTextFile.java | 4 +- 53 files changed, 1508 insertions(+), 1254 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/767b9a4b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/767b9a4b/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/767b9a4b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/767b9a4b/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/767b9a4b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java ---------------------------------------------------------------------- diff --cc tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java index 742665a,fd52488..7a5e7b4 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java @@@ -58,11 -49,13 +55,10 @@@ import org.apache.tajo.plan.LogicalOpti import org.apache.tajo.plan.LogicalPlan; import org.apache.tajo.plan.LogicalPlanner; import org.apache.tajo.plan.logical.LogicalNode; -import org.apache.tajo.plan.logical.LogicalRootNode; import org.apache.tajo.plan.logical.NodeType; import org.apache.tajo.plan.logical.ScanNode; -import org.apache.tajo.plan.rewrite.LogicalPlanRewriteRule; -import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.plan.verifier.VerifyException; - import org.apache.tajo.rpc.NettyClientBase; - import org.apache.tajo.rpc.RpcConnectionPool; + import org.apache.tajo.session.Session; import org.apache.tajo.storage.StorageManager; import org.apache.tajo.storage.StorageProperty; import org.apache.tajo.storage.StorageUtil; http://git-wip-us.apache.org/repos/asf/tajo/blob/767b9a4b/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java ----------------------------------------------------------------------
