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/mariadb/indexes.sql
tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql
tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/a805c4ca
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/a805c4ca
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/a805c4ca
Branch: refs/heads/index_support
Commit: a805c4cacfa2c2e6c2a35ef0c9bebea98cbe07a4
Parents: a72ef4a e22c1c5
Author: Jihoon Son <[email protected]>
Authored: Wed Jan 21 13:27:46 2015 +0900
Committer: Jihoon Son <[email protected]>
Committed: Wed Jan 21 13:27:46 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 ++
.../main/resources/schemas/mariadb/columns.sql | 4 +-
.../resources/schemas/mariadb/databases.sql | 4 +-
.../main/resources/schemas/mariadb/indexes.sql | 2 +-
.../resources/schemas/mariadb/partitions.sql | 4 +-
.../schemas/mariadb/table_properties.sql | 4 +-
.../main/resources/schemas/mariadb/tables.sql | 4 +-
.../resources/schemas/mariadb/tablespaces.sql | 4 +-
.../main/resources/schemas/mysql/columns.sql | 4 +-
.../main/resources/schemas/mysql/databases.sql | 4 +-
.../main/resources/schemas/mysql/indexes.sql | 2 +-
.../main/resources/schemas/mysql/partitions.sql | 4 +-
.../schemas/mysql/table_properties.sql | 4 +-
.../src/main/resources/schemas/mysql/tables.sql | 6 +--
.../resources/schemas/mysql/tablespaces.sql | 6 +--
.../org/apache/tajo/catalog/TestCatalog.java | 52 ++++++++++++++++++++
16 files changed, 83 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/a805c4ca/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql
----------------------------------------------------------------------
diff --cc
tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/indexes.sql
index 9c7f8ba,f58b17c..5fdcba9
---
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
@@@ -1,17 -1,14 +1,17 @@@
CREATE TABLE INDEXES (
+ INDEX_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
DB_ID INT NOT NULL,
TID INT NOT NULL,
- INDEX_NAME VARCHAR(128) 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,
+ PATH VARCHAR(4096) NOT NULL,
+ COLUMN_NAMES VARCHAR(256) NOT NULL, -- array of column names
+ DATA_TYPES VARCHAR(128) NOT NULL, -- array of column types
+ ORDERS VARCHAR(128) NOT NULL, -- array of column orders
+ NULL_ORDERS VARCHAR(128) NOT NULL, -- array of null orderings
IS_UNIQUE BOOLEAN NOT NULL,
IS_CLUSTERED BOOLEAN NOT NULL,
- IS_ASCENDING BOOLEAN NOT NULL,
- PRIMARY KEY (DB_ID, INDEX_NAME),
+ PRIMARY KEY (INDEX_ID),
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),
http://git-wip-us.apache.org/repos/asf/tajo/blob/a805c4ca/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql
----------------------------------------------------------------------
diff --cc
tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/indexes.sql
index 9c7f8ba,f58b17c..5fdcba9
---
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
@@@ -1,17 -1,14 +1,17 @@@
CREATE TABLE INDEXES (
+ INDEX_ID INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
DB_ID INT NOT NULL,
TID INT NOT NULL,
- INDEX_NAME VARCHAR(128) 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,
+ PATH VARCHAR(4096) NOT NULL,
+ COLUMN_NAMES VARCHAR(256) NOT NULL, -- array of column names
+ DATA_TYPES VARCHAR(128) NOT NULL, -- array of column types
+ ORDERS VARCHAR(128) NOT NULL, -- array of column orders
+ NULL_ORDERS VARCHAR(128) NOT NULL, -- array of null orderings
IS_UNIQUE BOOLEAN NOT NULL,
IS_CLUSTERED BOOLEAN NOT NULL,
- IS_ASCENDING BOOLEAN NOT NULL,
- PRIMARY KEY (DB_ID, INDEX_NAME),
+ PRIMARY KEY (INDEX_ID),
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),
http://git-wip-us.apache.org/repos/asf/tajo/blob/a805c4ca/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
----------------------------------------------------------------------
