You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/09/02 13:07:01 UTC

[38/39] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1730

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1730


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/705bf9b4
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/705bf9b4
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/705bf9b4

Branch: refs/heads/TAJO-1730
Commit: 705bf9b41697d7084f1f1bfff48ef2937ab0e76d
Parents: 947736b ace0480
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Sep 2 19:41:11 2015 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Sep 2 19:41:11 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  11 +
 .../org/apache/tajo/catalog/AlterTableDesc.java |  18 +
 .../org/apache/tajo/catalog/CatalogUtil.java    |   9 +-
 .../src/main/proto/CatalogProtos.proto          |   1 +
 .../tajo-catalog-drivers/tajo-hive/pom.xml      |  15 +-
 .../tajo/catalog/store/HiveCatalogStore.java    |   7 +
 tajo-catalog/tajo-catalog-server/pom.xml        |  11 +-
 .../org/apache/tajo/catalog/CatalogServer.java  |   4 +
 .../tajo/catalog/store/AbstractDBStore.java     | 111 ++-
 .../apache/tajo/catalog/store/CatalogStore.java |   4 +-
 .../apache/tajo/catalog/store/DerbyStore.java   |  11 +-
 .../org/apache/tajo/catalog/store/MemStore.java | 785 -------------------
 .../src/main/resources/schemas/derby/derby.xml  |   3 +-
 .../main/resources/schemas/mariadb/mariadb.xml  |   3 +-
 .../src/main/resources/schemas/mysql/mysql.xml  |   3 +-
 .../main/resources/schemas/oracle/oracle.xml    |   3 +-
 .../resources/schemas/postgresql/postgresql.xml |   3 +-
 .../apache/tajo/catalog/CatalogTestingUtil.java |  91 +++
 .../org/apache/tajo/catalog/TestCatalog.java    |  54 +-
 .../tajo/catalog/TestLinkedMetadataManager.java |   3 +-
 .../apache/tajo/client/SessionConnection.java   |   9 +-
 tajo-cluster-tests/pom.xml                      |   3 +-
 .../org/apache/tajo/CatalogTestingUtil.java     |  92 +++
 .../org/apache/tajo/TajoTestingCluster.java     |  25 +-
 .../apache/tajo/exception/ErrorMessages.java    |   2 +
 .../apache/tajo/exception/ExceptionUtil.java    |   2 +
 .../tajo/exception/UnsupportedCatalogStore.java |  33 +
 tajo-common/src/main/proto/errors.proto         |   3 +
 tajo-core-tests/pom.xml                         |   5 +-
 .../apache/tajo/engine/eval/ExprTestBase.java   |   3 +-
 .../tajo/engine/planner/TestLogicalPlanner.java |   3 +-
 .../planner/physical/TestExternalSortExec.java  |  14 +-
 .../planner/physical/TestPhysicalPlanner.java   |   2 +-
 .../physical/TestProgressExternalSortExec.java  |  25 +-
 .../planner/physical/TestTupleSorter.java       |   4 +-
 .../tajo/engine/query/TestSelectQuery.java      |   7 +-
 tajo-core/pom.xml                               |   1 -
 .../org/apache/tajo/benchmark/BenchmarkSet.java |   5 +-
 .../engine/planner/PhysicalPlannerImpl.java     |  14 +-
 .../planner/physical/ExternalSortExec.java      |   5 -
 .../java/org/apache/tajo/master/TajoMaster.java |  16 +-
 .../apache/tajo/master/exec/DDLExecutor.java    |   5 +-
 .../apache/tajo/master/exec/QueryExecutor.java  |   4 +-
 .../tajo/querymaster/AbstractTaskScheduler.java |   6 +
 .../tajo/querymaster/DefaultTaskScheduler.java  |  38 +-
 .../java/org/apache/tajo/worker/TajoWorker.java |   3 +
 .../src/main/resources/python/controller.py     |  26 +-
 tajo-jdbc/pom.xml                               |  10 +
 .../src/main/proto/master_metrics.proto         |   8 +-
 .../org/apache/tajo/plan/LogicalPlanner.java    |  45 +-
 .../plan/exprrewrite/rules/ConstantFolding.java |   4 +-
 .../function/python/PythonScriptEngine.java     | 138 ++--
 .../plan/rewrite/rules/AccessPathRewriter.java  |   2 +-
 tajo-project/pom.xml                            |   2 +-
 tajo-storage/tajo-storage-common/pom.xml        |   2 +-
 tajo-storage/tajo-storage-hbase/pom.xml         |   2 +-
 tajo-storage/tajo-storage-hdfs/pom.xml          |   2 +-
 57 files changed, 633 insertions(+), 1087 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/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/705bf9b4/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestLinkedMetadataManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-cluster-tests/src/test/java/org/apache/tajo/TajoTestingCluster.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-common/src/main/java/org/apache/tajo/exception/ExceptionUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-jdbc/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-plan/src/main/java/org/apache/tajo/plan/exprrewrite/rules/ConstantFolding.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/705bf9b4/tajo-project/pom.xml
----------------------------------------------------------------------