From 92b121122cf07c84517e4cfecc6e28bf165df771 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 1 Apr 2015 14:35:19 +0900 Subject: [PATCH 1/6] TAJO-1495: Clean up CatalogStore --- .../store/AbstractMySQLMariaDBStore.java | 311 ------------------ .../tajo/catalog/store/MariaDBStore.java | 24 +- .../apache/tajo/catalog/store/MySQLStore.java | 29 +- .../resources/schemas/mariadb/columns.sql | 10 - .../resources/schemas/mariadb/databases.sql | 7 - .../resources/schemas/mariadb/indexes.sql | 16 - .../resources/schemas/mariadb/mariadb.xml | 156 +++++++++ .../schemas/mariadb/partition_keys.sql | 6 - .../schemas/mariadb/partition_methods.sql | 7 - .../resources/schemas/mariadb/partitions.sql | 7 - .../main/resources/schemas/mariadb/stats.sql | 6 - .../schemas/mariadb/table_properties.sql | 7 - .../main/resources/schemas/mariadb/tables.sql | 11 - .../resources/schemas/mariadb/tablespaces.sql | 7 - .../main/resources/schemas/mysql/columns.sql | 10 - .../resources/schemas/mysql/databases.sql | 7 - .../main/resources/schemas/mysql/indexes.sql | 16 - .../main/resources/schemas/mysql/mysql.xml | 156 +++++++++ .../schemas/mysql/partition_keys.sql | 6 - .../schemas/mysql/partition_methods.sql | 7 - .../resources/schemas/mysql/partitions.sql | 7 - .../main/resources/schemas/mysql/stats.sql | 6 - .../schemas/mysql/table_properties.sql | 7 - .../main/resources/schemas/mysql/tables.sql | 11 - .../resources/schemas/mysql/tablespaces.sql | 7 - .../main/resources/schemas/oracle/oracle.xml | 5 +- .../schemas/postgresql/postgresql.xml | 12 +- 27 files changed, 352 insertions(+), 509 deletions(-) delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql create mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql create mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java deleted file mode 100644 index 6f1b765fa2..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractMySQLMariaDBStore.java +++ /dev/null @@ -1,311 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * - */ -package org.apache.tajo.catalog.store; - -import org.apache.hadoop.conf.Configuration; -import org.apache.tajo.catalog.CatalogUtil; -import org.apache.tajo.catalog.exception.CatalogException; -import org.apache.tajo.exception.InternalException; - -import java.sql.*; -import java.util.HashMap; -import java.util.Map; - -public abstract class AbstractMySQLMariaDBStore extends AbstractDBStore { - protected String getCatalogDriverName(){ - throw new CatalogException("you can't use this directly."); - } - - public AbstractMySQLMariaDBStore(final Configuration conf) throws InternalException { - super(conf); - } - - @Override - public int getDriverVersion() { - throw new CatalogException("you can't use this directly."); - } - - protected Connection createConnection(Configuration conf) throws SQLException { - Connection con = DriverManager.getConnection(getCatalogUri(), this.connectionId, - this.connectionPassword); - //TODO con.setAutoCommit(false); - return con; - } - - @Override - protected boolean isConnValid(int timeout) throws CatalogException { - boolean isValid = false; - - try { - isValid = super.isConnValid(timeout); - } catch (NullPointerException e) { - LOG.info("Conn abortion when checking isValid; retrieve false to create another Conn."); - } - return isValid; - } - - @Override - public String readSchemaFile(String filename) throws CatalogException { - return super.readSchemaFile(filename); - } - - // TODO - DDL and index statements should be renamed - @Override - protected void createBaseTable() throws CatalogException { - Statement stmt = null; - Connection conn = null; - - try { - conn = getConnection(); - stmt = conn.createStatement(); - - - // META - if (!baseTableMaps.get(TB_META)) { - String sql = super.readSchemaFile("common/meta.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_META + " is created."); - baseTableMaps.put(TB_META, true); - } - - // TABLE SPACES - if (!baseTableMaps.get(TB_SPACES)) { - String sql = readSchemaFile("tablespaces.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql); - } - - stmt.executeUpdate(sql); - - LOG.info("Table '" + TB_SPACES + "' is created."); - baseTableMaps.put(TB_SPACES, true); - } - - // DATABASES - if (!baseTableMaps.get(TB_DATABASES)) { - String sql = readSchemaFile("databases.sql"); - if (LOG.isDebugEnabled()) { - LOG.debug(sql); - } - LOG.info("Table '" + TB_DATABASES + "' is created."); - baseTableMaps.put(TB_DATABASES, true); - stmt.executeUpdate(sql); - } - - // TABLES - if (!baseTableMaps.get(TB_TABLES)) { - String sql = readSchemaFile("tables.sql"); - if (LOG.isDebugEnabled()) { - LOG.debug(sql); - } - stmt.executeUpdate(sql); - LOG.info("Table '" + TB_TABLES + "' is created."); - baseTableMaps.put(TB_TABLES, true); - } - - // COLUMNS - if (!baseTableMaps.get(TB_COLUMNS)) { - String sql = readSchemaFile("columns.sql"); - if (LOG.isDebugEnabled()) { - LOG.debug(sql); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_COLUMNS + " is created."); - baseTableMaps.put(TB_COLUMNS, true); - } - - // OPTIONS - if (!baseTableMaps.get(TB_OPTIONS)) { - String sql = readSchemaFile("table_properties.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_OPTIONS + " is created."); - baseTableMaps.put(TB_OPTIONS, true); - } - - // INDEXES - if (!baseTableMaps.get(TB_INDEXES)) { - String sql = readSchemaFile("indexes.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_INDEXES + "' is created."); - baseTableMaps.put(TB_INDEXES, true); - } - - if (!baseTableMaps.get(TB_STATISTICS)) { - String sql = readSchemaFile("stats.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_STATISTICS + "' is created."); - baseTableMaps.put(TB_STATISTICS, true); - } - - // PARTITION_METHODS - if (!baseTableMaps.get(TB_PARTITION_METHODS)) { - String sql = readSchemaFile("partition_methods.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql); - } - - stmt.executeUpdate(sql); - LOG.info("Table '" + TB_PARTITION_METHODS + "' is created."); - baseTableMaps.put(TB_PARTITION_METHODS, true); - } - - // PARTITIONS - if (!baseTableMaps.get(TB_PARTTIONS)) { - String sql = readSchemaFile("partitions.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_PARTTIONS + "' is created."); - baseTableMaps.put(TB_PARTTIONS, true); - } - - // PARTITION_KEYS - if (!baseTableMaps.get(TB_PARTTION_KEYS)) { - String sql = readSchemaFile("partition_keys.sql"); - - if (LOG.isDebugEnabled()) { - LOG.debug(sql.toString()); - } - - stmt.executeUpdate(sql.toString()); - LOG.info("Table '" + TB_PARTTION_KEYS + "' is created."); - baseTableMaps.put(TB_PARTTION_KEYS, true); - } - - insertSchemaVersion(); - - } catch (SQLException se) { - throw new CatalogException("failed to create base tables for MySQL catalog store", se); - } finally { - CatalogUtil.closeQuietly(stmt); - } - } - - @Override - protected void dropBaseTable() throws CatalogException { - Connection conn = null; - Statement stmt = null; - Map droppedTable = new HashMap(); - - try { - conn = getConnection(); - stmt = conn.createStatement(); - StringBuilder sql = new StringBuilder(); - - for(Map.Entry entry : baseTableMaps.entrySet()) { - if(entry.getValue() && !entry.getKey().equals(TB_TABLES)) { - sql.delete(0, sql.length()); - sql.append("DROP TABLE ").append(entry.getKey()); - stmt.addBatch(sql.toString()); - droppedTable.put(entry.getKey(), true); - } - } - if(baseTableMaps.get(TB_TABLES)) { - sql.delete(0, sql.length()); - sql.append("DROP TABLE ").append(TB_TABLES); - stmt.addBatch(sql.toString()); - droppedTable.put(TB_TABLES, true); - } - stmt.executeBatch(); - - for(String tableName : droppedTable.keySet()) { - LOG.info("Table '" + tableName + "' is dropped"); - } - } catch (SQLException se) { - throw new CatalogException(se); - } finally { - CatalogUtil.closeQuietly(stmt); - } - } - - @Override - protected boolean isInitialized() throws CatalogException { - Connection conn; - ResultSet res = null; - - try { - conn = getConnection(); - res = conn.getMetaData().getTables(null, null, null, - new String[]{"TABLE"}); - - baseTableMaps.put(TB_META, false); - baseTableMaps.put(TB_SPACES, false); - baseTableMaps.put(TB_DATABASES, false); - baseTableMaps.put(TB_TABLES, false); - baseTableMaps.put(TB_COLUMNS, false); - baseTableMaps.put(TB_OPTIONS, false); - baseTableMaps.put(TB_STATISTICS, false); - baseTableMaps.put(TB_INDEXES, false); - baseTableMaps.put(TB_PARTITION_METHODS, false); - baseTableMaps.put(TB_PARTTIONS, false); - baseTableMaps.put(TB_PARTTION_KEYS, false); - - if (res.wasNull()) - return false; - - while (res.next()) { - // if my.cnf has lower_case_table_names = 1, - // TABLE_NAME returns lower case even it created by upper case. - baseTableMaps.put(res.getString("TABLE_NAME").toUpperCase(), true); - } - - for(Map.Entry entry : baseTableMaps.entrySet()) { - if (!entry.getValue()) { - return false; - } - } - - } catch(SQLException se) { - throw new CatalogException(se); - } finally { - CatalogUtil.closeQuietly(res); - } - - return true; - } -} diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java index 0159b316d7..af86e235d6 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java @@ -25,29 +25,37 @@ import org.apache.tajo.catalog.exception.CatalogException; import org.apache.tajo.exception.InternalException; -public class MariaDBStore extends AbstractMySQLMariaDBStore { +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class MariaDBStore extends AbstractDBStore { /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */ /** 2 - First versioning */ private static final int MARIADB_CATALOG_STORE_VERSION = 3; private static final String CATALOG_DRIVER = "org.mariadb.jdbc.Driver"; + public MariaDBStore(Configuration conf) throws InternalException { + super(conf); + } + @Override - protected String getCatalogDriverName(){ + protected String getCatalogDriverName() { return CATALOG_DRIVER; } - public MariaDBStore(final Configuration conf) throws InternalException { - super(conf); + @Override + protected String getCatalogSchemaPath() { + return "schemas/mariadb"; } @Override - public int getDriverVersion() { - return MARIADB_CATALOG_STORE_VERSION; + protected Connection createConnection(Configuration conf) throws SQLException { + return DriverManager.getConnection(getCatalogUri(), this.connectionId, this.connectionPassword); } @Override - public String readSchemaFile(String filename) throws CatalogException { - return super.readSchemaFile("mariadb/" + filename); + protected void createDatabaseDependants() throws CatalogException { } } diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java index f7f1b1b45a..9784209ae4 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java @@ -25,30 +25,41 @@ import org.apache.tajo.catalog.exception.CatalogException; import org.apache.tajo.exception.InternalException; -public class MySQLStore extends AbstractMySQLMariaDBStore { +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +public class MySQLStore extends AbstractDBStore { /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */ /** 2 - 2014-06-09: First versioning */ - /** 1- Before 2013-03-20 */ + /** + * 1- Before 2013-03-20 + */ private static final int MYSQL_CATALOG_STORE_VERSION = 3; private static final String CATALOG_DRIVER = "com.mysql.jdbc.Driver"; + + public MySQLStore(Configuration conf) throws InternalException { + super(conf); + } + @Override - protected String getCatalogDriverName(){ + protected String getCatalogDriverName() { return CATALOG_DRIVER; } - public MySQLStore(final Configuration conf) throws InternalException { - super(conf); + @Override + protected String getCatalogSchemaPath() { + return "schemas/mysql"; } @Override - public int getDriverVersion() { - return MYSQL_CATALOG_STORE_VERSION; + protected Connection createConnection(Configuration conf) throws SQLException { + return DriverManager.getConnection(getCatalogUri(), this.connectionId, this.connectionPassword); } @Override - public String readSchemaFile(String filename) throws CatalogException { - return super.readSchemaFile("mysql/" + filename); + protected void createDatabaseDependants() throws CatalogException { } } diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql deleted file mode 100644 index 5b8ed26ff6..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/columns.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE COLUMNS ( - TID INT NOT NULL, - COLUMN_NAME VARCHAR(255) BINARY NOT NULL, - ORDINAL_POSITION INT NOT NULL, - NESTED_FIELD_NUM INT NOT NULL, - DATA_TYPE CHAR(16), - TYPE_LENGTH INTEGER, - PRIMARY KEY (TID, ORDINAL_POSITION), - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql deleted file mode 100644 index 2f351cfebd..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/databases.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE DATABASES_ ( - DB_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - DB_NAME VARCHAR(128) BINARY NOT NULL UNIQUE, - SPACE_ID INT NOT NULL, - FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID), - UNIQUE INDEX IDX_NAME (DB_NAME) -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql deleted file mode 100644 index f58b17cdf7..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE TABLE INDEXES ( - DB_ID INT NOT NULL, - TID INT NOT NULL, - INDEX_NAME VARCHAR(128) BINARY NOT NULL, - COLUMN_NAME VARCHAR(128) BINARY NOT NULL, - DATA_TYPE VARCHAR(128) NOT NULL, - INDEX_TYPE CHAR(32) NOT NULL, - IS_UNIQUE BOOLEAN NOT NULL, - IS_CLUSTERED BOOLEAN NOT NULL, - IS_ASCENDING BOOLEAN NOT NULL, - PRIMARY KEY (DB_ID, INDEX_NAME), - FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE, - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE, - UNIQUE INDEX IDX_DB_ID_NAME (DB_ID, INDEX_NAME), - INDEX IDX_TID_COLUMN_NAME (TID, COLUMN_NAME) -) 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 new file mode 100644 index 0000000000..3959177eed --- /dev/null +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql deleted file mode 100644 index 6f2f238158..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_keys.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE PARTITION_KEYS ( - PARTITION_ID INT NOT NULL, - COLUMN_NAME VARCHAR(255) BINARY NOT NULL, - PARTITION_VALUE VARCHAR(255) NOT NULL, - UNIQUE INDEX PARTITION_KEYS_IDX (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE), - FOREIGN KEY (PARTITION_ID) REFERENCES PARTITIONS (PARTITION_ID) ON DELETE CASCADE) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql deleted file mode 100644 index 060c4c8cb0..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partition_methods.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE PARTITION_METHODS ( - TID INT NOT NULL PRIMARY KEY, - PARTITION_TYPE VARCHAR(10) NOT NULL, - EXPRESSION VARCHAR(1024) NOT NULL, - EXPRESSION_SCHEMA VARCHAR(1024) NOT NULL, - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql deleted file mode 100644 index 7b279afb0e..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/partitions.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE PARTITIONS ( - PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - TID INT NOT NULL, - PARTITION_NAME VARCHAR(767) BINARY, - PATH VARCHAR(4096), - UNIQUE INDEX PARTITIONS_IDX (PARTITION_ID, TID, PARTITION_NAME), - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql deleted file mode 100644 index bba8ee7fb0..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/stats.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE STATS ( - TID INT NOT NULL PRIMARY KEY, - NUM_ROWS BIGINT, - NUM_BYTES BIGINT, - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql deleted file mode 100644 index 7ce53627eb..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/table_properties.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE OPTIONS ( - TID INT NOT NULL, - KEY_ VARCHAR(255) BINARY NOT NULL, - VALUE_ VARCHAR(255) NOT NULL, - PRIMARY KEY (TID, KEY_), - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql deleted file mode 100644 index a31f0e3cd6..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tables.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE TABLE TABLES ( - TID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - DB_ID INT NOT NULL, - TABLE_NAME VARCHAR(128) BINARY NOT NULL, - TABLE_TYPE VARCHAR(128) NOT NULL, - PATH VARCHAR(4096), - STORE_TYPE CHAR(16), - FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID), - INDEX IDX_DB_ID (DB_ID), - UNIQUE INDEX IDX_TABLE_ID (DB_ID, TABLE_NAME) -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql deleted file mode 100644 index ab3edaad3a..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/tablespaces.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE TABLESPACES ( - SPACE_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - SPACE_NAME VARCHAR(128) BINARY NOT NULL UNIQUE, - SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS', - SPACE_URI VARCHAR (4096) NOT NULL, - UNIQUE INDEX IDX_NAME (SPACE_NAME) -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql deleted file mode 100644 index 5b8ed26ff6..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/columns.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE COLUMNS ( - TID INT NOT NULL, - COLUMN_NAME VARCHAR(255) BINARY NOT NULL, - ORDINAL_POSITION INT NOT NULL, - NESTED_FIELD_NUM INT NOT NULL, - DATA_TYPE CHAR(16), - TYPE_LENGTH INTEGER, - PRIMARY KEY (TID, ORDINAL_POSITION), - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql deleted file mode 100644 index 2f351cfebd..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/databases.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE DATABASES_ ( - DB_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - DB_NAME VARCHAR(128) BINARY NOT NULL UNIQUE, - SPACE_ID INT NOT NULL, - FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID), - UNIQUE INDEX IDX_NAME (DB_NAME) -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql deleted file mode 100644 index f58b17cdf7..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE TABLE INDEXES ( - DB_ID INT NOT NULL, - TID INT NOT NULL, - INDEX_NAME VARCHAR(128) BINARY NOT NULL, - COLUMN_NAME VARCHAR(128) BINARY NOT NULL, - DATA_TYPE VARCHAR(128) NOT NULL, - INDEX_TYPE CHAR(32) NOT NULL, - IS_UNIQUE BOOLEAN NOT NULL, - IS_CLUSTERED BOOLEAN NOT NULL, - IS_ASCENDING BOOLEAN NOT NULL, - PRIMARY KEY (DB_ID, INDEX_NAME), - FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID) ON DELETE CASCADE, - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE, - UNIQUE INDEX IDX_DB_ID_NAME (DB_ID, INDEX_NAME), - INDEX IDX_TID_COLUMN_NAME (TID, COLUMN_NAME) -) 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 new file mode 100644 index 0000000000..3959177eed --- /dev/null +++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql deleted file mode 100644 index 6f2f238158..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_keys.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE PARTITION_KEYS ( - PARTITION_ID INT NOT NULL, - COLUMN_NAME VARCHAR(255) BINARY NOT NULL, - PARTITION_VALUE VARCHAR(255) NOT NULL, - UNIQUE INDEX PARTITION_KEYS_IDX (PARTITION_ID, COLUMN_NAME, PARTITION_VALUE), - FOREIGN KEY (PARTITION_ID) REFERENCES PARTITIONS (PARTITION_ID) ON DELETE CASCADE) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql deleted file mode 100644 index 060c4c8cb0..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partition_methods.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE PARTITION_METHODS ( - TID INT NOT NULL PRIMARY KEY, - PARTITION_TYPE VARCHAR(10) NOT NULL, - EXPRESSION VARCHAR(1024) NOT NULL, - EXPRESSION_SCHEMA VARCHAR(1024) NOT NULL, - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql deleted file mode 100644 index 7b279afb0e..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/partitions.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE PARTITIONS ( - PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - TID INT NOT NULL, - PARTITION_NAME VARCHAR(767) BINARY, - PATH VARCHAR(4096), - UNIQUE INDEX PARTITIONS_IDX (PARTITION_ID, TID, PARTITION_NAME), - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql deleted file mode 100644 index bba8ee7fb0..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/stats.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE STATS ( - TID INT NOT NULL PRIMARY KEY, - NUM_ROWS BIGINT, - NUM_BYTES BIGINT, - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) \ No newline at end of file diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql deleted file mode 100644 index 7ce53627eb..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/table_properties.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE OPTIONS ( - TID INT NOT NULL, - KEY_ VARCHAR(255) BINARY NOT NULL, - VALUE_ VARCHAR(255) NOT NULL, - PRIMARY KEY (TID, KEY_), - FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql deleted file mode 100644 index 0fe8bf2c72..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tables.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE TABLE TABLES ( - TID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - DB_ID INT NOT NULL, - TABLE_NAME VARCHAR(128) BINARY NOT NULL, - TABLE_TYPE VARCHAR(128) NOT NULL, - PATH VARCHAR(4096) BINARY, - STORE_TYPE CHAR(16), - FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID), - INDEX IDX_DB_ID (DB_ID), - UNIQUE INDEX IDX_TABLE_ID (DB_ID, TABLE_NAME) -) diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql deleted file mode 100644 index 3cfbb40be0..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/tablespaces.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE TABLESPACES ( - SPACE_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - SPACE_NAME VARCHAR(128) BINARY NOT NULL UNIQUE, - SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS', - SPACE_URI VARCHAR (4096) BINARY NOT NULL, - UNIQUE INDEX IDX_NAME (SPACE_NAME) -) 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 c39f9c8df4..a5b1dee8f9 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 @@ -211,10 +211,7 @@ END;]]> - - - - + - - - - - - - + - + From 3009e9d16e9915002a12b8c43153d03ca12503b7 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 1 Apr 2015 21:07:17 +0900 Subject: [PATCH 2/6] Updated partition name size. --- .../src/main/resources/schemas/mariadb/mariadb.xml | 2 +- .../src/main/resources/schemas/mysql/mysql.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3959177eed..fe2e81bf58 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 @@ -132,7 +132,7 @@ CREATE TABLE PARTITIONS ( PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, TID INT NOT NULL, - PARTITION_NAME VARCHAR(767) BINARY, + PARTITION_NAME VARCHAR(255) BINARY, PATH VARCHAR(4096) BINARY, CONSTRAINT CONST_PARTITION_UNIQUE UNIQUE (PARTITION_NAME), FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE 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 3959177eed..fe2e81bf58 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 @@ -132,7 +132,7 @@ CREATE TABLE PARTITIONS ( PARTITION_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY, TID INT NOT NULL, - PARTITION_NAME VARCHAR(767) BINARY, + PARTITION_NAME VARCHAR(255) BINARY, PATH VARCHAR(4096) BINARY, CONSTRAINT CONST_PARTITION_UNIQUE UNIQUE (PARTITION_NAME), FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE From 7a8c01427fc53d4efd6b4ad0c6dfe8b12203024e Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 1 Apr 2015 21:30:45 +0900 Subject: [PATCH 3/6] Remove unnecessary file. --- .../src/main/resources/schemas/common/meta.sql | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql deleted file mode 100644 index 066c5f8b5a..0000000000 --- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/common/meta.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE TABLE META (VERSION INT NOT NULL) \ No newline at end of file From 673d23fbbc0833744021aaab174ab4d5b4aa5456 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 1 Apr 2015 21:32:04 +0900 Subject: [PATCH 4/6] Upgrade MySQL and MariaDB CatalogStore version. --- .../main/java/org/apache/tajo/catalog/store/MariaDBStore.java | 2 +- .../src/main/java/org/apache/tajo/catalog/store/MySQLStore.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java index af86e235d6..2ec1bdd696 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java @@ -32,7 +32,7 @@ public class MariaDBStore extends AbstractDBStore { /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */ /** 2 - First versioning */ - private static final int MARIADB_CATALOG_STORE_VERSION = 3; + private static final int MARIADB_CATALOG_STORE_VERSION = 4; private static final String CATALOG_DRIVER = "org.mariadb.jdbc.Driver"; diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java index 9784209ae4..ddec501bac 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java @@ -36,7 +36,7 @@ public class MySQLStore extends AbstractDBStore { /** * 1- Before 2013-03-20 */ - private static final int MYSQL_CATALOG_STORE_VERSION = 3; + private static final int MYSQL_CATALOG_STORE_VERSION = 4; private static final String CATALOG_DRIVER = "com.mysql.jdbc.Driver"; From b636812bbf024326467dd79f07f7de0dfd9e8a67 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 1 Apr 2015 22:53:38 +0900 Subject: [PATCH 5/6] Added description for catalog version. --- .../main/java/org/apache/tajo/catalog/store/MariaDBStore.java | 3 +++ .../main/java/org/apache/tajo/catalog/store/MySQLStore.java | 1 + 2 files changed, 4 insertions(+) diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java index 2ec1bdd696..53beeb8a34 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java @@ -30,8 +30,11 @@ import java.sql.SQLException; public class MariaDBStore extends AbstractDBStore { + + /** 4 - 2015-03-27: Partition Schema (TAJO-1284) */ /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */ /** 2 - First versioning */ + private static final int MARIADB_CATALOG_STORE_VERSION = 4; private static final String CATALOG_DRIVER = "org.mariadb.jdbc.Driver"; diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java index ddec501bac..1b4ccf5490 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java @@ -31,6 +31,7 @@ public class MySQLStore extends AbstractDBStore { + /** 4 - 2015-03-27: Partition Schema (TAJO-1284) */ /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */ /** 2 - 2014-06-09: First versioning */ /** From 417cc90ccca06d8c11513535690545013e214c53 Mon Sep 17 00:00:00 2001 From: JaeHwa Jung Date: Wed, 1 Apr 2015 23:21:17 +0900 Subject: [PATCH 6/6] Fixed wrong catalog base version. --- .../apache/tajo/catalog/store/MariaDBStore.java | 7 ------- .../org/apache/tajo/catalog/store/MySQLStore.java | 9 --------- .../src/main/resources/schemas/derby/derby.xml | 14 ++++++++------ .../src/main/resources/schemas/mariadb/mariadb.xml | 10 ++++++++-- .../src/main/resources/schemas/mysql/mysql.xml | 10 ++++++++-- .../src/main/resources/schemas/oracle/oracle.xml | 14 ++++++++------ .../resources/schemas/postgresql/postgresql.xml | 14 ++++++++------ 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java index 53beeb8a34..cb661accf6 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MariaDBStore.java @@ -30,13 +30,6 @@ import java.sql.SQLException; public class MariaDBStore extends AbstractDBStore { - - /** 4 - 2015-03-27: Partition Schema (TAJO-1284) */ - /** 3 - 2015-03-12: Nested Schema (TAJO-1329) */ - /** 2 - First versioning */ - - private static final int MARIADB_CATALOG_STORE_VERSION = 4; - private static final String CATALOG_DRIVER = "org.mariadb.jdbc.Driver"; public MariaDBStore(Configuration conf) throws InternalException { diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java index 1b4ccf5490..d6e902a4f2 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MySQLStore.java @@ -30,15 +30,6 @@ import java.sql.SQLException; public class MySQLStore extends AbstractDBStore { - - /** 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 - */ - private static final int MYSQL_CATALOG_STORE_VERSION = 4; - private static final String CATALOG_DRIVER = "com.mysql.jdbc.Driver"; public MySQLStore(Configuration conf) throws InternalException { 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 1e60d151eb..5f4350766d 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 @@ -17,12 +17,14 @@ limitations under the License. --> - - - - - - + + 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 fe2e81bf58..416807dabb 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 @@ -17,8 +17,14 @@ limitations under the License. --> - - + + 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 fe2e81bf58..72265d335a 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 @@ -17,8 +17,14 @@ limitations under the License. --> - - + + 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 a5b1dee8f9..966919f4f3 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 @@ -17,12 +17,14 @@ limitations under the License. --> - - - - - - + + - - - - - - + +