This is an automated email from the ASF dual-hosted git repository.
ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new f27320eb3f3 HIVE-24815: Remove IDXS Table from Metastore Schema (#4370)
f27320eb3f3 is described below
commit f27320eb3f394f939b693d960b1eb619289671b9
Author: rtrivedi12 <[email protected]>
AuthorDate: Fri Nov 3 05:21:08 2023 +0530
HIVE-24815: Remove IDXS Table from Metastore Schema (#4370)
* HIVE-24815: Remove IDXS Table from Metastore Schema
---
.../apache/hadoop/hive/metastore/model/MIndex.java | 200 ---------------------
.../tools/schematool/SchemaToolTaskValidate.java | 1 -
.../src/main/resources/package.jdo | 47 -----
.../sql/derby/hive-schema-4.0.0-beta-2.derby.sql | 19 --
.../upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql | 4 +
.../sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql | 49 -----
.../upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql | 4 +
.../sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql | 43 -----
.../upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql | 4 +
.../sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql | 50 ------
...upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql | 5 +
.../postgres/hive-schema-4.0.0-beta-2.postgres.sql | 112 ------------
...grade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql | 5 +
13 files changed, 22 insertions(+), 521 deletions(-)
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java
deleted file mode 100644
index 1d679619d03..00000000000
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MIndex.java
+++ /dev/null
@@ -1,200 +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.hadoop.hive.metastore.model;
-
-import java.util.Map;
-
-/**
- * Represents hive's index definition.
- */
-public class MIndex {
-
- private String indexName;
- private MTable origTable;
- private int createTime;
- private int lastAccessTime;
- private Map<String, String> parameters;
- private MTable indexTable;
- private MStorageDescriptor sd;
- private String indexHandlerClass;
- private boolean deferredRebuild;
-
- public MIndex() {}
-
-/**
- * @param indexName
- * @param baseTable
- * @param createTime
- * @param lastAccessTime
- * @param parameters
- * @param indexTable
- * @param sd
- * @param indexHandlerClass
- * @param deferredRebuild
- */
- public MIndex(String indexName, MTable baseTable, int createTime,
- int lastAccessTime, Map<String, String> parameters, MTable indexTable,
- MStorageDescriptor sd, String indexHandlerClass, boolean
deferredRebuild) {
- super();
- this.indexName = indexName;
- this.origTable = baseTable;
- this.createTime = createTime;
- this.lastAccessTime = lastAccessTime;
- this.parameters = parameters;
- this.indexTable = indexTable;
- this.sd = sd;
- this.indexHandlerClass = indexHandlerClass;
- this.deferredRebuild = deferredRebuild;
- }
-
-
-
- /**
- * @return index name
- */
- public String getIndexName() {
- return indexName;
- }
-
- /**
- * @param indexName index name
- */
- public void setIndexName(String indexName) {
- this.indexName = indexName;
- }
-
- /**
- * @return create time
- */
- public int getCreateTime() {
- return createTime;
- }
-
- /**
- * @param createTime create time
- */
- public void setCreateTime(int createTime) {
- this.createTime = createTime;
- }
-
- /**
- * @return last access time
- */
- public int getLastAccessTime() {
- return lastAccessTime;
- }
-
- /**
- * @param lastAccessTime last access time
- */
- public void setLastAccessTime(int lastAccessTime) {
- this.lastAccessTime = lastAccessTime;
- }
-
- /**
- * @return parameters
- */
- public Map<String, String> getParameters() {
- return parameters;
- }
-
- /**
- * @param parameters parameters
- */
- public void setParameters(Map<String, String> parameters) {
- this.parameters = parameters;
- }
-
- /**
- * @return original table
- */
- public MTable getOrigTable() {
- return origTable;
- }
-
- /**
- * @param origTable
- */
- public void setOrigTable(MTable origTable) {
- this.origTable = origTable;
- }
-
- /**
- * @return index table
- */
- public MTable getIndexTable() {
- return indexTable;
- }
-
- /**
- * @param indexTable
- */
- public void setIndexTable(MTable indexTable) {
- this.indexTable = indexTable;
- }
-
- /**
- * @return storage descriptor
- */
- public MStorageDescriptor getSd() {
- return sd;
- }
-
- /**
- * @param sd
- */
- public void setSd(MStorageDescriptor sd) {
- this.sd = sd;
- }
-
- /**
- * @return indexHandlerClass
- */
- public String getIndexHandlerClass() {
- return indexHandlerClass;
- }
-
- /**
- * @param indexHandlerClass
- */
- public void setIndexHandlerClass(String indexHandlerClass) {
- this.indexHandlerClass = indexHandlerClass;
- }
-
- /**
- * @return auto rebuild
- */
- public boolean isDeferredRebuild() {
- return deferredRebuild;
- }
-
- /**
- * @return auto rebuild
- */
- public boolean getDeferredRebuild() {
- return deferredRebuild;
- }
-
- /**
- * @param deferredRebuild
- */
- public void setDeferredRebuild(boolean deferredRebuild) {
- this.deferredRebuild = deferredRebuild;
- }
-}
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/SchemaToolTaskValidate.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/SchemaToolTaskValidate.java
index e3428e8cc28..91c9949f317 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/SchemaToolTaskValidate.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/schematool/SchemaToolTaskValidate.java
@@ -140,7 +140,6 @@ class SchemaToolTaskValidate extends SchemaToolTask {
.put("MPartition", Pair.of("PARTITIONS", "PART_ID"))
.put("MPartitionColumnStatistics", Pair.of("PART_COL_STATS", "CS_ID"))
.put("MFunction", Pair.of("FUNCS", "FUNC_ID"))
- .put("MIndex", Pair.of("IDXS", "INDEX_ID"))
.put("MStringList", Pair.of("SKEWED_STRING_LIST", "STRING_LIST_ID"))
.build();
diff --git
a/standalone-metastore/metastore-server/src/main/resources/package.jdo
b/standalone-metastore/metastore-server/src/main/resources/package.jdo
index a6b10ac6a6c..c7493d3a790 100644
--- a/standalone-metastore/metastore-server/src/main/resources/package.jdo
+++ b/standalone-metastore/metastore-server/src/main/resources/package.jdo
@@ -546,53 +546,6 @@
</field>
</class>
- <class name="MIndex" table="IDXS" identity-type="datastore"
detachable="true">
- <index name="UniqueINDEX" unique="true">
- <column name="INDEX_NAME"/>
- <column name="ORIG_TBL_ID"/>
- </index>
-
- <datastore-identity>
- <column name="INDEX_ID"/>
- </datastore-identity>
- <field name="indexName">
- <column name="INDEX_NAME" length="128" jdbc-type="VARCHAR"/>
- </field>
- <field name="origTable">
- <column name="ORIG_TBL_ID"/>
- </field>
- <field name="indexTable">
- <column name="INDEX_TBL_ID"/>
- </field>
- <field name="indexHandlerClass">
- <column name="INDEX_HANDLER_CLASS" length="4000" jdbc-type="VARCHAR"/>
- </field>
- <field name="deferredRebuild">
- <column name="DEFERRED_REBUILD"/>
- </field>
- <field name="createTime">
- <column name="CREATE_TIME" jdbc-type="integer"/>
- </field>
- <field name="lastAccessTime">
- <column name="LAST_ACCESS_TIME" jdbc-type="integer"/>
- </field>
- <field name="sd" dependent="true">
- <column name="SD_ID"/>
- </field>
- <field name="parameters" table="INDEX_PARAMS">
- <map key-type="java.lang.String" value-type="java.lang.String"/>
- <join>
- <column name="INDEX_ID"/>
- </join>
- <key>
- <column name="PARAM_KEY" length="256" jdbc-type="VARCHAR"/>
- </key>
- <value>
- <column name="PARAM_VALUE" length="32672" jdbc-type="VARCHAR"/>
- </value>
- </field>
- </class>
-
<class name="MRole" table="ROLES" identity-type="datastore"
detachable="true">
<index name="RoleEntityINDEX" unique="true">
diff --git
a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql
b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql
index cfb5a7c3d5d..9feaa6a0c3f 100644
---
a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-beta-2.derby.sql
@@ -50,10 +50,6 @@ CREATE TABLE "APP"."DB_PRIVS" ("DB_GRANT_ID" BIGINT NOT
NULL, "CREATE_TIME" INTE
CREATE TABLE "APP"."DC_PRIVS" ("DC_GRANT_ID" BIGINT NOT NULL, "CREATE_TIME"
INTEGER NOT NULL, "NAME" VARCHAR(128), "GRANT_OPTION" SMALLINT NOT NULL,
"GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PRINCIPAL_NAME"
VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "DC_PRIV" VARCHAR(128),
"AUTHORIZER" VARCHAR(128));
-CREATE TABLE "APP"."IDXS" ("INDEX_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER
NOT NULL, "DEFERRED_REBUILD" CHAR(1) NOT NULL, "INDEX_HANDLER_CLASS"
VARCHAR(4000), "INDEX_NAME" VARCHAR(128), "INDEX_TBL_ID" BIGINT,
"LAST_ACCESS_TIME" INTEGER NOT NULL, "ORIG_TBL_ID" BIGINT, "SD_ID" BIGINT);
-
-CREATE TABLE "APP"."INDEX_PARAMS" ("INDEX_ID" BIGINT NOT NULL, "PARAM_KEY"
VARCHAR(256) NOT NULL, "PARAM_VALUE" VARCHAR(4000));
-
CREATE TABLE "APP"."PARTITIONS" ("PART_ID" BIGINT NOT NULL, "CREATE_TIME"
INTEGER NOT NULL, "LAST_ACCESS_TIME" INTEGER NOT NULL, "PART_NAME"
VARCHAR(767), "SD_ID" BIGINT, "TBL_ID" BIGINT, "WRITE_ID" BIGINT DEFAULT 0);
CREATE TABLE "APP"."SERDES" ("SERDE_ID" BIGINT NOT NULL, "NAME" VARCHAR(128),
"SLIB" VARCHAR(4000), "DESCRIPTION" VARCHAR(4000), "SERIALIZER_CLASS"
VARCHAR(4000), "DESERIALIZER_CLASS" VARCHAR(4000), SERDE_TYPE INTEGER);
@@ -264,8 +260,6 @@ INSERT INTO "APP"."SEQUENCE_TABLE" ("SEQUENCE_NAME",
"NEXT_VAL") SELECT * FROM (
-- DDL Statements for indexes
-- ----------------------------------------------
-CREATE UNIQUE INDEX "APP"."UNIQUEINDEX" ON "APP"."IDXS" ("INDEX_NAME",
"ORIG_TBL_ID");
-
CREATE INDEX "APP"."TABLECOLUMNPRIVILEGEINDEX" ON "APP"."TBL_COL_PRIVS"
("AUTHORIZER", "TBL_ID", "COLUMN_NAME", "PRINCIPAL_NAME", "PRINCIPAL_TYPE",
"TBL_COL_PRIV", "GRANTOR", "GRANTOR_TYPE");
CREATE UNIQUE INDEX "APP"."DBPRIVILEGEINDEX" ON "APP"."DB_PRIVS"
("AUTHORIZER", "DB_ID", "PRINCIPAL_NAME", "PRINCIPAL_TYPE", "DB_PRIV",
"GRANTOR", "GRANTOR_TYPE");
@@ -324,7 +318,6 @@ CREATE UNIQUE INDEX "APP"."UNIQUE_CATALOG" ON "APP"."CTLGS"
("NAME");
-- ----------------------------------------------
-- primary/unique
-ALTER TABLE "APP"."IDXS" ADD CONSTRAINT "IDXS_PK" PRIMARY KEY ("INDEX_ID");
ALTER TABLE "APP"."TBL_COL_PRIVS" ADD CONSTRAINT "TBL_COL_PRIVS_PK" PRIMARY
KEY ("TBL_COLUMN_GRANT_ID");
@@ -334,8 +327,6 @@ ALTER TABLE "APP"."DB_PRIVS" ADD CONSTRAINT "DB_PRIVS_PK"
PRIMARY KEY ("DB_GRANT
ALTER TABLE "APP"."DC_PRIVS" ADD CONSTRAINT "DC_PRIVS_PK" PRIMARY KEY
("DC_GRANT_ID");
-ALTER TABLE "APP"."INDEX_PARAMS" ADD CONSTRAINT "INDEX_PARAMS_PK" PRIMARY KEY
("INDEX_ID", "PARAM_KEY");
-
ALTER TABLE "APP"."PARTITION_KEYS" ADD CONSTRAINT "PARTITION_KEY_PK" PRIMARY
KEY ("TBL_ID", "PKEY_NAME");
ALTER TABLE "APP"."SEQUENCE_TABLE" ADD CONSTRAINT "SEQUENCE_TABLE_PK" PRIMARY
KEY ("SEQUENCE_NAME");
@@ -424,18 +415,10 @@ ALTER TABLE "APP"."CTLGS" ADD CONSTRAINT "CTLG_PK"
PRIMARY KEY ("CTLG_ID");
-- foreign
-ALTER TABLE "APP"."IDXS" ADD CONSTRAINT "IDXS_FK1" FOREIGN KEY ("ORIG_TBL_ID")
REFERENCES "APP"."TBLS" ("TBL_ID") ON DELETE NO ACTION ON UPDATE NO ACTION;
-
-ALTER TABLE "APP"."IDXS" ADD CONSTRAINT "IDXS_FK2" FOREIGN KEY ("SD_ID")
REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION;
-
-ALTER TABLE "APP"."IDXS" ADD CONSTRAINT "IDXS_FK3" FOREIGN KEY
("INDEX_TBL_ID") REFERENCES "APP"."TBLS" ("TBL_ID") ON DELETE NO ACTION ON
UPDATE NO ACTION;
-
ALTER TABLE "APP"."TBL_COL_PRIVS" ADD CONSTRAINT "TBL_COL_PRIVS_FK1" FOREIGN
KEY ("TBL_ID") REFERENCES "APP"."TBLS" ("TBL_ID") ON DELETE NO ACTION ON UPDATE
NO ACTION;
ALTER TABLE "APP"."DB_PRIVS" ADD CONSTRAINT "DB_PRIVS_FK1" FOREIGN KEY
("DB_ID") REFERENCES "APP"."DBS" ("DB_ID") ON DELETE NO ACTION ON UPDATE NO
ACTION;
-ALTER TABLE "APP"."INDEX_PARAMS" ADD CONSTRAINT "INDEX_PARAMS_FK1" FOREIGN KEY
("INDEX_ID") REFERENCES "APP"."IDXS" ("INDEX_ID") ON DELETE NO ACTION ON UPDATE
NO ACTION;
-
ALTER TABLE "APP"."PARTITION_KEYS" ADD CONSTRAINT "PARTITION_KEYS_FK1" FOREIGN
KEY ("TBL_ID") REFERENCES "APP"."TBLS" ("TBL_ID") ON DELETE NO ACTION ON UPDATE
NO ACTION;
ALTER TABLE "APP"."PART_PRIVS" ADD CONSTRAINT "PART_PRIVS_FK1" FOREIGN KEY
("PART_ID") REFERENCES "APP"."PARTITIONS" ("PART_ID") ON DELETE NO ACTION ON
UPDATE NO ACTION;
@@ -538,8 +521,6 @@ ALTER TABLE "APP"."DBS" ADD CONSTRAINT "DBS_CTLG_FK"
FOREIGN KEY ("CTLG_NAME") R
-- DDL Statements for checks
-- ----------------------------------------------
-ALTER TABLE "APP"."IDXS" ADD CONSTRAINT "SQL110318025504980" CHECK
(DEFERRED_REBUILD IN ('Y','N'));
-
ALTER TABLE "APP"."SDS" ADD CONSTRAINT "SQL110318025505550" CHECK
(IS_COMPRESSED IN ('Y','N'));
-- ----------------------------
diff --git
a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql
b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql
index 094383b2b61..2695e10742c 100644
---
a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.derby.sql
@@ -1,2 +1,6 @@
+-- HIVE-24815 Remove "IDXS" Table from Metastore Schema
+DROP TABLE "APP"."INDEX_PARAMS";
+DROP TABLE "APP"."IDXS";
+
-- This needs to be the last thing done. Insert any changes above this line.
UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive
release version 4.0.0-beta-2' where VER_ID=1;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql
b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql
index c0cefec9a3e..190a245c2b6 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-beta-2.mssql.sql
@@ -54,22 +54,6 @@ CREATE TABLE MASTER_KEYS
ALTER TABLE MASTER_KEYS ADD CONSTRAINT MASTER_KEYS_PK PRIMARY KEY (KEY_ID);
--- Table IDXS for classes [org.apache.hadoop.hive.metastore.model.MIndex]
-CREATE TABLE IDXS
-(
- INDEX_ID bigint NOT NULL,
- CREATE_TIME int NOT NULL,
- DEFERRED_REBUILD bit NOT NULL,
- INDEX_HANDLER_CLASS nvarchar(4000) NULL,
- INDEX_NAME nvarchar(128) NULL,
- INDEX_TBL_ID bigint NULL,
- LAST_ACCESS_TIME int NOT NULL,
- ORIG_TBL_ID bigint NULL,
- SD_ID bigint NULL
-);
-
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_PK PRIMARY KEY (INDEX_ID);
-
-- Table PART_COL_STATS for classes
[org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics]
CREATE TABLE PART_COL_STATS
(
@@ -592,16 +576,6 @@ CREATE TABLE DATABASE_PARAMS
ALTER TABLE DATABASE_PARAMS ADD CONSTRAINT DATABASE_PARAMS_PK PRIMARY KEY
(DB_ID,PARAM_KEY);
--- Table INDEX_PARAMS for join relationship
-CREATE TABLE INDEX_PARAMS
-(
- INDEX_ID bigint NOT NULL,
- PARAM_KEY nvarchar(256) NOT NULL,
- PARAM_VALUE nvarchar(4000) NULL
-);
-
-ALTER TABLE INDEX_PARAMS ADD CONSTRAINT INDEX_PARAMS_PK PRIMARY KEY
(INDEX_ID,PARAM_KEY);
-
-- Table COLUMNS_V2 for join relationship
CREATE TABLE COLUMNS_V2
(
@@ -746,22 +720,6 @@ CREATE UNIQUE INDEX UNIQUE_CTLG ON CTLGS ("NAME");
-- Constraints for table MASTER_KEYS for class(es)
[org.apache.hadoop.hive.metastore.model.MMasterKey]
--- Constraints for table IDXS for class(es)
[org.apache.hadoop.hive.metastore.model.MIndex]
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_FK1 FOREIGN KEY (INDEX_TBL_ID) REFERENCES
TBLS (TBL_ID) ;
-
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_FK2 FOREIGN KEY (SD_ID) REFERENCES SDS
(SD_ID) ;
-
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_FK3 FOREIGN KEY (ORIG_TBL_ID) REFERENCES
TBLS (TBL_ID) ;
-
-CREATE UNIQUE INDEX UNIQUEINDEX ON IDXS (INDEX_NAME,ORIG_TBL_ID);
-
-CREATE INDEX IDXS_N51 ON IDXS (SD_ID);
-
-CREATE INDEX IDXS_N50 ON IDXS (ORIG_TBL_ID);
-
-CREATE INDEX IDXS_N49 ON IDXS (INDEX_TBL_ID);
-
-
-- Constraints for table PART_COL_STATS for class(es)
[org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics]
ALTER TABLE PART_COL_STATS ADD CONSTRAINT PART_COL_STATS_FK1 FOREIGN KEY
(PART_ID) REFERENCES PARTITIONS (PART_ID) ;
@@ -973,13 +931,6 @@ ALTER TABLE DATABASE_PARAMS ADD CONSTRAINT
DATABASE_PARAMS_FK1 FOREIGN KEY (DB_I
CREATE INDEX DATABASE_PARAMS_N49 ON DATABASE_PARAMS (DB_ID);
-
--- Constraints for table INDEX_PARAMS
-ALTER TABLE INDEX_PARAMS ADD CONSTRAINT INDEX_PARAMS_FK1 FOREIGN KEY
(INDEX_ID) REFERENCES IDXS (INDEX_ID) ;
-
-CREATE INDEX INDEX_PARAMS_N49 ON INDEX_PARAMS (INDEX_ID);
-
-
-- Constraints for table COLUMNS_V2
ALTER TABLE COLUMNS_V2 ADD CONSTRAINT COLUMNS_V2_FK1 FOREIGN KEY (CD_ID)
REFERENCES CDS (CD_ID) ;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql
b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql
index 914dc783252..a7afd05ceb3 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mssql.sql
@@ -1,5 +1,9 @@
SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS
MESSAGE;
+-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
+DROP TABLE INDEX_PARAMS;
+DROP TABLE IDXS;
+
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive
release version 4.0.0-beta-2' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2'
AS MESSAGE;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql
b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql
index 58b84e2a210..d97577f7d21 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-beta-2.mysql.sql
@@ -159,49 +159,6 @@ CREATE TABLE IF NOT EXISTS `GLOBAL_PRIVS` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
---
--- Table structure for table `IDXS`
---
-
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE IF NOT EXISTS `IDXS` (
- `INDEX_ID` bigint(20) NOT NULL,
- `CREATE_TIME` int(11) NOT NULL,
- `DEFERRED_REBUILD` bit(1) NOT NULL,
- `INDEX_HANDLER_CLASS` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin
DEFAULT NULL,
- `INDEX_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT
NULL,
- `INDEX_TBL_ID` bigint(20) DEFAULT NULL,
- `LAST_ACCESS_TIME` int(11) NOT NULL,
- `ORIG_TBL_ID` bigint(20) DEFAULT NULL,
- `SD_ID` bigint(20) DEFAULT NULL,
- PRIMARY KEY (`INDEX_ID`),
- UNIQUE KEY `UNIQUEINDEX` (`INDEX_NAME`,`ORIG_TBL_ID`),
- KEY `IDXS_N51` (`SD_ID`),
- KEY `IDXS_N50` (`INDEX_TBL_ID`),
- KEY `IDXS_N49` (`ORIG_TBL_ID`),
- CONSTRAINT `IDXS_FK1` FOREIGN KEY (`ORIG_TBL_ID`) REFERENCES `TBLS`
(`TBL_ID`),
- CONSTRAINT `IDXS_FK2` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`),
- CONSTRAINT `IDXS_FK3` FOREIGN KEY (`INDEX_TBL_ID`) REFERENCES `TBLS`
(`TBL_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `INDEX_PARAMS`
---
-
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE IF NOT EXISTS `INDEX_PARAMS` (
- `INDEX_ID` bigint(20) NOT NULL,
- `PARAM_KEY` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `PARAM_VALUE` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT
NULL,
- PRIMARY KEY (`INDEX_ID`,`PARAM_KEY`),
- KEY `INDEX_PARAMS_N49` (`INDEX_ID`),
- CONSTRAINT `INDEX_PARAMS_FK1` FOREIGN KEY (`INDEX_ID`) REFERENCES `IDXS`
(`INDEX_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
--
-- Table structure for table `NUCLEUS_TABLES`
--
diff --git
a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql
b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql
index a22021c2d80..9d3bcb028ab 100644
---
a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.mysql.sql
@@ -1,5 +1,9 @@
SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS
MESSAGE;
+-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
+DROP TABLE `INDEX_PARAMS`;
+DROP TABLE `IDXS`;
+
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive
release version 4.0.0-beta-2' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2'
AS MESSAGE;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql
b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql
index 3f0f0a0d4b7..a2fb02c8911 100644
---
a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-beta-2.oracle.sql
@@ -184,16 +184,6 @@ CREATE TABLE PARTITIONS
ALTER TABLE PARTITIONS ADD CONSTRAINT PARTITIONS_PK PRIMARY KEY (PART_ID);
--- Table INDEX_PARAMS for join relationship
-CREATE TABLE INDEX_PARAMS
-(
- INDEX_ID NUMBER NOT NULL,
- PARAM_KEY VARCHAR2(256) NOT NULL,
- PARAM_VALUE VARCHAR2(4000) NULL
-);
-
-ALTER TABLE INDEX_PARAMS ADD CONSTRAINT INDEX_PARAMS_PK PRIMARY KEY
(INDEX_ID,PARAM_KEY);
-
-- Table TBL_COL_PRIVS for classes
[org.apache.hadoop.hive.metastore.model.MTableColumnPrivilege]
CREATE TABLE TBL_COL_PRIVS
(
@@ -212,22 +202,6 @@ CREATE TABLE TBL_COL_PRIVS
ALTER TABLE TBL_COL_PRIVS ADD CONSTRAINT TBL_COL_PRIVS_PK PRIMARY KEY
(TBL_COLUMN_GRANT_ID);
--- Table IDXS for classes [org.apache.hadoop.hive.metastore.model.MIndex]
-CREATE TABLE IDXS
-(
- INDEX_ID NUMBER NOT NULL,
- CREATE_TIME NUMBER (10) NOT NULL,
- DEFERRED_REBUILD NUMBER(1) NOT NULL CHECK (DEFERRED_REBUILD IN (1,0)),
- INDEX_HANDLER_CLASS VARCHAR2(4000) NULL,
- INDEX_NAME VARCHAR2(128) NULL,
- INDEX_TBL_ID NUMBER NULL,
- LAST_ACCESS_TIME NUMBER (10) NOT NULL,
- ORIG_TBL_ID NUMBER NULL,
- SD_ID NUMBER NULL
-);
-
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_PK PRIMARY KEY (INDEX_ID);
-
-- Table BUCKETING_COLS for join relationship
CREATE TABLE BUCKETING_COLS
(
@@ -793,13 +767,6 @@ CREATE INDEX PARTITIONS_N50 ON PARTITIONS (TBL_ID);
CREATE UNIQUE INDEX UNIQUEPARTITION ON PARTITIONS (PART_NAME,TBL_ID);
-
--- Constraints for table INDEX_PARAMS
-ALTER TABLE INDEX_PARAMS ADD CONSTRAINT INDEX_PARAMS_FK1 FOREIGN KEY
(INDEX_ID) REFERENCES IDXS (INDEX_ID) INITIALLY DEFERRED ;
-
-CREATE INDEX INDEX_PARAMS_N49 ON INDEX_PARAMS (INDEX_ID);
-
-
-- Constraints for table TBL_COL_PRIVS for class(es)
[org.apache.hadoop.hive.metastore.model.MTableColumnPrivilege]
ALTER TABLE TBL_COL_PRIVS ADD CONSTRAINT TBL_COL_PRIVS_FK1 FOREIGN KEY
(TBL_ID) REFERENCES TBLS (TBL_ID) INITIALLY DEFERRED ;
@@ -807,23 +774,6 @@ CREATE INDEX TABLECOLUMNPRIVILEGEINDEX ON TBL_COL_PRIVS
(AUTHORIZER,TBL_ID,"COLU
CREATE INDEX TBL_COL_PRIVS_N49 ON TBL_COL_PRIVS (TBL_ID);
-
--- Constraints for table IDXS for class(es)
[org.apache.hadoop.hive.metastore.model.MIndex]
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_FK2 FOREIGN KEY (SD_ID) REFERENCES SDS
(SD_ID) INITIALLY DEFERRED ;
-
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_FK1 FOREIGN KEY (ORIG_TBL_ID) REFERENCES
TBLS (TBL_ID) INITIALLY DEFERRED ;
-
-ALTER TABLE IDXS ADD CONSTRAINT IDXS_FK3 FOREIGN KEY (INDEX_TBL_ID) REFERENCES
TBLS (TBL_ID) INITIALLY DEFERRED ;
-
-CREATE UNIQUE INDEX UNIQUEINDEX ON IDXS (INDEX_NAME,ORIG_TBL_ID);
-
-CREATE INDEX IDXS_N50 ON IDXS (INDEX_TBL_ID);
-
-CREATE INDEX IDXS_N51 ON IDXS (SD_ID);
-
-CREATE INDEX IDXS_N49 ON IDXS (ORIG_TBL_ID);
-
-
-- Constraints for table BUCKETING_COLS
ALTER TABLE BUCKETING_COLS ADD CONSTRAINT BUCKETING_COLS_FK1 FOREIGN KEY
(SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql
b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql
index 3a5ce634daf..53c7cb140d7 100644
---
a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.oracle.sql
@@ -1,5 +1,10 @@
SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2' AS
Status from dual;
+
+-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
+DROP TABLE INDEX_PARAMS;
+DROP TABLE IDXS;
+
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='4.0.0-beta-2', VERSION_COMMENT='Hive
release version 4.0.0-beta-2' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2'
AS Status from dual;
diff --git
a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql
b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql
index 93c3561649b..b247bc3fda0 100644
---
a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-beta-2.postgres.sql
@@ -142,35 +142,6 @@ CREATE TABLE "GLOBAL_PRIVS" (
"AUTHORIZER" character varying(128) DEFAULT NULL::character varying
);
-
---
--- Name: IDXS; Type: TABLE; Schema: public; Owner: hiveuser; Tablespace:
---
-
-CREATE TABLE "IDXS" (
- "INDEX_ID" bigint NOT NULL,
- "CREATE_TIME" bigint NOT NULL,
- "DEFERRED_REBUILD" boolean NOT NULL,
- "INDEX_HANDLER_CLASS" character varying(4000) DEFAULT NULL::character
varying,
- "INDEX_NAME" character varying(128) DEFAULT NULL::character varying,
- "INDEX_TBL_ID" bigint,
- "LAST_ACCESS_TIME" bigint NOT NULL,
- "ORIG_TBL_ID" bigint,
- "SD_ID" bigint
-);
-
-
---
--- Name: INDEX_PARAMS; Type: TABLE; Schema: public; Owner: hiveuser;
Tablespace:
---
-
-CREATE TABLE "INDEX_PARAMS" (
- "INDEX_ID" bigint NOT NULL,
- "PARAM_KEY" character varying(256) NOT NULL,
- "PARAM_VALUE" character varying(4000) DEFAULT NULL::character varying
-);
-
-
--
-- Name: NUCLEUS_TABLES; Type: TABLE; Schema: public; Owner: hiveuser;
Tablespace:
--
@@ -833,22 +804,6 @@ ALTER TABLE ONLY "GLOBAL_PRIVS"
ADD CONSTRAINT "GLOBAL_PRIVS_pkey" PRIMARY KEY ("USER_GRANT_ID");
---
--- Name: IDXS_pkey; Type: CONSTRAINT; Schema: public; Owner: hiveuser;
Tablespace:
---
-
-ALTER TABLE ONLY "IDXS"
- ADD CONSTRAINT "IDXS_pkey" PRIMARY KEY ("INDEX_ID");
-
-
---
--- Name: INDEX_PARAMS_pkey; Type: CONSTRAINT; Schema: public; Owner: hiveuser;
Tablespace:
---
-
-ALTER TABLE ONLY "INDEX_PARAMS"
- ADD CONSTRAINT "INDEX_PARAMS_pkey" PRIMARY KEY ("INDEX_ID", "PARAM_KEY");
-
-
--
-- Name: ONE_ROW_CONSTRAINT; Type: CONSTRAINT; Schema: public; Owner:
hiveuser; Tablespace:
--
@@ -1066,13 +1021,6 @@ ALTER TABLE ONLY "TAB_COL_STATS" ADD CONSTRAINT
"TAB_COL_STATS_pkey" PRIMARY KEY
--
ALTER TABLE ONLY "PART_COL_STATS" ADD CONSTRAINT "PART_COL_STATS_pkey" PRIMARY
KEY("CS_ID");
---
--- Name: UNIQUEINDEX; Type: CONSTRAINT; Schema: public; Owner: hiveuser;
Tablespace:
---
-
-ALTER TABLE ONLY "IDXS"
- ADD CONSTRAINT "UNIQUEINDEX" UNIQUE ("INDEX_NAME", "ORIG_TBL_ID");
-
--
-- Name: UNIQUEPARTITION; Type: CONSTRAINT; Schema: public; Owner: hiveuser;
Tablespace:
@@ -1173,34 +1121,6 @@ CREATE INDEX "DB_PRIVS_N49" ON "DB_PRIVS" USING btree
("DB_ID");
CREATE INDEX "DC_PRIVS_N49" ON "DC_PRIVS" USING btree ("NAME");
---
--- Name: IDXS_N49; Type: INDEX; Schema: public; Owner: hiveuser; Tablespace:
---
-
-CREATE INDEX "IDXS_N49" ON "IDXS" USING btree ("ORIG_TBL_ID");
-
-
---
--- Name: IDXS_N50; Type: INDEX; Schema: public; Owner: hiveuser; Tablespace:
---
-
-CREATE INDEX "IDXS_N50" ON "IDXS" USING btree ("INDEX_TBL_ID");
-
-
---
--- Name: IDXS_N51; Type: INDEX; Schema: public; Owner: hiveuser; Tablespace:
---
-
-CREATE INDEX "IDXS_N51" ON "IDXS" USING btree ("SD_ID");
-
-
---
--- Name: INDEX_PARAMS_N49; Type: INDEX; Schema: public; Owner: hiveuser;
Tablespace:
---
-
-CREATE INDEX "INDEX_PARAMS_N49" ON "INDEX_PARAMS" USING btree ("INDEX_ID");
-
-
--
-- Name: PARTITIONCOLUMNPRIVILEGEINDEX; Type: INDEX; Schema: public; Owner:
hiveuser; Tablespace:
--
@@ -1465,38 +1385,6 @@ ALTER TABLE ONLY "DB_PRIVS"
ADD CONSTRAINT "DB_PRIVS_DB_ID_fkey" FOREIGN KEY ("DB_ID") REFERENCES
"DBS"("DB_ID") DEFERRABLE;
---
--- Name: IDXS_INDEX_TBL_ID_fkey; Type: FK CONSTRAINT; Schema: public; Owner:
hiveuser
---
-
-ALTER TABLE ONLY "IDXS"
- ADD CONSTRAINT "IDXS_INDEX_TBL_ID_fkey" FOREIGN KEY ("INDEX_TBL_ID")
REFERENCES "TBLS"("TBL_ID") DEFERRABLE;
-
-
---
--- Name: IDXS_ORIG_TBL_ID_fkey; Type: FK CONSTRAINT; Schema: public; Owner:
hiveuser
---
-
-ALTER TABLE ONLY "IDXS"
- ADD CONSTRAINT "IDXS_ORIG_TBL_ID_fkey" FOREIGN KEY ("ORIG_TBL_ID")
REFERENCES "TBLS"("TBL_ID") DEFERRABLE;
-
-
---
--- Name: IDXS_SD_ID_fkey; Type: FK CONSTRAINT; Schema: public; Owner: hiveuser
---
-
-ALTER TABLE ONLY "IDXS"
- ADD CONSTRAINT "IDXS_SD_ID_fkey" FOREIGN KEY ("SD_ID") REFERENCES
"SDS"("SD_ID") DEFERRABLE;
-
-
---
--- Name: INDEX_PARAMS_INDEX_ID_fkey; Type: FK CONSTRAINT; Schema: public;
Owner: hiveuser
---
-
-ALTER TABLE ONLY "INDEX_PARAMS"
- ADD CONSTRAINT "INDEX_PARAMS_INDEX_ID_fkey" FOREIGN KEY ("INDEX_ID")
REFERENCES "IDXS"("INDEX_ID") DEFERRABLE;
-
-
--
-- Name: PARTITIONS_SD_ID_fkey; Type: FK CONSTRAINT; Schema: public; Owner:
hiveuser
--
diff --git
a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql
b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql
index dd3cab5595a..1d285bbe842 100644
---
a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql
+++
b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.0.0-beta-1-to-4.0.0-beta-2.postgres.sql
@@ -1,4 +1,9 @@
SELECT 'Upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2';
+
+-- HIVE-24815: Remove "IDXS" Table from Metastore Schema
+DROP TABLE IF EXISTS "INDEX_PARAMS";
+DROP TABLE IF EXISTS "IDXS";
+
-- These lines need to be last. Insert any changes above.
UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0-beta-2', "VERSION_COMMENT"='Hive
release version 4.0.0-beta-2' where "VER_ID"=1;
SELECT 'Finished upgrading MetaStore schema from 4.0.0-beta-1 to 4.0.0-beta-2';
