Repository: tajo Updated Branches: refs/heads/index_support 1bf1536db -> b150c3e5a
Cleanup changes and update catalog version Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/b150c3e5 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/b150c3e5 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/b150c3e5 Branch: refs/heads/index_support Commit: b150c3e5a70022fc1b76d42740f79e815ca3571c Parents: 1bf1536 Author: Jihoon Son <[email protected]> Authored: Fri Jul 24 13:29:02 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Fri Jul 24 13:29:02 2015 +0900 ---------------------------------------------------------------------- CHANGES | 4 +--- .../src/main/resources/schemas/derby/derby.xml | 4 +++- .../src/main/resources/schemas/mariadb/mariadb.xml | 3 ++- .../src/main/resources/schemas/mysql/mysql.xml | 3 ++- .../src/main/resources/schemas/oracle/oracle.xml | 3 ++- .../src/main/resources/schemas/postgresql/postgresql.xml | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/b150c3e5/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2c32817..25e5f74 100644 --- a/CHANGES +++ b/CHANGES @@ -411,12 +411,10 @@ Release 0.11.0 - unreleased SUB TASKS -<<<<<<< HEAD TAJO-1302: Support index metadata backup and restore. (jihoon) -======= + TAJO-1484 Apply on ColPartitionStoreExec. (Contributed by Navis, committed by hyunsik) ->>>>>>> bcec5eb7e247dc983184b37a3dbb4143afd19ac8 TAJO-1464: Add ORCFileScanner to read ORCFile table. (Contributed by Jongyoung Park, Committed by jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/b150c3e5/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml index 196a4a8..7ed9118 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml @@ -19,12 +19,14 @@ <tns:store xmlns:tns="http://tajo.apache.org/catalogstore"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd "> <!-- Catalog base version history + * 6 - 2015-07-24: Merge the index branch into the master branch (TAJO-1300) + * 5 - 2015-06-15: Implement TablespaceManager to load Tablespaces (TAJO-1616) * 4 - 2015-03-27: Partition Schema (TAJO-1284) * 3 - 2015-03-12: Nested Schema (TAJO-1329) * 2 - 2014-06-09: First versioning * 1- Before 2013-03-20 --> - <tns:base version="5"> + <tns:base version="6"> <tns:objects> <tns:Object order="0" type="table" name="META"> <tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql> http://git-wip-us.apache.org/repos/asf/tajo/blob/b150c3e5/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml index e607baa..8750d2b 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml @@ -19,13 +19,14 @@ <tns:store xmlns:tns="http://tajo.apache.org/catalogstore"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd "> <!-- Catalog base version history + * 6 - 2015-07-24: Merge the index branch into the master branch (TAJO-1300) * 5 - 2015-06-15: Implement TablespaceManager to load Tablespaces (TAJO-1616) * 4 - 2015-03-27: Partition Schema (TAJO-1284) * 3 - 2015-03-12: Nested Schema (TAJO-1329) * 2 - 2014-06-09: First versioning * 1- Before 2013-03-20 --> - <tns:base version="5"> + <tns:base version="6"> <tns:objects> <tns:Object order="0" type="table" name="META"> <tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql> http://git-wip-us.apache.org/repos/asf/tajo/blob/b150c3e5/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml index 809f42f..763d0f7 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml @@ -19,13 +19,14 @@ <tns:store xmlns:tns="http://tajo.apache.org/catalogstore"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd "> <!-- Catalog base version history + * 6 - 2015-07-24: Merge the index branch into the master branch (TAJO-1300) * 5 - 2015-06-15: Implement TablespaceManager to load Tablespaces (TAJO-1616) * 4 - 2015-03-27: Partition Schema (TAJO-1284) * 3 - 2015-03-12: Nested Schema (TAJO-1329) * 2 - 2014-06-09: First versioning * 1- Before 2013-03-20 --> - <tns:base version="5"> + <tns:base version="6"> <tns:objects> <tns:Object order="0" type="table" name="META"> <tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql> http://git-wip-us.apache.org/repos/asf/tajo/blob/b150c3e5/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml index f105c36..3d8ef30 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml @@ -19,13 +19,14 @@ <tns:store xmlns:tns="http://tajo.apache.org/catalogstore"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd "> <!-- Catalog base version history + * 6 - 2015-07-24: Merge the index branch into the master branch (TAJO-1300) * 5 - 2015-06-15: Implement TablespaceManager to load Tablespaces (TAJO-1616) * 4 - 2015-03-27: Partition Schema (TAJO-1284) * 3 - 2015-03-12: Nested Schema (TAJO-1329) * 2 - 2014-06-09: First versioning * 1- Before 2013-03-20 --> - <tns:base version="5"> + <tns:base version="6"> <tns:objects> <tns:Object order="0" type="table" name="meta"> <tns:sql><![CDATA[ http://git-wip-us.apache.org/repos/asf/tajo/blob/b150c3e5/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml index cab3c12..0dd72b9 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml @@ -21,6 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd "> <!-- Catalog base version history + * 6 - 2015-07-24: Merge the index branch into the master branch (TAJO-1300) * 5 - 2015-06-15: Implement TablespaceManager to load Tablespaces (TAJO-1616) * 5 - 2015-06-15: Implement TablespaceManager to load Tablespaces (TAJO-1616) * 4 - 2015-03-27: Partition Schema (TAJO-1284) @@ -28,7 +29,7 @@ xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition. * 2 - 2014-06-09: First versioning * 1- Before 2013-03-20 --> - <tns:base version="5"> + <tns:base version="6"> <tns:objects> <tns:Object name="META" type="table" order="0"> <tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
