tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject [08/10] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into block_iteration
Date Sun, 21 Sep 2014 18:20:54 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into block_iteration


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

Branch: refs/heads/block_iteration
Commit: 3e2bf9a108e0b5b66edc4860dde2e09c41322888
Parents: 64ba68c 1b3d51e
Author: Hyunsik Choi <hyunsik@apache.org>
Authored: Sun Sep 21 11:11:09 2014 -0700
Committer: Hyunsik Choi <hyunsik@apache.org>
Committed: Sun Sep 21 11:11:09 2014 -0700

----------------------------------------------------------------------
 CHANGES                                         |  15 ++
 .../main/java/org/apache/tajo/cli/TajoCli.java  |  21 ++-
 .../java/org/apache/tajo/client/TajoAdmin.java  |  36 ++--
 .../java/org/apache/tajo/client/TajoClient.java |  20 ++-
 tajo-client/src/main/proto/ClientProtos.proto   |  37 ++--
 .../java/org/apache/tajo/util/BytesUtils.java   |   2 +-
 tajo-common/src/main/proto/tajo_protos.proto    |  10 ++
 .../tajo/master/DefaultTaskScheduler.java       |  68 ++++---
 .../apache/tajo/master/LazyTaskScheduler.java   |   4 +-
 .../apache/tajo/master/TajoContainerProxy.java  |   5 +-
 .../tajo/master/TajoMasterClientService.java    |  14 +-
 .../apache/tajo/master/TajoMasterService.java   |   9 +-
 .../master/cluster/WorkerConnectionInfo.java    | 178 +++++++++++++++++++
 .../master/event/TaskAttemptAssignedEvent.java  |  17 +-
 .../tajo/master/event/TaskRequestEvent.java     |  13 +-
 .../master/querymaster/QueryInProgress.java     |   6 +-
 .../master/querymaster/QueryJobManager.java     |  11 +-
 .../tajo/master/querymaster/QueryMaster.java    |  18 +-
 .../querymaster/QueryMasterManagerService.java  |   2 +-
 .../tajo/master/querymaster/QueryUnit.java      |  12 +-
 .../master/querymaster/QueryUnitAttempt.java    |  32 +---
 .../apache/tajo/master/rm/TajoRMContext.java    |  14 +-
 .../tajo/master/rm/TajoResourceTracker.java     |  24 +--
 .../master/rm/TajoWorkerResourceManager.java    |  33 ++--
 .../java/org/apache/tajo/master/rm/Worker.java  |  73 ++------
 .../org/apache/tajo/master/rm/WorkerEvent.java  |   6 +-
 .../tajo/master/rm/WorkerLivelinessMonitor.java |   4 +-
 .../tajo/master/rm/WorkerReconnectEvent.java    |   2 +-
 .../tajo/master/rm/WorkerResourceManager.java   |   6 +-
 .../tajo/master/rm/WorkerStatusEvent.java       |   2 +-
 .../tajo/worker/AbstractResourceAllocator.java  |  15 ++
 .../tajo/worker/ExecutionBlockContext.java      |  12 +-
 .../tajo/worker/TajoResourceAllocator.java      |  17 +-
 .../java/org/apache/tajo/worker/TajoWorker.java | 178 ++++++++++---------
 .../tajo/worker/TajoWorkerClientService.java    |   6 +-
 .../tajo/worker/TajoWorkerManagerService.java   |  31 +---
 .../main/java/org/apache/tajo/worker/Task.java  |   3 +-
 .../java/org/apache/tajo/worker/TaskRunner.java |  20 +--
 .../apache/tajo/worker/TaskRunnerManager.java   |  11 +-
 .../tajo/worker/WorkerHeartbeatService.java     |  57 +++---
 .../tajo/worker/event/TaskRunnerStartEvent.java |  18 +-
 .../main/proto/ResourceTrackerProtocol.proto    |  12 +-
 .../src/main/proto/TajoMasterProtocol.proto     |  36 ++--
 .../src/main/proto/TajoWorkerProtocol.proto     |  20 +--
 .../main/resources/webapps/admin/cluster.jsp    |  54 +++---
 .../src/main/resources/webapps/admin/index.jsp  |   4 +-
 .../src/main/resources/webapps/admin/query.jsp  |   8 +-
 .../resources/webapps/worker/querytasks.jsp     |   9 +-
 .../resources/webapps/worker/taskdetail.jsp     |   2 +
 .../src/main/resources/webapps/worker/tasks.jsp |   4 +-
 .../tajo/cluster/TestWorkerConnectionInfo.java  |  36 ++++
 .../tajo/master/rm/TestTajoResourceManager.java |   8 +-
 .../org/apache/tajo/rpc/AsyncRpcClient.java     |  11 +-
 .../org/apache/tajo/rpc/AsyncRpcServer.java     |   4 +-
 .../org/apache/tajo/rpc/BlockingRpcClient.java  |  13 +-
 .../org/apache/tajo/rpc/NettyClientBase.java    |  86 +++++----
 .../org/apache/tajo/rpc/RpcConnectionPool.java  |  16 +-
 .../java/org/apache/tajo/rpc/TestAsyncRpc.java  |  91 +++++++++-
 .../org/apache/tajo/rpc/TestBlockingRpc.java    |  73 ++++++--
 .../pullserver/FadvisedFileRegionWrapper.java   |  35 ----
 .../pullserver/listener/FileCloseListener.java  |  53 ------
 .../pullserver/FadvisedFileRegionWrapper.java   |  34 ----
 .../pullserver/listener/FileCloseListener.java  |  55 ------
 .../pullserver/FadvisedFileRegionWrapper.java   |  36 ----
 .../pullserver/listener/FileCloseListener.java  |  55 ------
 .../tajo/pullserver/FadvisedChunkedFile.java    |  81 +++++++++
 .../tajo/pullserver/FadvisedFileRegion.java     | 170 ++++++++++++++++++
 .../tajo/pullserver/FileCloseListener.java      |  53 ++++++
 .../tajo/pullserver/PullServerAuxService.java   |   4 +-
 .../apache/tajo/pullserver/PullServerUtil.java  |  90 ++++++++++
 .../tajo/pullserver/TajoPullServerService.java  |  24 +--
 71 files changed, 1334 insertions(+), 905 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/3e2bf9a1/CHANGES
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3e2bf9a1/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/3e2bf9a1/tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
----------------------------------------------------------------------
diff --cc tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
index 6157cab,5f9f9e8..254db2c
--- a/tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
+++ b/tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java
@@@ -48,9 -47,7 +47,8 @@@ import org.apache.tajo.QueryId
  import org.apache.tajo.catalog.Schema;
  import org.apache.tajo.conf.TajoConf;
  import org.apache.tajo.conf.TajoConf.ConfVars;
