You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/03/12 15:28:40 UTC

tajo git commit: TAJO-1395: Remove deprecated sql files for Oracle and PostgreSQL

Repository: tajo
Updated Branches:
  refs/heads/master 4a9da73c6 -> 6defbda96


TAJO-1395: Remove deprecated sql files for Oracle and PostgreSQL

Closes #415


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

Branch: refs/heads/master
Commit: 6defbda966912ee2dd42197c2a82e94439b25bd8
Parents: 4a9da73
Author: Jihun Kang <ji...@apache.org>
Authored: Thu Mar 12 23:27:58 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Thu Mar 12 23:27:58 2015 +0900

----------------------------------------------------------------------
 CHANGES                                               |  2 ++
 .../src/main/resources/schemas/oracle/columns.sql     |  9 ---------
 .../src/main/resources/schemas/oracle/databases.sql   |  6 ------
 .../src/main/resources/schemas/oracle/indexes.sql     | 14 --------------
 .../resources/schemas/oracle/partition_methods.sql    |  7 -------
 .../src/main/resources/schemas/oracle/partitions.sql  | 10 ----------
 .../src/main/resources/schemas/oracle/stats.sql       |  6 ------
 .../resources/schemas/oracle/table_properties.sql     |  7 -------
 .../src/main/resources/schemas/oracle/tables.sql      |  9 ---------
 .../src/main/resources/schemas/oracle/tablespaces.sql |  6 ------
 .../src/main/resources/schemas/postgresql/columns.sql |  9 ---------
 .../main/resources/schemas/postgresql/databases.sql   |  6 ------
 .../schemas/postgresql/partition_methods.sql          |  7 -------
 .../main/resources/schemas/postgresql/partitions.sql  | 10 ----------
 .../resources/schemas/postgresql/table_properties.sql |  7 -------
 .../src/main/resources/schemas/postgresql/tables.sql  |  9 ---------
 .../main/resources/schemas/postgresql/tablespaces.sql |  6 ------
 17 files changed, 2 insertions(+), 128 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 39f0fc4..6854b4f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,8 @@ Release 0.11.0 - unreleased
 
   IMPROVEMENT
 
+    TAJO-1395: Remove deprecated sql files for Oracle and PostgreSQL. (jihun)
+
     TAJO-1394: Support reconnect on tsql. 
     (Contributed by navis, Committed by hyunsik)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/columns.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/columns.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/columns.sql
