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/03/11 02:22:08 UTC
[12/12] 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
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/34757158
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/34757158
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/34757158
Branch: refs/heads/index_support
Commit: 347571584fa9878bd0615dcfb6a4e0dfdf78c47f
Parents: e38c48a 513a8c3
Author: Jihoon Son <ji...@apache.org>
Authored: Wed Mar 11 10:21:40 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Wed Mar 11 10:21:40 2015 +0900
----------------------------------------------------------------------
CHANGES | 19 +
.../apache/tajo/algebra/ExistsPredicate.java | 2 +-
.../tajo/catalog/AbstractCatalogClient.java | 4 +-
.../org/apache/tajo/catalog/CatalogServer.java | 6 +-
.../dictionary/ClusterTableDescriptor.java | 56 +++
.../InfoSchemaMetadataDictionary.java | 5 +-
.../tajo/catalog/store/AbstractDBStore.java | 18 +-
.../main/java/org/apache/tajo/util/TUtil.java | 6 +-
.../org/apache/tajo/engine/parser/SQLParser.g4 | 1 +
.../engine/codegen/ExecutorPreCompiler.java | 2 +-
.../tajo/engine/function/FunctionLoader.java | 2 +-
.../apache/tajo/engine/parser/SQLAnalyzer.java | 4 +-
.../tajo/engine/parser/SQLSyntaxError.java | 17 +-
.../engine/planner/global/GlobalPlanner.java | 2 +-
.../tajo/master/QueryCoordinatorService.java | 2 +-
.../org/apache/tajo/master/QueryInProgress.java | 2 +-
.../org/apache/tajo/master/QueryManager.java | 2 +-
.../java/org/apache/tajo/master/TajoMaster.java | 4 +-
.../NonForwardQueryResultSystemScanner.java | 142 +++++++
.../master/rm/TajoWorkerResourceManager.java | 4 +-
.../apache/tajo/querymaster/QueryMaster.java | 4 +-
.../java/org/apache/tajo/querymaster/Task.java | 2 +-
.../org/apache/tajo/session/SessionManager.java | 2 +-
.../apache/tajo/util/history/HistoryWriter.java | 2 +-
.../tajo/webapp/QueryExecutorServlet.java | 4 +-
.../org/apache/tajo/worker/DeletionService.java | 4 +-
.../tajo/worker/ExecutionBlockContext.java | 2 +-
.../worker/ExecutionBlockSharedResource.java | 2 +-
.../java/org/apache/tajo/worker/Fetcher.java | 6 +-
.../tajo/worker/TajoResourceAllocator.java | 2 +-
.../main/java/org/apache/tajo/worker/Task.java | 2 +-
.../java/org/apache/tajo/worker/TaskRunner.java | 2 +-
.../tajo/worker/WorkerHeartbeatService.java | 2 +-
.../tajo/worker/rule/WorkerRuleProvider.java | 2 +-
.../engine/function/TestDateTimeFunctions.java | 5 +
.../TestNonForwardQueryResultSystemScanner.java | 18 +
tajo-docs/src/main/sphinx/conf.py | 4 +-
.../org/apache/tajo/jdbc/JdbcConnection.java | 4 +-
.../apache/tajo/plan/InvalidQueryException.java | 4 +-
.../org/apache/tajo/plan/LogicalPlanner.java | 2 +-
.../plan/exprrewrite/EvalTreeOptimizer.java | 2 +-
tajo-project/src/site/apt/index.apt | 4 +-
tajo-project/src/site/markdown/downloads.md | 14 +-
.../markdown/releases/0.10.0/announcement.md | 57 +++
.../resources/releases/0.10.0/relnotes.html | 388 +++++++++++++++++++
tajo-project/src/site/site.xml | 45 ++-
.../tajo/pullserver/PullServerAuxService.java | 4 +-
.../apache/tajo/pullserver/PullServerUtil.java | 2 +-
.../tajo/pullserver/TajoPullServerService.java | 4 +-
.../org/apache/tajo/rpc/NettyServerBase.java | 2 +-
.../org/apache/tajo/rpc/RpcConnectionPool.java | 2 +-
.../org/apache/tajo/storage/StorageUtil.java | 30 +-
.../apache/tajo/storage/TestStorageUtil.java | 58 +++
53 files changed, 879 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-catalog/tajo-catalog-client/src/main/java/org/apache/tajo/catalog/AbstractCatalogClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
----------------------------------------------------------------------
diff --cc tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
index a2b8eaf,c34b4d2..f31efda
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
@@@ -913,28 -913,10 +913,28 @@@ public class CatalogServer extends Abst
rlock.lock();
try {
- return store.existIndexByColumn(databaseName, tableName, columnName) ?
+ return store.existIndexByColumns(databaseName, tableName,
+ columnNames.toArray(new String[columnNames.size()])) ?
+ ProtoUtil.TRUE : ProtoUtil.FALSE;
+ } catch (Exception e) {
+ LOG.error(e);
+ return BoolProto.newBuilder().setValue(false).build();
+ } finally {
+ rlock.unlock();
+ }
+ }
+
+ @Override
+ public BoolProto existIndexesByTable(RpcController controller, TableIdentifierProto request) throws ServiceException {
+ String databaseName = request.getDatabaseName();
+ String tableName = request.getTableName();
+
+ rlock.lock();
+ try {
+ return store.existIndexesByTable(databaseName, tableName) ?
ProtoUtil.TRUE : ProtoUtil.FALSE;
} catch (Exception e) {
- LOG.error(e);
+ LOG.error(e, e);
return BoolProto.newBuilder().setValue(false).build();
} finally {
rlock.unlock();
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-common/src/main/java/org/apache/tajo/util/TUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/java/org/apache/tajo/webapp/QueryExecutorServlet.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/34757158/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------