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/4d7910a0 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4d7910a0 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4d7910a0 Branch: refs/heads/index_support Commit: 4d7910a0885cccb0048ffc5789539ebc0fbddcd3 Parents: 6949408 7d72088 Author: Jihoon Son <[email protected]> Authored: Mon Apr 13 23:23:00 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Apr 13 23:23:00 2015 +0900 ---------------------------------------------------------------------- CHANGES | 9 ++ .../org/apache/tajo/algebra/Aggregation.java | 16 ++-- .../org/apache/tajo/algebra/AlterTable.java | 8 +- .../apache/tajo/algebra/BetweenPredicate.java | 2 +- .../org/apache/tajo/algebra/CreateTable.java | 46 ++++++---- .../java/org/apache/tajo/algebra/Insert.java | 4 +- .../org/apache/tajo/algebra/UnaryOperator.java | 4 +- .../org/apache/tajo/algebra/ValueListExpr.java | 2 +- .../java/org/apache/tajo/conf/TajoConf.java | 1 + .../planner/physical/ExternalSortExec.java | 2 +- .../org/apache/tajo/master/ContainerProxy.java | 12 ++- .../org/apache/tajo/master/GlobalEngine.java | 44 ++++++++- .../apache/tajo/master/TajoContainerProxy.java | 40 +++------ .../java/org/apache/tajo/session/Session.java | 11 +++ .../tajo/worker/TajoResourceAllocator.java | 93 ++++++++++++++------ .../main/java/org/apache/tajo/rpc/RpcUtils.java | 2 +- .../java/org/apache/tajo/rpc/NullCallback.java | 9 +- 17 files changed, 213 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4d7910a0/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4d7910a0/tajo-algebra/src/main/java/org/apache/tajo/algebra/Insert.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4d7910a0/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4d7910a0/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java ---------------------------------------------------------------------- diff --cc tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java index a33f30a,08403ff..4c9dc91 --- a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java @@@ -32,9 -36,11 +36,11 @@@ import org.apache.tajo.catalog.CatalogS import org.apache.tajo.catalog.Schema; import org.apache.tajo.catalog.TableDesc; import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; + import org.apache.tajo.conf.TajoConf; import org.apache.tajo.engine.parser.SQLAnalyzer; + import org.apache.tajo.engine.parser.SQLSyntaxError; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.ipc.ClientProtos; +import org.apache.tajo.ipc.ClientProtos.ResultCode; import org.apache.tajo.master.TajoMaster.MasterContext; import org.apache.tajo.master.exec.DDLExecutor; import org.apache.tajo.master.exec.QueryExecutor;