- import org.apache.tajo.pullserver.listener.FileCloseListener;
  import org.apache.tajo.pullserver.retriever.FileChunk;
 +import org.apache.tajo.storage.BaseTupleComparator;
  import org.apache.tajo.storage.RowStoreUtil;
  import org.apache.tajo.storage.RowStoreUtil.RowStoreDecoder;
  import org.apache.tajo.storage.Tuple;

http://git-wip-us.apache.org/repos/asf/tajo/blob/3e2bf9a1/tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java
----------------------------------------------------------------------
diff --cc tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java
index ecbb2f7,3fa67ae..8cdfbb4
--- a/tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java
+++ b/tajo-yarn-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java
@@@ -47,10 -45,8 +45,9 @@@ import org.apache.hadoop.yarn.api.recor
  import org.apache.tajo.catalog.Schema;
  import org.apache.tajo.conf.TajoConf;
  import org.apache.tajo.conf.TajoConf.ConfVars;
- import org.apache.tajo.pullserver.listener.FileCloseListener;
  import org.apache.tajo.pullserver.retriever.FileChunk;
  import org.apache.tajo.rpc.RpcChannelFactory;
 +import org.apache.tajo.storage.BaseTupleComparator;
  import org.apache.tajo.storage.HashShuffleAppenderManager;
  import org.apache.tajo.storage.RowStoreUtil;
  import org.apache.tajo.storage.RowStoreUtil.RowStoreDecoder;


Mime
View raw message