deleted file mode 100644
index 71943c0..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/columns.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE COLUMNS (
-  TID INT NOT NULL,
-  COLUMN_NAME VARCHAR2(255) NOT NULL,
-  ORDINAL_POSITION INT NOT NULL,
-  DATA_TYPE CHAR(16),
-  TYPE_LENGTH INTEGER,
-  CONSTRAINT COLUMNS_PKEY PRIMARY KEY (TID, COLUMN_NAME),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/databases.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/databases.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/databases.sql
deleted file mode 100644
index 33d82d8..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/databases.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE DATABASES_ (
-  DB_ID NUMBER(10) NOT NULL PRIMARY KEY,
-  DB_NAME VARCHAR2(128) NOT NULL UNIQUE,
-  SPACE_ID INT NOT NULL,
-  FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/indexes.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/indexes.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/indexes.sql
deleted file mode 100644
index ae31d6f..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/indexes.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE INDEXES (
-  DB_ID INT NOT NULL,
-  TID INT NOT NULL,
-  INDEX_NAME VARCHAR2(128) NOT NULL,
-  COLUMN_NAME VARCHAR2(128) NOT NULL,
-  DATA_TYPE VARCHAR2(128) NOT NULL,
-  INDEX_TYPE CHAR(32) NOT NULL,
-  IS_UNIQUE CHAR NOT NULL,
-  IS_CLUSTERED CHAR NOT NULL,
-  IS_ASCENDING CHAR NOT NULL,
-  CONSTRAINT INDEXES_PKEY 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
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partition_methods.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partition_methods.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partition_methods.sql
deleted file mode 100644
index 7d37a6e..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partition_methods.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE PARTITION_METHODS (
-  TID INT NOT NULL PRIMARY KEY,
-  PARTITION_TYPE VARCHAR2(10) NOT NULL,
-  EXPRESSION VARCHAR2(1024) NOT NULL,
-  EXPRESSION_SCHEMA RAW(1024) NOT NULL,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partitions.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partitions.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partitions.sql
deleted file mode 100644
index 2fee267..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/partitions.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE PARTITIONS (
-  PID INT NOT NULL PRIMARY KEY,
-  TID INT NOT NULL,
-  PARTITION_NAME VARCHAR2(128),
-  ORDINAL_POSITION INT NOT NULL,
-  PARTITION_VALUE VARCHAR2(1024),
-  PATH VARCHAR2(4000),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
-  CONSTRAINT C_PARTITION_UNIQUE UNIQUE (TID, PARTITION_NAME)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/stats.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/stats.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/stats.sql
deleted file mode 100644
index d7091b4..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/stats.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE STATS (
-  TID INT NOT NULL PRIMARY KEY,
-  NUM_ROWS NUMBER(38),
-  NUM_BYTES NUMBER(38),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/table_properties.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/table_properties.sql
deleted file mode 100644
index 130402c..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/table_properties.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE OPTIONS (
-  TID INT NOT NULL,
-  KEY_ VARCHAR2(255) NOT NULL,
-  VALUE_ VARCHAR2(255) NOT NULL,
-  CONSTRAINT OPTIONS_PKEY PRIMARY KEY (TID, KEY_),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tables.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tables.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tables.sql
deleted file mode 100644
index 36f8067..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tables.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE TABLES (
-  TID NUMBER(10) NOT NULL PRIMARY KEY,
-  DB_ID INT NOT NULL,
-  TABLE_NAME VARCHAR2(128) NOT NULL,
-  TABLE_TYPE VARCHAR2(128) NOT NULL,
-  PATH VARCHAR2(4000),
-  STORE_TYPE CHAR(16),
-  FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tablespaces.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tablespaces.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tablespaces.sql
deleted file mode 100644
index 461e77c..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/tablespaces.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE TABLESPACES (
-  SPACE_ID NUMBER(10) NOT NULL PRIMARY KEY,
-  SPACE_NAME VARCHAR2(128) NOT NULL UNIQUE,
-  SPACE_HANDLER VARCHAR2(1024) DEFAULT 'HDFS',
-  SPACE_URI VARCHAR2(4000) NOT NULL
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/columns.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/columns.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/columns.sql
deleted file mode 100644
index 425be96..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/columns.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE COLUMNS (
-  TID INT NOT NULL,
-  COLUMN_NAME VARCHAR(255) NOT NULL,
-  ORDINAL_POSITION INT NOT NULL,
-  DATA_TYPE CHAR(16),
-  TYPE_LENGTH INTEGER,
-  CONSTRAINT COLUMNS_PKEY PRIMARY KEY (TID, COLUMN_NAME),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/databases.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/databases.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/databases.sql
deleted file mode 100644
index 8232884..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/databases.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE DATABASES_ (
-  DB_ID SERIAL NOT NULL PRIMARY KEY,
-  DB_NAME VARCHAR(128) NOT NULL UNIQUE,
-  SPACE_ID INT NOT NULL,
-  FOREIGN KEY (SPACE_ID) REFERENCES TABLESPACES (SPACE_ID)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partition_methods.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partition_methods.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partition_methods.sql
deleted file mode 100644
index 55289ae..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/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 BYTEA NOT NULL,
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partitions.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partitions.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partitions.sql
deleted file mode 100644
index d46a59a..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/partitions.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE PARTITIONS (
-  PID INT NOT NULL PRIMARY KEY,
-  TID INT NOT NULL,
-  PARTITION_NAME VARCHAR(128),
-  ORDINAL_POSITION INT NOT NULL,
-  PARTITION_VALUE VARCHAR(1024),
-  PATH VARCHAR(4096),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE,
-  CONSTRAINT C_PARTITION_UNIQUE UNIQUE (TID, PARTITION_NAME)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/table_properties.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/table_properties.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/table_properties.sql
deleted file mode 100644
index 57aa316..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/table_properties.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE OPTIONS (
-  TID INT NOT NULL,
-  KEY_ VARCHAR(255) NOT NULL,
-  VALUE_ VARCHAR(255) NOT NULL,
-  CONSTRAINT OPTIONS_PKEY PRIMARY KEY (TID, KEY_),
-  FOREIGN KEY (TID) REFERENCES TABLES (TID) ON DELETE CASCADE
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tables.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tables.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tables.sql
deleted file mode 100644
index d87264a..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tables.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE TABLES (
-  TID SERIAL NOT NULL PRIMARY KEY,
-  DB_ID INT NOT NULL,
-  TABLE_NAME VARCHAR(128) NOT NULL,
-  TABLE_TYPE VARCHAR(128) NOT NULL,
-  PATH VARCHAR(4096),
-  STORE_TYPE CHAR(16),
-  FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID)
-)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/6defbda9/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tablespaces.sql
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tablespaces.sql b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tablespaces.sql
deleted file mode 100644
index 65a366d..0000000
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/tablespaces.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE TABLESPACES (
-  SPACE_ID SERIAL NOT NULL PRIMARY KEY,
-  SPACE_NAME VARCHAR(128) NOT NULL UNIQUE,
-  SPACE_HANDLER VARCHAR (1024) DEFAULT 'HDFS',
-  SPACE_URI VARCHAR (4096) NOT NULL
-)
\ No newline at end of file