commit 9d91675424d00e71b252915d3b4272500f7e8be4 Author: Vihang Karajgaonkar Date: Mon Jun 11 11:25:07 2018 -0700 HIVE-19605 : TAB_COL_STATS table has no index on db/table name (Vihang Karajgaonkar reviewed by Yongzhi Chen) diff --git a/metastore/scripts/upgrade/derby/042-HIVE-19605.derby.sql b/metastore/scripts/upgrade/derby/042-HIVE-19605.derby.sql new file mode 100644 index 0000000000000000000000000000000000000000..b2f458e2666db68222b10f1122a02c550b37db3b --- /dev/null +++ b/metastore/scripts/upgrade/derby/042-HIVE-19605.derby.sql @@ -0,0 +1 @@ +CREATE INDEX "APP"."TAB_COL_STATS_IDX" ON "APP"."TAB_COL_STATS" ("CAT_NAME", "DB_NAME", "TABLE_NAME", "COLUMN_NAME"); diff --git a/metastore/scripts/upgrade/derby/hive-schema-2.4.0.derby.sql b/metastore/scripts/upgrade/derby/hive-schema-2.4.0.derby.sql index f30b5b43622f008b7f2eebcbd2bda19f491096fc..b548ce270deb060abffcd69bdde78026aedebb29 100644 --- a/metastore/scripts/upgrade/derby/hive-schema-2.4.0.derby.sql +++ b/metastore/scripts/upgrade/derby/hive-schema-2.4.0.derby.sql @@ -124,6 +124,8 @@ CREATE UNIQUE INDEX "APP"."DBPRIVILEGEINDEX" ON "APP"."DB_PRIVS" ("DB_ID", "PRIN CREATE INDEX "APP"."PCS_STATS_IDX" ON "APP"."PART_COL_STATS" ("DB_NAME","TABLE_NAME","COLUMN_NAME","PARTITION_NAME"); +CREATE INDEX "APP"."TAB_COL_STATS_IDX" ON "APP"."TAB_COL_STATS" ("CAT_NAME", "DB_NAME", "TABLE_NAME", "COLUMN_NAME"); + CREATE INDEX "APP"."PARTPRIVILEGEINDEX" ON "APP"."PART_PRIVS" ("PART_ID", "PRINCIPAL_NAME", "PRINCIPAL_TYPE", "PART_PRIV", "GRANTOR", "GRANTOR_TYPE"); CREATE UNIQUE INDEX "APP"."ROLEENTITYINDEX" ON "APP"."ROLES" ("ROLE_NAME"); diff --git a/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-2.4.0.derby.sql b/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-2.4.0.derby.sql index 58dde50e6e7cc443703ce01aac92e3710ac18217..336ae622014818a1f621dfe17723d3c7e9bd17cd 100644 --- a/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-2.4.0.derby.sql +++ b/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-2.4.0.derby.sql @@ -1,5 +1,6 @@ -- Upgrade MetaStore schema from 2.3.0 to 2.4.0 RUN '041-HIVE-19372.derby.sql'; +RUN '042-HIVE-19605.derby.sql'; UPDATE "APP".VERSION SET SCHEMA_VERSION='2.4.0', VERSION_COMMENT='Hive release version 2.4.0' where VER_ID=1; diff --git a/metastore/scripts/upgrade/mssql/027-HIVE-19605.mssql.sql b/metastore/scripts/upgrade/mssql/027-HIVE-19605.mssql.sql new file mode 100644 index 0000000000000000000000000000000000000000..149a44500d02b1a6ef47918b198d9c67f0f9996d --- /dev/null +++ b/metastore/scripts/upgrade/mssql/027-HIVE-19605.mssql.sql @@ -0,0 +1 @@ +CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME); diff --git a/metastore/scripts/upgrade/mssql/hive-schema-2.4.0.mssql.sql b/metastore/scripts/upgrade/mssql/hive-schema-2.4.0.mssql.sql index c6c733e800bb5062d15fb6676f7ad78de55f3277..7892777a574f40c9cf85fd1527c9f18a2128a155 100644 --- a/metastore/scripts/upgrade/mssql/hive-schema-2.4.0.mssql.sql +++ b/metastore/scripts/upgrade/mssql/hive-schema-2.4.0.mssql.sql @@ -238,6 +238,7 @@ CREATE TABLE TAB_COL_STATS ); ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_PK PRIMARY KEY (CS_ID); +CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME); -- Table TYPES for classes [org.apache.hadoop.hive.metastore.model.MType] CREATE TABLE TYPES diff --git a/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-2.4.0.mssql.sql b/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-2.4.0.mssql.sql index b3cceea1c8a3c81ec6dde6374bebef41e07bec37..339f78ea0c9b86d2c448b0133c6c34f61a28005e 100644 --- a/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-2.4.0.mssql.sql +++ b/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-2.4.0.mssql.sql @@ -1,6 +1,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 2.4.0' AS MESSAGE; :r 026-HIVE-19372.mssql.sql +:r 027-HIVE-19605.mssql.sql UPDATE VERSION SET SCHEMA_VERSION='2.4.0', VERSION_COMMENT='Hive release version 2.4.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 2.4.0' AS MESSAGE; diff --git a/metastore/scripts/upgrade/mysql/042-HIVE-19605.mysql.sql b/metastore/scripts/upgrade/mysql/042-HIVE-19605.mysql.sql new file mode 100644 index 0000000000000000000000000000000000000000..7a1b5a869f19f6734830a450a1704a7676f1ea44 --- /dev/null +++ b/metastore/scripts/upgrade/mysql/042-HIVE-19605.mysql.sql @@ -0,0 +1 @@ +CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME) USING BTREE; diff --git a/metastore/scripts/upgrade/mysql/hive-schema-2.4.0.mysql.sql b/metastore/scripts/upgrade/mysql/hive-schema-2.4.0.mysql.sql index 7aed5a86e1b937128084d0411ac8696d090556d4..6c67d0b1bda8770605ef45b1d41b0be4cea4cf03 100644 --- a/metastore/scripts/upgrade/mysql/hive-schema-2.4.0.mysql.sql +++ b/metastore/scripts/upgrade/mysql/hive-schema-2.4.0.mysql.sql @@ -672,6 +672,8 @@ CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( CONSTRAINT `TAB_COL_STATS_FK` FOREIGN KEY (`TBL_ID`) REFERENCES `TBLS` (`TBL_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME) USING BTREE; + -- -- Table structure for table `PART_COL_STATS` -- diff --git a/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-2.4.0.mysql.sql b/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-2.4.0.mysql.sql index d85b30b42bba5ad82df645268b5862ff44b47d20..2db0a4a4c9549cb670a12e11dbe3c2f724c65120 100644 --- a/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-2.4.0.mysql.sql +++ b/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-2.4.0.mysql.sql @@ -1,6 +1,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 2.4.0' AS ' '; SOURCE 041-HIVE-19372.mysql.sql; +SOURCE 042-HIVE-19605.mysql.sql; UPDATE VERSION SET SCHEMA_VERSION='2.4.0', VERSION_COMMENT='Hive release version 2.4.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 2.4.0' AS ' '; diff --git a/metastore/scripts/upgrade/oracle/042-HIVE-19605.oracle.sql b/metastore/scripts/upgrade/oracle/042-HIVE-19605.oracle.sql new file mode 100644 index 0000000000000000000000000000000000000000..149a44500d02b1a6ef47918b198d9c67f0f9996d --- /dev/null +++ b/metastore/scripts/upgrade/oracle/042-HIVE-19605.oracle.sql @@ -0,0 +1 @@ +CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME); diff --git a/metastore/scripts/upgrade/oracle/hive-schema-2.4.0.oracle.sql b/metastore/scripts/upgrade/oracle/hive-schema-2.4.0.oracle.sql index 94d12215b9e1324e8d5c94dd128331fa8ec734a4..3554fc44bdae62d507ddd8427a5438e6315ce63b 100644 --- a/metastore/scripts/upgrade/oracle/hive-schema-2.4.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/hive-schema-2.4.0.oracle.sql @@ -500,6 +500,8 @@ ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_FK FOREIGN KEY (TBL_ID) R CREATE INDEX TAB_COL_STATS_N49 ON TAB_COL_STATS(TBL_ID); +CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME); + CREATE TABLE PART_COL_STATS ( CS_ID NUMBER NOT NULL, DB_NAME VARCHAR2(128) NOT NULL, diff --git a/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-2.4.0.oracle.sql b/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-2.4.0.oracle.sql index 3b4e273861f0aba716816f61f6cccf62854933f4..5a5d8b042147b68d49bc05711dbdb042c752d39e 100644 --- a/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-2.4.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-2.4.0.oracle.sql @@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 2.4.0' AS Status from dual; @040-HIVE-16399.oracle.sql; @041-HIVE-19372.oracle.sql; +@042-HIVE-19605.oracle.sql; UPDATE VERSION SET SCHEMA_VERSION='2.4.0', VERSION_COMMENT='Hive release version 2.4.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 2.4.0' AS Status from dual; diff --git a/metastore/scripts/upgrade/postgres/041-HIVE-19605.postgres.sql b/metastore/scripts/upgrade/postgres/041-HIVE-19605.postgres.sql new file mode 100644 index 0000000000000000000000000000000000000000..371d0f0440e2865fe7b805a82986185be12c7bb9 --- /dev/null +++ b/metastore/scripts/upgrade/postgres/041-HIVE-19605.postgres.sql @@ -0,0 +1 @@ +CREATE INDEX "TAB_COL_STATS_IDX" ON "TAB_COL_STATS" USING btree ("CAT_NAME", "DB_NAME","TABLE_NAME","COLUMN_NAME"); diff --git a/metastore/scripts/upgrade/postgres/hive-schema-2.4.0.postgres.sql b/metastore/scripts/upgrade/postgres/hive-schema-2.4.0.postgres.sql index ffa29cf074523b78b23c77a1350e9236511e62ce..4866788526c841aac5b5abfd21eb06b96ff1a79c 100644 --- a/metastore/scripts/upgrade/postgres/hive-schema-2.4.0.postgres.sql +++ b/metastore/scripts/upgrade/postgres/hive-schema-2.4.0.postgres.sql @@ -1175,6 +1175,12 @@ CREATE INDEX "TYPE_FIELDS_N49" ON "TYPE_FIELDS" USING btree ("TYPE_NAME"); CREATE INDEX "TAB_COL_STATS_N49" ON "TAB_COL_STATS" USING btree ("TBL_ID"); -- +-- Name: TAB_COL_STATS_IDX; Type: INDEX; Schema: public; Owner: hiveuser; Tablespace: +-- + +CREATE INDEX "TAB_COL_STATS_IDX" ON "TAB_COL_STATS" USING btree ("CAT_NAME", "DB_NAME","TABLE_NAME","COLUMN_NAME"); + +-- -- Name: PART_COL_STATS_N49; Type: INDEX; Schema: public; Owner: hiveuser; Tablespace: -- diff --git a/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-2.4.0.postgres.sql b/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-2.4.0.postgres.sql index 1b2a52aea2ea6692178e7e9bb3347582e8c9c99e..b74e6e034291cb07d8605635989d3c4cbabbe58c 100644 --- a/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-2.4.0.postgres.sql +++ b/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-2.4.0.postgres.sql @@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 2.4.0'; \i 039-HIVE-16399.postgres.sql; \i 040-HIVE-19372.postgres.sql; +\i 041-HIVE-19605.postgres.sql; UPDATE "VERSION" SET "SCHEMA_VERSION"='2.4.0', "VERSION_COMMENT"='Hive release version 2.4.0' where "VER_ID"=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 2.4.0';