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/16970e5b Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/16970e5b Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/16970e5b Branch: refs/heads/index_support Commit: 16970e5b48f5d666f2f87c7769bf27eabcc870d9 Parents: 4936711 fa063f0 Author: Jihoon Son <[email protected]> Authored: Thu Jul 23 23:06:08 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Jul 23 23:06:08 2015 +0900 ---------------------------------------------------------------------- CHANGES | 5 + pom.xml | 1 + .../org/apache/tajo/catalog/CatalogUtil.java | 2 + .../src/main/proto/CatalogProtos.proto | 1 + .../org/apache/tajo/datum/TimestampDatum.java | 2 +- .../apache/tajo/storage/StorageConstants.java | 2 + .../apache/tajo/util/datetime/DateTimeUtil.java | 2 + tajo-core/pom.xml | 10 +- .../org/apache/tajo/master/GlobalEngine.java | 7 +- .../tajo/master/QueryCoordinatorService.java | 7 +- .../java/org/apache/tajo/master/TajoMaster.java | 33 +- .../apache/tajo/master/exec/QueryExecutor.java | 7 +- .../tajo/metrics/CatalogMetricsGaugeSet.java | 56 ---- .../tajo/metrics/ClusterResourceMetricSet.java | 104 ++++++ .../metrics/WorkerResourceMetricsGaugeSet.java | 74 ----- .../querymaster/QueryMasterManagerService.java | 1 - .../tajo/querymaster/QueryMasterTask.java | 21 -- .../org/apache/tajo/session/SessionManager.java | 5 + .../apache/tajo/util/metrics/TajoMetrics.java | 68 +--- .../tajo/util/metrics/TajoSystemMetrics.java | 21 +- .../java/org/apache/tajo/worker/TajoWorker.java | 11 +- .../tajo/worker/TajoWorkerManagerService.java | 1 - .../org/apache/tajo/worker/TaskContainer.java | 2 - .../org/apache/tajo/worker/TaskExecutor.java | 2 - .../tajo/util/metrics/TestSystemMetrics.java | 37 ++- .../apache/tajo/worker/MockWorkerContext.java | 4 +- .../tajo/worker/TestNodeResourceManager.java | 2 +- .../tajo/worker/TestNodeStatusUpdater.java | 2 +- .../apache/tajo/worker/TestTaskExecutor.java | 2 +- .../org/apache/tajo/worker/TestTaskManager.java | 2 +- tajo-dist/pom.xml | 1 + tajo-metrics/pom.xml | 271 ++++++++++++++++ .../org/apache/tajo/metrics/MetricsUtil.java | 96 ++++++ .../src/main/proto/master_metrics.proto | 57 ++++ tajo-metrics/src/main/proto/node_metrics.proto | 36 +++ .../apache/tajo/metrics/TestMetricsUtil.java | 53 +++ tajo-project/pom.xml | 6 + .../src/main/resources/storage-default.xml | 11 +- .../src/test/resources/storage-default.xml | 11 +- tajo-storage/tajo-storage-hdfs/pom.xml | 5 + .../org/apache/tajo/storage/orc/ORCScanner.java | 324 +++++++++++++++++++ .../thirdparty/orc/FileOrcDataSource.java | 132 ++++++++ .../thirdparty/orc/HdfsOrcDataSource.java | 131 ++++++++ .../apache/tajo/storage/orc/TestORCScanner.java | 107 ++++++ .../src/test/resources/dataset/u_data_20.orc | Bin 0 -> 813 bytes 45 files changed, 1464 insertions(+), 271 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/16970e5b/CHANGES ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/16970e5b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/16970e5b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/16970e5b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/16970e5b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java ---------------------------------------------------------------------- diff --cc tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java index e3f2fa4,ceb3c4a..149d0b0 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java @@@ -101,18 -104,10 +102,17 @@@ public class QueryExecutor } else if (PlannerUtil.checkIfDDLPlan(rootNode)) { - context.getSystemMetrics().counter("Query", "numDDLQuery").inc(); - ddlExecutor.execute(queryContext, plan); - response.setQueryId(QueryIdFactory.NULL_QUERY_ID.getProto()); - response.setState(OK); + if (PlannerUtil.isDistExecDDL(rootNode)) { + if (rootNode.getChild().getType() == NodeType.CREATE_INDEX) { + checkIndexExistence(queryContext, (CreateIndexNode) rootNode.getChild()); + } + executeDistributedQuery(queryContext, session, plan, sql, jsonExpr, response); + } else { ++ ddlExecutor.execute(queryContext, plan); + response.setQueryId(QueryIdFactory.NULL_QUERY_ID.getProto()); + response.setState(OK); - ddlExecutor.execute(queryContext, plan); + } } else if (plan.isExplain()) { // explain query execExplain(plan, queryContext, plan.isExplainGlobal(), response); http://git-wip-us.apache.org/repos/asf/tajo/blob/16970e5b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java ----------------------------------------------------------------------
