tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [18/18] git commit: Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-tajo into DAG-execplan
Date Tue, 03 Dec 2013 11:51:13 GMT
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/incubator-tajo into DAG-execplan


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

Branch: refs/heads/DAG-execplan
Commit: dc24dbc1e8950c4ae88abc2635b275d211b16644
Parents: 0cbd968 abc0830
Author: Jihoon Son <jihoonson@apache.org>
Authored: Tue Dec 3 20:50:20 2013 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Tue Dec 3 20:50:20 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                     |  42 +-
 .../org/apache/tajo/algebra/CreateTable.java    |  11 +-
 .../org/apache/tajo/algebra/FunctionExpr.java   |   4 +-
 .../apache/tajo/catalog/CatalogConstants.java   |   1 +
 .../org/apache/tajo/catalog/CatalogUtil.java    |   3 +
 .../org/apache/tajo/catalog/DDLBuilder.java     |  70 +++
 .../java/org/apache/tajo/catalog/TableDesc.java |  33 +-
 .../tajo/catalog/partition/Partitions.java      | 349 +++++++++++++
 .../tajo/catalog/partition/Specifier.java       | 128 +++++
 .../src/main/proto/CatalogProtos.proto          |  20 +
 tajo-catalog/tajo-catalog-server/pom.xml        |   4 +
 .../org/apache/tajo/catalog/CatalogServer.java  |   5 +-
 .../tajo/catalog/store/AbstractDBStore.java     | 184 ++++++-
 .../apache/tajo/catalog/store/DerbyStore.java   | 488 +++++++++++++------
 .../apache/tajo/catalog/store/MySQLStore.java   | 204 +++++---
 .../org/apache/tajo/catalog/TestCatalog.java    | 225 ++++++++-
 .../org/apache/tajo/catalog/TestDBStore.java    | 174 +++++++
 .../java/org/apache/tajo/conf/TajoConf.java     |  14 +-
 .../java/org/apache/tajo/datum/TextDatum.java   |   2 +
 .../org/apache/tajo/engine/parser/SQLParser.g4  |  12 +-
 .../main/java/org/apache/tajo/cli/TajoCli.java  |  36 ++
 .../apache/tajo/engine/function/math/Acos.java  |  50 ++
 .../apache/tajo/engine/function/math/Asin.java  |  50 ++
 .../apache/tajo/engine/function/math/Atan.java  |  50 ++
 .../apache/tajo/engine/function/math/Atan2.java |  51 ++
 .../apache/tajo/engine/function/math/Ceil.java  |  50 ++
 .../apache/tajo/engine/function/math/Cos.java   |  50 ++
 .../apache/tajo/engine/function/math/Floor.java |  50 ++
 .../apache/tajo/engine/function/math/Round.java |  50 ++
 .../apache/tajo/engine/function/math/Sin.java   |  50 ++
 .../apache/tajo/engine/function/math/Tan.java   |  51 ++
 .../tajo/engine/function/string/InitCap.java    |  49 ++
 .../tajo/engine/function/string/Left.java       |  73 +++
 .../apache/tajo/engine/function/string/Md5.java |  55 +++
 .../engine/function/string/OctetLength.java     |  51 ++
 .../tajo/engine/function/string/Repeat.java     |  61 +++
 .../tajo/engine/function/string/Reverse.java    |  48 ++
 .../tajo/engine/function/string/Right.java      |  74 +++
 .../tajo/engine/function/string/StrPos.java     |  62 +++
 .../tajo/engine/function/string/StrPosb.java    | 109 +++++
 .../tajo/engine/function/string/ToHex.java      |  68 +++
 .../apache/tajo/engine/parser/SQLAnalyzer.java  |   9 +-
 .../apache/tajo/engine/planner/LogicalPlan.java |  13 +-
 .../tajo/engine/planner/LogicalPlanner.java     | 135 ++++-
 .../engine/planner/logical/CreateTableNode.java |  18 +-
 .../engine/planner/logical/StoreTableNode.java  |  26 +-
 .../org/apache/tajo/master/GlobalEngine.java    |   9 +-
 .../apache/tajo/master/TajoContainerProxy.java  |  38 +-
 .../java/org/apache/tajo/master/TajoMaster.java | 153 ++++++
 .../tajo/master/TajoMasterClientService.java    |   6 +-
 .../apache/tajo/master/TajoMasterService.java   |  25 +-
 .../tajo/master/querymaster/SubQuery.java       |   9 +-
 .../tajo/master/rm/TajoWorkerContainerId.java   |  41 ++
 .../master/rm/TajoWorkerResourceManager.java    | 358 +++++++++++---
 .../apache/tajo/master/rm/WorkerResource.java   | 115 ++---
 .../tajo/master/rm/WorkerResourceManager.java   |   6 +-
 .../tajo/master/rm/YarnTajoResourceManager.java |  28 +-
 .../apache/tajo/util/ApplicationIdUtils.java    |   3 +
 .../apache/tajo/worker/ResourceAllocator.java   |   3 +-
 .../tajo/worker/TajoResourceAllocator.java      |  68 +--
 .../java/org/apache/tajo/worker/TajoWorker.java |  86 ++--
 .../tajo/worker/YarnResourceAllocator.java      |   4 +-
 .../src/main/proto/ClientProtos.proto           |   1 +
 .../src/main/proto/TajoMasterProtocol.proto     |  64 ++-
 .../main/resources/webapps/admin/cluster.jsp    |  31 +-
 .../src/main/resources/webapps/admin/index.jsp  |  22 +-
 .../org/apache/tajo/TajoTestingCluster.java     |   3 +
 .../org/apache/tajo/client/TestTajoClient.java  | 122 +++++
 .../tajo/engine/function/TestMathFunctions.java | 199 ++++++++
 .../TestStringOperatorsAndFunctions.java        | 169 +++++++
 .../tajo/master/TestTajoResourceManager.java    | 390 +++++++++++++++
 71 files changed, 4761 insertions(+), 554 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/dc24dbc1/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableDesc.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/dc24dbc1/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/LogicalPlan.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/dc24dbc1/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/StoreTableNode.java
----------------------------------------------------------------------
diff --cc tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/StoreTableNode.java
index 7eeb3b7,b2bd937..dddef1b
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/StoreTableNode.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/logical/StoreTableNode.java
@@@ -169,14 -186,15 +186,19 @@@ public class StoreTableNode extends Una
      }
      
      sb.append("\n  \"out schema\": ").append(getOutSchema()).append(",")
-     .append("\n  \"in schema\": ").append(getInSchema())
-     .append("}");
+     .append("\n  \"in schema\": ").append(getInSchema());
+ 
+     if(partitions != null) {
+       sb.append(partitions.toString());
+     }
+ 
+     sb.append("}");
      
 -    return sb.toString() + "\n"
 +    if (child != null) {
 +      return sb.toString() + "\n"
          + getChild().toString();
 +    } else {
 +      return sb.toString();
 +    }
    }
  }

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/dc24dbc1/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
----------------------------------------------------------------------


Mime
View raw message