tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [3/3] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Fri, 13 Mar 2015 03:24:27 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support

Conflicts:
	tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/indexes.sql


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

Branch: refs/heads/index_support
Commit: 5bb4108c9cc1b2ea7fe08743f3c3298719676071
Parents: 292cd9e f48d4bd
Author: Jihoon Son <jihoonson@apache.org>
Authored: Fri Mar 13 12:23:57 2015 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Fri Mar 13 12:23:57 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |   5 +
 .../apache/tajo/algebra/ColumnDefinition.java   |   2 +-
 .../org/apache/tajo/algebra/DataTypeExpr.java   |  18 ++-
 .../org/apache/tajo/catalog/CatalogUtil.java    |  28 ++--
 .../java/org/apache/tajo/catalog/Column.java    |  45 ++++--
 .../org/apache/tajo/catalog/DDLBuilder.java     |   9 +-
 .../java/org/apache/tajo/catalog/Schema.java    | 156 +++++++++++++------
 .../org/apache/tajo/catalog/SchemaUtil.java     |  42 +++++
 .../java/org/apache/tajo/catalog/TypeDesc.java  |  75 +++++++++
 .../org/apache/tajo/catalog/TestSchema.java     | 137 ++++++++++++++++
 .../dictionary/ColumnsTableDescriptor.java      |   7 +-
 .../tajo/catalog/store/AbstractDBStore.java     |  64 +++++---
 .../apache/tajo/catalog/store/MariaDBStore.java |   5 +-
 .../apache/tajo/catalog/store/MySQLStore.java   |  11 +-
 .../apache/tajo/catalog/store/OracleStore.java  |   2 +-
 .../tajo/catalog/store/PostgreSQLStore.java     |   4 +-
 .../src/main/resources/schemas/derby/derby.xml  |  12 +-
 .../main/resources/schemas/mariadb/columns.sql  |   3 +-
 .../main/resources/schemas/mysql/columns.sql    |   3 +-
 .../main/resources/schemas/oracle/columns.sql   |   9 --
 .../main/resources/schemas/oracle/databases.sql |   6 -
 .../main/resources/schemas/oracle/indexes.sql   |  18 ---
 .../main/resources/schemas/oracle/oracle.xml    |  10 +-
 .../schemas/oracle/partition_methods.sql        |   7 -
 .../resources/schemas/oracle/partitions.sql     |  10 --
 .../src/main/resources/schemas/oracle/stats.sql |   6 -
 .../schemas/oracle/table_properties.sql         |   7 -
 .../main/resources/schemas/oracle/tables.sql    |   9 --
 .../resources/schemas/oracle/tablespaces.sql    |   6 -
 .../resources/schemas/postgresql/columns.sql    |   9 --
 .../resources/schemas/postgresql/databases.sql  |   6 -
 .../schemas/postgresql/partition_methods.sql    |   7 -
 .../resources/schemas/postgresql/partitions.sql |  10 --
 .../resources/schemas/postgresql/postgresql.xml |  10 +-
 .../schemas/postgresql/table_properties.sql     |   7 -
 .../resources/schemas/postgresql/tables.sql     |   9 --
 .../schemas/postgresql/tablespaces.sql          |   6 -
 .../org/apache/tajo/catalog/TestCatalog.java    | 101 ++++++++++++
 .../cli/tsql/commands/DescTableCommand.java     |   5 +-
 tajo-common/src/main/proto/DataTypes.proto      |  10 ++
 tajo-core/pom.xml                               |  56 +++++++
 .../org/apache/tajo/cli/tools/TestTajoDump.java |  21 +++
 .../org/apache/tajo/cli/tsql/TestTajoCli.java   |  40 +++--
 .../tajo/engine/query/TestCreateTable.java      |  24 +++
 .../TestCreateTable/testNestedRecord1.sql       |   1 +
 .../TestCreateTable/testNestedRecord2.sql       |   1 +
 .../TestSelectQuery/testExplainSelect.result    |   4 +-
 .../testDescTableForNestedSchema.result         |  29 ++++
 .../results/TestTajoDump/testDump2.result       |  16 ++
 .../org/apache/tajo/plan/ExprAnnotator.java     |   5 +-
 .../org/apache/tajo/plan/LogicalPlanner.java    |  18 ++-
 .../org/apache/tajo/plan/TypeDeterminant.java   |   4 +-
 52 files changed, 830 insertions(+), 285 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/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/5bb4108c/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/5bb4108c/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------


Mime
View raw message