commit 867f14132ba6f2156545f97de0fc1115d6476466 Author: Vihang Karajgaonkar Date: Thu May 18 18:00:17 2017 -0700 Removed the unnecessary property-id column from metastore_db_properties table diff --git metastore/scripts/upgrade/derby/041-HIVE-16556.derby.sql metastore/scripts/upgrade/derby/041-HIVE-16556.derby.sql index ea5f24ab7fa269b7596b9f5688d95c80ce0d3339..5c6b5f7d233f58ff7f72a5450bc58effd58cbfdf 100644 --- metastore/scripts/upgrade/derby/041-HIVE-16556.derby.sql +++ metastore/scripts/upgrade/derby/041-HIVE-16556.derby.sql @@ -1,5 +1,3 @@ -CREATE TABLE "APP"."METASTORE_DB_PROPERTIES" ("PROPERTY_ID" BIGINT NOT NULL, "PROPERTY_KEY" VARCHAR(255) NOT NULL, "PROPERTY_VALUE" VARCHAR(1000) NOT NULL, "DESCRIPTION" VARCHAR(1000)); +CREATE TABLE "APP"."METASTORE_DB_PROPERTIES" ("PROPERTY_KEY" VARCHAR(255) NOT NULL, "PROPERTY_VALUE" VARCHAR(1000) NOT NULL, "DESCRIPTION" VARCHAR(1000)); -ALTER TABLE "APP"."METASTORE_DB_PROPERTIES" ADD CONSTRAINT "UNIQUE_PROPERTY_KEY" UNIQUE ("PROPERTY_KEY"); - -ALTER TABLE "APP"."METASTORE_DB_PROPERTIES" ADD CONSTRAINT "PROPERTY_ID_PK" PRIMARY KEY ("PROPERTY_ID"); +ALTER TABLE "APP"."METASTORE_DB_PROPERTIES" ADD CONSTRAINT "PROPERTY_KEY_PK" PRIMARY KEY ("PROPERTY_KEY"); diff --git metastore/scripts/upgrade/derby/hive-schema-3.0.0.derby.sql metastore/scripts/upgrade/derby/hive-schema-3.0.0.derby.sql index ee04bfd5bdcc248c682413d32b082a8b926a2413..0226d6f48fe1b6faa382fee893fd13fd5097bb78 100644 --- metastore/scripts/upgrade/derby/hive-schema-3.0.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-schema-3.0.0.derby.sql @@ -108,7 +108,7 @@ CREATE TABLE "APP"."NOTIFICATION_SEQUENCE" ("NNI_ID" BIGINT NOT NULL, "NEXT_EVEN CREATE TABLE "APP"."KEY_CONSTRAINTS" ("CHILD_CD_ID" BIGINT, "CHILD_INTEGER_IDX" INTEGER NOT NULL, "CHILD_TBL_ID" BIGINT, "PARENT_CD_ID" BIGINT NOT NULL, "PARENT_INTEGER_IDX" INTEGER, "PARENT_TBL_ID" BIGINT NOT NULL, "POSITION" BIGINT NOT NULL, "CONSTRAINT_NAME" VARCHAR(400) NOT NULL, "CONSTRAINT_TYPE" SMALLINT NOT NULL, "UPDATE_RULE" SMALLINT, "DELETE_RULE" SMALLINT, "ENABLE_VALIDATE_RELY" SMALLINT NOT NULL); -CREATE TABLE "APP"."METASTORE_DB_PROPERTIES" ("PROPERTY_ID" BIGINT NOT NULL, "PROPERTY_KEY" VARCHAR(255) NOT NULL, "PROPERTY_VALUE" VARCHAR(1000) NOT NULL, "DESCRIPTION" VARCHAR(1000)); +CREATE TABLE "APP"."METASTORE_DB_PROPERTIES" ("PROPERTY_KEY" VARCHAR(255) NOT NULL, "PROPERTY_VALUE" VARCHAR(1000) NOT NULL, "DESCRIPTION" VARCHAR(1000)); -- ---------------------------------------------- -- DDL Statements for indexes @@ -243,9 +243,7 @@ ALTER TABLE "APP"."NOTIFICATION_SEQUENCE" ADD CONSTRAINT "NOTIFICATION_SEQUENCE_ ALTER TABLE "APP"."KEY_CONSTRAINTS" ADD CONSTRAINT "CONSTRAINTS_PK" PRIMARY KEY ("CONSTRAINT_NAME", "POSITION"); -ALTER TABLE "APP"."METASTORE_DB_PROPERTIES" ADD CONSTRAINT "PROPERTY_ID_PK" PRIMARY KEY ("PROPERTY_ID"); - -ALTER TABLE "APP"."METASTORE_DB_PROPERTIES" ADD CONSTRAINT "UNIQUE_PROPERTY_KEY" UNIQUE ("PROPERTY_KEY"); +ALTER TABLE "APP"."METASTORE_DB_PROPERTIES" ADD CONSTRAINT "PROPERTY_KEY_PK" PRIMARY KEY ("PROPERTY_KEY"); -- 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; diff --git metastore/scripts/upgrade/mssql/026-HIVE-16556.mssql.sql metastore/scripts/upgrade/mssql/026-HIVE-16556.mssql.sql index 088e7027879111a159a1a7e75fd5f18b22edbd8e..869404edbe2995d3e12a2d6cfeeab187d3e59ed3 100644 --- metastore/scripts/upgrade/mssql/026-HIVE-16556.mssql.sql +++ metastore/scripts/upgrade/mssql/026-HIVE-16556.mssql.sql @@ -1,10 +1,7 @@ CREATE TABLE METASTORE_DB_PROPERTIES ( - PROPERTY_ID BIGINT NOT NULL, PROPERTY_KEY VARCHAR(255) NOT NULL, PROPERTY_VALUE VARCHAR(1000) NOT NULL, DESCRIPTION VARCHAR(1000) ); -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT METASTORE_DB_PROPERTIES_PK PRIMARY KEY (PROPERTY_ID); - -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT UNIQUE_PROPERTY_KEY UNIQUE (PROPERTY_KEY); +ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT PROPERTY_KEY_PK PRIMARY KEY (PROPERTY_KEY); diff --git metastore/scripts/upgrade/mssql/hive-schema-3.0.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-3.0.0.mssql.sql index 416f3d9e1a65d8e26d68db797948dd1528a2359d..d7bd3f892cd65e687badef06289ff5d4d70a2633 100644 --- metastore/scripts/upgrade/mssql/hive-schema-3.0.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-3.0.0.mssql.sql @@ -1017,15 +1017,12 @@ CREATE TABLE WRITE_SET ( ); CREATE TABLE METASTORE_DB_PROPERTIES ( - PROPERTY_ID BIGINT NOT NULL, PROPERTY_KEY VARCHAR(255) NOT NULL, PROPERTY_VALUE VARCHAR(1000) NOT NULL, DESCRIPTION VARCHAR(1000) ); -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT METASTORE_DB_PROPERTIES_PK PRIMARY KEY (PROPERTY_ID); - -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT UNIQUE_PROPERTY_KEY UNIQUE (PROPERTY_KEY); +ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT PROPERTY_KEY_PK PRIMARY KEY (PROPERTY_KEY); -- ----------------------------------------------------------------- -- Record schema version. Should be the last step in the init script diff --git metastore/scripts/upgrade/mysql/041-HIVE-16556.mysql.sql metastore/scripts/upgrade/mysql/041-HIVE-16556.mysql.sql index 8afc1961d8cd9cbb9d5bd8ee67b3afecb5af4fd1..f8b97bb43b2f2c479729f89f1ef29256d6b8477d 100644 --- metastore/scripts/upgrade/mysql/041-HIVE-16556.mysql.sql +++ metastore/scripts/upgrade/mysql/041-HIVE-16556.mysql.sql @@ -2,10 +2,8 @@ -- Table structure for table METASTORE_DB_PROPERTIES -- CREATE TABLE IF NOT EXISTS `METASTORE_DB_PROPERTIES` ( - `PROPERTY_ID` BIGINT(20) NOT NULL, `PROPERTY_KEY` varchar(255) NOT NULL, `PROPERTY_VALUE` varchar(1000) NOT NULL, `DESCRIPTION` varchar(1000), - PRIMARY KEY(`PROPERTY_ID`), - UNIQUE KEY `UNIQUE_PROPERTY_KEY` (`PROPERTY_KEY`) + PRIMARY KEY(`PROPERTY_KEY`), ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql index 09b8cf092a8f476bf5a3f3b99a270bcc53634b30..ff874bb8d0b720fa0df9f3a2c526791dc6a23b11 100644 --- metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql @@ -833,12 +833,10 @@ CREATE INDEX `CONSTRAINTS_PARENT_TABLE_ID_INDEX` ON KEY_CONSTRAINTS (`PARENT_TBL -- Metastore DB Properties table -- ----------------------------- CREATE TABLE IF NOT EXISTS `METASTORE_DB_PROPERTIES` ( - `PROPERTY_ID` BIGINT(20) NOT NULL, `PROPERTY_KEY` varchar(255) NOT NULL, `PROPERTY_VALUE` varchar(1000) NOT NULL, `DESCRIPTION` varchar(1000), - PRIMARY KEY(`PROPERTY_ID`), - UNIQUE KEY `UNIQUE_PROPERTY_KEY` (`PROPERTY_KEY`) + PRIMARY KEY(`PROPERTY_KEY`), ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- ---------------------------- diff --git metastore/scripts/upgrade/oracle/041-HIVE-16556.oracle.sql metastore/scripts/upgrade/oracle/041-HIVE-16556.oracle.sql index 14a2bdbbbeb00c8100e1de6c186b157476f9409d..566570c8d4ba8f8486ffb1cb5f262ebc81482777 100644 --- metastore/scripts/upgrade/oracle/041-HIVE-16556.oracle.sql +++ metastore/scripts/upgrade/oracle/041-HIVE-16556.oracle.sql @@ -1,11 +1,8 @@ CREATE TABLE METASTORE_DB_PROPERTIES ( - PROPERTY_ID NUMBER NOT NULL, PROPERTY_KEY VARCHAR(255) NOT NULL, PROPERTY_VALUE VARCHAR(1000) NOT NULL, DESCRIPTION VARCHAR(1000) ); -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT UNIQUE_PROPERTY_KEY UNIQUE (PROPERTY_KEY); - -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT PROPERTY_ID_PK PRIMARY KEY (PROPERTY_ID); +ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT PROPERTY_KEY_PK PRIMARY KEY (PROPERTY_KEY); diff --git metastore/scripts/upgrade/oracle/hive-schema-3.0.0.oracle.sql metastore/scripts/upgrade/oracle/hive-schema-3.0.0.oracle.sql index 0ad28b28504e15c71ac91557bc4ac230f566b93e..0ca614333df8e8444d57b1ce0e2d43c49c134616 100644 --- metastore/scripts/upgrade/oracle/hive-schema-3.0.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-schema-3.0.0.oracle.sql @@ -802,15 +802,13 @@ CREATE INDEX CONSTRAINTS_PT_INDEX ON KEY_CONSTRAINTS(PARENT_TBL_ID); -- Table for METASTORE_DB_PROPERTIES and its constraints CREATE TABLE METASTORE_DB_PROPERTIES ( - PROPERTY_ID NUMBER NOT NULL, PROPERTY_KEY VARCHAR(255) NOT NULL, PROPERTY_VALUE VARCHAR(1000) NOT NULL, DESCRIPTION VARCHAR(1000) ); -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT UNIQUE_PROPERTY_KEY UNIQUE (PROPERTY_KEY); +ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT PROPERTY_KEY_PK PRIMARY KEY (PROPERTY_KEY); -ALTER TABLE METASTORE_DB_PROPERTIES ADD CONSTRAINT PROPERTY_ID_PK PRIMARY KEY (PROPERTY_ID); ------------------------------ -- Transaction and lock tables ------------------------------ diff --git metastore/scripts/upgrade/postgres/040-HIVE-16556.postgres.sql metastore/scripts/upgrade/postgres/040-HIVE-16556.postgres.sql index 9a3ff03d39b32cb1a1bd503dbf74cea4881ec6e6..41f5336b4c19ee8115fd6b86db75a8a6641f594c 100644 --- metastore/scripts/upgrade/postgres/040-HIVE-16556.postgres.sql +++ metastore/scripts/upgrade/postgres/040-HIVE-16556.postgres.sql @@ -1,13 +1,9 @@ CREATE TABLE "METASTORE_DB_PROPERTIES" ( - "PROPERTY_ID" BIGINT NOT NULL, "PROPERTY_KEY" VARCHAR(255) NOT NULL, "PROPERTY_VALUE" VARCHAR(1000) NOT NULL, "DESCRIPTION" VARCHAR(1000) ); ALTER TABLE ONLY "METASTORE_DB_PROPERTIES" - ADD CONSTRAINT "UNIQUE_PROPERTY_KEY" UNIQUE ("PROPERTY_KEY"); - -ALTER TABLE ONLY "METASTORE_DB_PROPERTIES" - ADD CONSTRAINT "METASTORE_DB_PROPERTIES_pkey" PRIMARY KEY ("PROPERTY_ID"); + ADD CONSTRAINT "PROPERTY_KEY_PK" PRIMARY KEY ("PROPERTY_KEY"); diff --git metastore/scripts/upgrade/postgres/hive-schema-3.0.0.postgres.sql metastore/scripts/upgrade/postgres/hive-schema-3.0.0.postgres.sql index 89183e725ff66b9eb0a36c8f71679df30f85b1e0..91a71f5a503e40c4d6fe769fe0f59f45ac66d3cf 100644 --- metastore/scripts/upgrade/postgres/hive-schema-3.0.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-schema-3.0.0.postgres.sql @@ -609,7 +609,6 @@ CREATE TABLE "KEY_CONSTRAINTS" --- CREATE TABLE "METASTORE_DB_PROPERTIES" ( - "PROPERTY_ID" BIGINT NOT NULL, "PROPERTY_KEY" VARCHAR(255) NOT NULL, "PROPERTY_VALUE" VARCHAR(1000) NOT NULL, "DESCRIPTION" VARCHAR(1000) @@ -960,10 +959,8 @@ ALTER TABLE ONLY "ROLE_MAP" ADD CONSTRAINT "USERROLEMAPINDEX" UNIQUE ("PRINCIPAL_NAME", "ROLE_ID", "GRANTOR", "GRANTOR_TYPE"); ALTER TABLE ONLY "METASTORE_DB_PROPERTIES" - ADD CONSTRAINT "UNIQUE_PROPERTY_KEY" UNIQUE ("PROPERTY_KEY"); + ADD CONSTRAINT "PROPERTY_KEY_PK" PRIMARY KEY ("PROPERTY_KEY"); -ALTER TABLE ONLY "METASTORE_DB_PROPERTIES" - ADD CONSTRAINT "METASTORE_DB_PROPERTIES_pkey" PRIMARY KEY ("PROPERTY_ID"); -- -- Name: BUCKETING_COLS_N49; Type: INDEX; Schema: public; Owner: hiveuser; Tablespace: -- diff --git metastore/src/model/package.jdo metastore/src/model/package.jdo index 9c7c6914b73c3093eb9bb6da1df21730031a0088..87099efb7ea473bc593c2faaa7031242d7fa48cc 100644 --- metastore/src/model/package.jdo +++ metastore/src/model/package.jdo @@ -971,11 +971,8 @@ - - - - - + + @@ -984,9 +981,6 @@ - - -