Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into
index_support
Conflicts:
tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/1c53ccf7
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/1c53ccf7
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/1c53ccf7
Branch: refs/heads/index_support
Commit: 1c53ccf7ac23338c4ec5f7bfdd311c26de3eef45
Parents: bba7d18 fdb098b
Author: Jihoon Son <[email protected]>
Authored: Thu Apr 2 10:33:45 2015 +0900
Committer: Jihoon Son <[email protected]>
Committed: Thu Apr 2 10:33:45 2015 +0900
----------------------------------------------------------------------
.gitignore | 3 +
CHANGES | 4 +
.../store/AbstractMySQLMariaDBStore.java | 2 +-
.../schemas/mariadb/partition_keys.sql | 4 +-
.../resources/schemas/mysql/partition_keys.sql | 2 +-
.../main/resources/schemas/oracle/oracle.xml | 6 +-
.../resources/schemas/postgresql/postgresql.xml | 4 +-
.../org/apache/tajo/cli/tools/TajoAdmin.java | 35 +-
tajo-client/src/main/proto/ClientProtos.proto | 4 +-
.../java/org/apache/tajo/conf/TajoConf.java | 4 +-
.../tajo/master/TajoMasterClientService.java | 2 -
.../NonForwardQueryResultSystemScanner.java | 31 +-
.../tajo/master/rm/TajoResourceTracker.java | 10 +-
.../java/org/apache/tajo/master/rm/Worker.java | 4 +-
.../apache/tajo/master/rm/WorkerResource.java | 20 -
.../apache/tajo/querymaster/QueryMaster.java | 8 +-
.../java/org/apache/tajo/worker/TajoWorker.java | 81 +--
.../apache/tajo/worker/TaskRunnerManager.java | 11 +-
.../tajo/worker/WorkerHeartbeatService.java | 9 +-
.../main/proto/QueryCoordinatorProtocol.proto | 2 -
tajo-core/src/main/resources/tajo-default.xml | 12 -
.../main/resources/webapps/admin/cluster.jsp | 19 +-
.../src/main/resources/webapps/admin/index.jsp | 26 +-
.../src/main/resources/webapps/worker/index.jsp | 6 -
.../org/apache/tajo/MiniTajoYarnCluster.java | 175 -----
.../org/apache/tajo/TajoTestingCluster.java | 62 +-
.../tajo/master/rm/TestTajoResourceManager.java | 14 +-
tajo-dist/src/main/bin/start-tajo.sh | 13 +-
tajo-dist/src/main/bin/stop-tajo.sh | 11 +-
tajo-dist/src/main/bin/tajo | 9 -
tajo-dist/src/main/conf/tajo-env.sh | 3 -
.../tajo/pullserver/PullServerAuxService.java | 655 -------------------
.../apache/tajo/pullserver/TajoPullServer.java | 6 +-
.../tajo/pullserver/TajoPullServerService.java | 115 ++--
.../retriever/DirectoryRetriever.java | 2 +-
35 files changed, 135 insertions(+), 1239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/1c53ccf7/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/1c53ccf7/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/1c53ccf7/tajo-client/src/main/proto/ClientProtos.proto
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/1c53ccf7/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/1c53ccf7/tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/1c53ccf7/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
----------------------------------------------------------------------
