diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java index da5dd61d08..4ea9ce2443 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java @@ -174,6 +174,10 @@ public static synchronized void prepDb(Configuration conf) throws Exception { " CC_META_INFO varchar(2048) for bit data," + " CC_HADOOP_JOB_ID varchar(32))"); + stmt.execute("CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE)"); + stmt.execute("CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (" + + "CC_DATABASE,CC_TABLE,CC_PARTITION)"); + stmt.execute("CREATE TABLE AUX_TABLE (" + " MT_KEY1 varchar(128) NOT NULL," + " MT_KEY2 bigint NOT NULL," + diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql index 6710271886..f1a77855e4 100644 --- a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql +++ b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql @@ -612,6 +612,9 @@ CREATE TABLE COMPLETED_COMPACTIONS ( CC_HADOOP_JOB_ID varchar(32) ); +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + CREATE TABLE AUX_TABLE ( MT_KEY1 varchar(128) NOT NULL, MT_KEY2 bigint NOT NULL, diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql index ae0a32541a..6ae13ad229 100644 --- a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql +++ b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0.derby.sql @@ -48,6 +48,9 @@ CREATE INDEX LASTUPDATETIMEINDEX ON APP.SCHEDULED_EXECUTIONS (LAST_UPDATE_TIME); CREATE INDEX SCHEDULED_EXECUTIONS_SCHQID ON APP.SCHEDULED_EXECUTIONS (SCHEDULED_QUERY_ID); CREATE UNIQUE INDEX SCHEDULED_EXECUTIONS_UNIQUE_ID ON APP.SCHEDULED_EXECUTIONS (SCHEDULED_EXECUTION_ID); +-- HIVE-21487 +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + -- This needs to be the last thing done. Insert any changes above this line. UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1; - diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql index 221d4f1fff..de73d343e7 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql @@ -1039,6 +1039,9 @@ PRIMARY KEY CLUSTERED ) ); +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + CREATE TABLE COMPLETED_TXN_COMPONENTS( CTC_TXNID bigint NOT NULL, CTC_DATABASE nvarchar(128) NOT NULL, @@ -1049,6 +1052,7 @@ CREATE TABLE COMPLETED_TXN_COMPONENTS( CTC_UPDATE_DELETE char(1) NOT NULL ); + CREATE INDEX COMPLETED_TXN_COMPONENTS_IDX ON COMPLETED_TXN_COMPONENTS (CTC_DATABASE, CTC_TABLE, CTC_PARTITION); CREATE TABLE HIVE_LOCKS( diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql index bc98d5fc4a..3942fef57a 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql @@ -22,7 +22,10 @@ UPDATE TAB_COL_STATS SET ENGINE = 'hive' WHERE ENGINE IS NULL; ALTER TABLE PART_COL_STATS ADD ENGINE nvarchar(128); UPDATE PART_COL_STATS SET ENGINE = 'hive' WHERE ENGINE IS NULL; +-- HIVE-21487 +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE; - diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql index dd761a66db..b0ee101f13 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql @@ -1090,6 +1090,9 @@ CREATE TABLE COMPLETED_COMPACTIONS ( CC_HADOOP_JOB_ID varchar(32) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( NCQ_NEXT bigint NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql index 6a040a6a64..2d9a25316d 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql @@ -52,7 +52,10 @@ CREATE INDEX IDX_SCHEDULED_EXECUTIONS_LAST_UPDATE_TIME ON SCHEDULED_EXECUTIONS ( CREATE INDEX IDX_SCHEDULED_EXECUTIONS_SCHEDULED_QUERY_ID ON SCHEDULED_EXECUTIONS (SCHEDULED_QUERY_ID); CREATE UNIQUE INDEX UNIQUE_SCHEDULED_EXECUTIONS_ID ON SCHEDULED_EXECUTIONS (SCHEDULED_EXECUTION_ID); +-- HIVE-21487 +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE; - diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql index f5ec1ba1af..7073c92694 100644 --- a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql +++ b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql @@ -1076,6 +1076,9 @@ CREATE TABLE COMPLETED_COMPACTIONS ( CC_HADOOP_JOB_ID varchar2(32) ) ROWDEPENDENCIES; +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + CREATE TABLE AUX_TABLE ( MT_KEY1 varchar2(128) NOT NULL, MT_KEY2 number(19) NOT NULL, diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql index c7738be273..777a996ddb 100644 --- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql +++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql @@ -52,6 +52,10 @@ CREATE TABLE "SCHEDULED_EXECUTIONS" ( CREATE INDEX IDX_SCHEDULED_EX_LAST_UPDATE ON "SCHEDULED_EXECUTIONS" ("LAST_UPDATE_TIME"); CREATE INDEX IDX_SCHEDULED_EX_SQ_ID ON "SCHEDULED_EXECUTIONS" ("SCHEDULED_QUERY_ID"); +-- HIVE-21487 +CREATE INDEX COMPACTION_QUEUE_STATE ON COMPACTION_QUEUE (CQ_STATE); +CREATE INDEX COMPLETED_COMPACTIONS_RESOURCES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_TABLE,CC_PARTITION); + -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS Status from dual; diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql index 455f98b725..9fede6aaf3 100644 --- a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql +++ b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql @@ -1762,6 +1762,9 @@ CREATE TABLE "COMPLETED_COMPACTIONS" ( "CC_HADOOP_JOB_ID" varchar(32) ); +CREATE INDEX "COMPACTION_QUEUE_STATE" ON "COMPACTION_QUEUE" ("CQ_STATE"); +CREATE INDEX "COMPLETED_COMPACTIONS_RESOURCES" ON "COMPLETED_COMPACTIONS" ("CC_DATABASE","CC_TABLE","CC_PARTITION"); + CREATE TABLE "AUX_TABLE" ( "MT_KEY1" varchar(128) NOT NULL, "MT_KEY2" bigint NOT NULL, diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql index 5c39b0d9f4..8b50b3d20f 100644 --- a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql +++ b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0.postgres.sql @@ -183,6 +183,9 @@ ALTER TABLE "WRITE_SET" RENAME COLUMN ws_txnid TO "WS_TXNID"; ALTER TABLE "WRITE_SET" RENAME COLUMN ws_commit_id TO "WS_COMMIT_ID"; ALTER TABLE "WRITE_SET" RENAME COLUMN ws_operation_type TO "WS_OPERATION_TYPE"; +-- HIVE-21487 +CREATE INDEX "COMPACTION_QUEUE_STATE" ON "COMPACTION_QUEUE" ("CQ_STATE"); +CREATE INDEX "COMPLETED_COMPACTIONS_RESOURCES" ON "COMPLETED_COMPACTIONS" ("CC_DATABASE","CC_TABLE","CC_PARTITION"); -- These lines need to be last. Insert any changes above. UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0', "VERSION_COMMENT"='Hive release version 4.0.0' where "VER_ID"=1;