Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/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/255046be Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/255046be Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/255046be Branch: refs/heads/index_support Commit: 255046be8fb2eeeb6155322bff9a2bb20ad3e6ee Parents: 7cafc33 4595375 Author: Jihoon Son <[email protected]> Authored: Fri Jan 30 23:32:33 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Fri Jan 30 23:32:33 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 + .../tajo/catalog/AbstractCatalogClient.java | 12 +- .../apache/tajo/client/DummyServiceTracker.java | 84 +++ .../apache/tajo/client/SessionConnection.java | 44 +- .../org/apache/tajo/client/TajoClientImpl.java | 38 +- .../apache/tajo/client/TajoHAClientUtil.java | 14 +- .../java/org/apache/tajo/conf/TajoConf.java | 7 +- .../java/org/apache/tajo/ha/HAServiceUtil.java | 39 -- .../apache/tajo/service/BaseServiceTracker.java | 97 ++++ .../apache/tajo/service/HAServiceTracker.java | 48 ++ .../org/apache/tajo/service/ServiceTracker.java | 63 ++ .../tajo/service/ServiceTrackerException.java | 30 + .../tajo/service/ServiceTrackerFactory.java | 41 ++ .../org/apache/tajo/service/TajoMasterInfo.java | 89 +++ .../org/apache/tajo/benchmark/BenchmarkSet.java | 15 +- .../main/java/org/apache/tajo/ha/HAService.java | 56 -- .../org/apache/tajo/ha/HAServiceHDFSImpl.java | 316 ---------- .../org/apache/tajo/ha/HdfsServiceTracker.java | 576 +++++++++++++++++++ .../java/org/apache/tajo/ha/TajoMasterInfo.java | 89 --- .../apache/tajo/master/TajoContainerProxy.java | 27 +- .../java/org/apache/tajo/master/TajoMaster.java | 30 +- .../apache/tajo/querymaster/QueryMaster.java | 66 +-- .../main/java/org/apache/tajo/util/JSPUtil.java | 12 +- .../tajo/worker/TajoResourceAllocator.java | 28 +- .../java/org/apache/tajo/worker/TajoWorker.java | 46 +- .../tajo/worker/TajoWorkerClientService.java | 2 +- .../tajo/worker/WorkerHeartbeatService.java | 20 +- .../ConnectivityCheckerRuleForTajoWorker.java | 11 +- .../resources/webapps/admin/catalogview.jsp | 5 +- .../main/resources/webapps/admin/cluster.jsp | 7 +- .../src/main/resources/webapps/admin/index.jsp | 7 +- .../resources/webapps/admin/query_executor.jsp | 5 +- .../apache/tajo/ha/TestHAServiceHDFSImpl.java | 10 +- tajo-docs/src/main/sphinx/hbase_integration.rst | 6 +- .../org/apache/tajo/jdbc/JdbcConnection.java | 10 +- .../org/apache/tajo/jdbc/TajoStatement.java | 4 +- .../org/apache/tajo/storage/StorageUtil.java | 16 - .../storage/hbase/HBaseStorageConstants.java | 1 + .../tajo/storage/hbase/HBaseStorageManager.java | 11 + 39 files changed, 1175 insertions(+), 810 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/255046be/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 53e5ab4,718f7d6..2483c1f --- 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 @@@ -35,8 -34,9 +34,10 @@@ 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.service.ServiceTracker; + import org.apache.tajo.service.ServiceTrackerFactory; 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/255046be/tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/255046be/tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java ---------------------------------------------------------------------- diff --cc tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java index 9522746,f8eef28..6f6059e --- a/tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java +++ b/tajo-client/src/main/java/org/apache/tajo/client/TajoClientImpl.java @@@ -32,10 -31,7 +32,8 @@@ import org.apache.tajo.catalog.TableDes import org.apache.tajo.catalog.TableMeta; import org.apache.tajo.catalog.partition.PartitionMethodDesc; import org.apache.tajo.catalog.proto.CatalogProtos; +import org.apache.tajo.catalog.proto.CatalogProtos.IndexDescProto; import org.apache.tajo.conf.TajoConf; - import org.apache.tajo.conf.TajoConf.ConfVars; - import org.apache.tajo.ha.HAServiceUtil; import org.apache.tajo.ipc.ClientProtos.*; import org.apache.tajo.jdbc.TajoMemoryResultSet; import org.apache.tajo.jdbc.TajoResultSet; http://git-wip-us.apache.org/repos/asf/tajo/blob/255046be/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/255046be/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java ----------------------------------------------------------------------
