You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/01/10 12:26:45 UTC
[5/5] tajo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into index_support
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Conflicts:
tajo-docs/src/main/sphinx/index/how_to_use.rst
tajo-docs/src/main/sphinx/index_overview.rst
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/ad78d2f6
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ad78d2f6
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ad78d2f6
Branch: refs/heads/index_support
Commit: ad78d2f62c9990f012d75af8cb10a00b47b27312
Parents: 767b9a4 c45d0ef
Author: Jihoon Son <ji...@apache.org>
Authored: Sat Jan 10 20:26:31 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Sat Jan 10 20:26:31 2015 +0900
----------------------------------------------------------------------
CHANGES | 9 +
.../tajo/catalog/AbstractCatalogClient.java | 11 +-
.../apache/tajo/client/SessionConnection.java | 2 +-
.../org/apache/tajo/master/QueryInProgress.java | 4 +-
.../apache/tajo/master/TajoContainerProxy.java | 14 +-
.../tajo/master/container/TajoContainerId.java | 3 +-
.../master/container/TajoContainerIdPBImpl.java | 100 +++++++++++
.../master/container/TajoConverterUtils.java | 176 -------------------
.../master/container/TajoRecordFactory.java | 31 ----
.../container/TajoRecordFactoryPBImpl.java | 104 -----------
.../container/TajoRecordFactoryProvider.java | 70 --------
.../tajo/master/container/TajoRecords.java | 39 ----
.../impl/pb/TajoContainerIdPBImpl.java | 100 -----------
.../apache/tajo/querymaster/QueryMaster.java | 2 +-
.../tajo/worker/ExecutionBlockContext.java | 2 +-
.../tajo/worker/TajoResourceAllocator.java | 6 +-
.../java/org/apache/tajo/worker/TaskRunner.java | 2 +-
.../tajo/worker/WorkerHeartbeatService.java | 2 +-
.../ConnectivityCheckerRuleForTajoWorker.java | 2 +-
.../src/main/resources/webapps/admin/index.jsp | 4 +-
.../resources/webapps/worker/querytasks.jsp | 10 +-
tajo-docs/src/main/sphinx/index/how_to_use.rst | 8 +-
tajo-docs/src/main/sphinx/index_overview.rst | 4 +-
tajo-rpc/pom.xml | 27 +--
.../org/apache/tajo/rpc/AsyncRpcClient.java | 3 +-
.../org/apache/tajo/rpc/BlockingRpcClient.java | 5 +-
.../org/apache/tajo/rpc/NettyClientBase.java | 3 +-
.../org/apache/tajo/rpc/NettyServerBase.java | 4 +-
.../org/apache/tajo/rpc/RpcChannelFactory.java | 18 +-
.../org/apache/tajo/rpc/RpcConnectionPool.java | 13 +-
.../main/java/org/apache/tajo/rpc/RpcUtils.java | 68 +++++++
.../org/apache/tajo/rpc/ServerCallable.java | 5 +-
.../java/org/apache/tajo/rpc/TestAsyncRpc.java | 7 +-
.../org/apache/tajo/rpc/TestBlockingRpc.java | 12 +-
34 files changed, 259 insertions(+), 611 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/ad78d2f6/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
----------------------------------------------------------------------
diff --cc tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
index dc12614,1a2fd44..53e5ab4
--- a/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
+++ b/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
@@@ -41,9 -35,7 +35,8 @@@ import org.apache.tajo.rpc.RpcConnectio
import org.apache.tajo.rpc.ServerCallable;
import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos;
import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos.NullProto;
- import org.apache.tajo.ha.HAServiceUtil;
import org.apache.tajo.util.ProtoUtil;
+import org.apache.tajo.util.TUtil;
import java.net.InetSocketAddress;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/tajo/blob/ad78d2f6/tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/ad78d2f6/tajo-docs/src/main/sphinx/index/how_to_use.rst
----------------------------------------------------------------------
diff --cc tajo-docs/src/main/sphinx/index/how_to_use.rst
index 82a8bc9,776d205..a452289
--- a/tajo-docs/src/main/sphinx/index/how_to_use.rst
+++ b/tajo-docs/src/main/sphinx/index/how_to_use.rst
@@@ -66,4 -66,4 +66,4 @@@ If you don't want to use the index sca
.. note::
- If the index scan feature is enabled, Tajo currently always performs index scan regardless of its efficiency. You should set this option when the expected number of retrieved tuples is sufficiently small.
- Once the index scan feature is enabled, Tajo currently always performs the index scan regardless of its efficiency. You should set this option when the expected number of retrieved tuples is sufficiently small.
++ Once the index scan feature is enabled, Tajo currently always performs the index scan regardless of its efficiency. You should set this option when the expected number of retrieved tuples is sufficiently small.