diff --git metastore/scripts/upgrade/derby/010-HIVE-3072.derby.sql metastore/scripts/upgrade/derby/010-HIVE-3072.derby.sql index 6df3b52..b21c267 100644 --- metastore/scripts/upgrade/derby/010-HIVE-3072.derby.sql +++ metastore/scripts/upgrade/derby/010-HIVE-3072.derby.sql @@ -14,13 +14,13 @@ ALTER TABLE "APP"."SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_PK" PRIMAR ALTER TABLE "APP"."SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_FK1" FOREIGN KEY ("SD_ID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; -CREATE TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ("SD_ID" BIGINT NOT NULL, "STRING_LIST_ID_KID" BIGINT NOT NULL, "LOCATION" VARCHAR(4000)); +CREATE TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ("SD_ID" BIGINT NOT NULL, "STRING_LIST_ID_KID" BIGINT NOT NULL, "LOCATION" VARCHAR(4000)); -ALTER TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_PK" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); +ALTER TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_PK" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); -ALTER TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_FK1" FOREIGN KEY ("SD_ID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; +ALTER TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_FK1" FOREIGN KEY ("SD_ID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; -ALTER TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_FK2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; +ALTER TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_FK2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; CREATE TABLE "APP"."SKEWED_VALUES" ("SD_ID_OID" BIGINT NOT NULL, "STRING_LIST_ID_EID" BIGINT NOT NULL, "INTEGER_IDX" INTEGER NOT NULL); @@ -28,4 +28,4 @@ ALTER TABLE "APP"."SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_PK" PRIMARY KEY ALTER TABLE "APP"."SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_FK1" FOREIGN KEY ("SD_ID_OID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; -ALTER TABLE "APP"."SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_FK2" FOREIGN KEY ("STRING_LIST_ID_EID") REFERENCES "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; \ No newline at end of file +ALTER TABLE "APP"."SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_FK2" FOREIGN KEY ("STRING_LIST_ID_EID") REFERENCES "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; diff --git metastore/scripts/upgrade/derby/hive-schema-0.10.0.derby.sql metastore/scripts/upgrade/derby/hive-schema-0.10.0.derby.sql index 3fe974f..a92f73b 100644 --- metastore/scripts/upgrade/derby/hive-schema-0.10.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-schema-0.10.0.derby.sql @@ -86,7 +86,7 @@ CREATE TABLE "APP"."SKEWED_STRING_LIST_VALUES" ("STRING_LIST_ID" BIGINT NOT NULL CREATE TABLE "APP"."SKEWED_COL_NAMES" ("SD_ID" BIGINT NOT NULL, "SKEWED_COL_NAME" VARCHAR(256), "INTEGER_IDX" INTEGER NOT NULL); -CREATE TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ("SD_ID" BIGINT NOT NULL, "STRING_LIST_ID_KID" BIGINT NOT NULL, "LOCATION" VARCHAR(4000)); +CREATE TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ("SD_ID" BIGINT NOT NULL, "STRING_LIST_ID_KID" BIGINT NOT NULL, "LOCATION" VARCHAR(4000)); CREATE TABLE "APP"."SKEWED_VALUES" ("SD_ID_OID" BIGINT NOT NULL, "STRING_LIST_ID_EID" BIGINT NOT NULL, "INTEGER_IDX" INTEGER NOT NULL); @@ -203,7 +203,7 @@ ALTER TABLE "APP"."SKEWED_STRING_LIST_VALUES" ADD CONSTRAINT "SKEWED_STRING_LIST ALTER TABLE "APP"."SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_PK" PRIMARY KEY ("SD_ID", "INTEGER_IDX"); -ALTER TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_PK" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); +ALTER TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_PK" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); ALTER TABLE "APP"."SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_PK" PRIMARY KEY ("SD_ID_OID", "INTEGER_IDX"); @@ -272,9 +272,9 @@ ALTER TABLE "APP"."SKEWED_STRING_LIST_VALUES" ADD CONSTRAINT "SKEWED_STRING_LIST ALTER TABLE "APP"."SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_FK1" FOREIGN KEY ("SD_ID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; -ALTER TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_FK1" FOREIGN KEY ("SD_ID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; +ALTER TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_FK1" FOREIGN KEY ("SD_ID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; -ALTER TABLE "APP"."SKEWED_COL_VALUE_LOCATION_MAPPING" ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_FK2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; +ALTER TABLE "APP"."SKEWED_COL_VALUE_LOC_MAP" ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_FK2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; ALTER TABLE "APP"."SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_FK1" FOREIGN KEY ("SD_ID_OID") REFERENCES "APP"."SDS" ("SD_ID") ON DELETE NO ACTION ON UPDATE NO ACTION; diff --git metastore/scripts/upgrade/mysql/010-HIVE-3072.mysql.sql metastore/scripts/upgrade/mysql/010-HIVE-3072.mysql.sql index 5519b85..e6ad282 100644 --- metastore/scripts/upgrade/mysql/010-HIVE-3072.mysql.sql +++ metastore/scripts/upgrade/mysql/010-HIVE-3072.mysql.sql @@ -23,15 +23,15 @@ CREATE TABLE IF NOT EXISTS `SKEWED_COL_NAMES` ( CONSTRAINT `SKEWED_COL_NAMES_FK1` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOCATION_MAPPING` ( +CREATE TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOC_MAP` ( `SD_ID` bigint(20) NOT NULL, `STRING_LIST_ID_KID` bigint(20) NOT NULL, `LOCATION` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, PRIMARY KEY (`SD_ID`,`STRING_LIST_ID_KID`), - KEY `SKEWED_COL_VALUE_LOCATION_MAPPING_N49` (`STRING_LIST_ID_KID`), - KEY `SKEWED_COL_VALUE_LOCATION_MAPPING_N50` (`SD_ID`), - CONSTRAINT `SKEWED_COL_VALUE_LOCATION_MAPPING_FK2` FOREIGN KEY (`STRING_LIST_ID_KID`) REFERENCES `SKEWED_STRING_LIST` (`STRING_LIST_ID`), - CONSTRAINT `SKEWED_COL_VALUE_LOCATION_MAPPING_FK1` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`) + KEY `SKEWED_COL_VALUE_LOC_MAP_N49` (`STRING_LIST_ID_KID`), + KEY `SKEWED_COL_VALUE_LOC_MAP_N50` (`SD_ID`), + CONSTRAINT `SKEWED_COL_VALUE_LOC_MAP_FK2` FOREIGN KEY (`STRING_LIST_ID_KID`) REFERENCES `SKEWED_STRING_LIST` (`STRING_LIST_ID`), + CONSTRAINT `SKEWED_COL_VALUE_LOC_MAP_FK1` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE IF NOT EXISTS `SKEWED_VALUES` ( diff --git metastore/scripts/upgrade/mysql/hive-schema-0.10.0.mysql.sql metastore/scripts/upgrade/mysql/hive-schema-0.10.0.mysql.sql index 1e22fa2..57b9b5e 100644 --- metastore/scripts/upgrade/mysql/hive-schema-0.10.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-schema-0.10.0.mysql.sql @@ -474,20 +474,20 @@ CREATE TABLE IF NOT EXISTS `SKEWED_COL_NAMES` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `SKEWED_COL_VALUE_LOCATION_MAPPING` +-- Table structure for table `SKEWED_COL_VALUE_LOC_MAP` -- /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOCATION_MAPPING` ( +CREATE TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOC_MAP` ( `SD_ID` bigint(20) NOT NULL, `STRING_LIST_ID_KID` bigint(20) NOT NULL, `LOCATION` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, PRIMARY KEY (`SD_ID`,`STRING_LIST_ID_KID`), - KEY `SKEWED_COL_VALUE_LOCATION_MAPPING_N49` (`STRING_LIST_ID_KID`), - KEY `SKEWED_COL_VALUE_LOCATION_MAPPING_N50` (`SD_ID`), - CONSTRAINT `SKEWED_COL_VALUE_LOCATION_MAPPING_FK2` FOREIGN KEY (`STRING_LIST_ID_KID`) REFERENCES `SKEWED_STRING_LIST` (`STRING_LIST_ID`), - CONSTRAINT `SKEWED_COL_VALUE_LOCATION_MAPPING_FK1` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`) + KEY `SKEWED_COL_VALUE_LOC_MAP_N49` (`STRING_LIST_ID_KID`), + KEY `SKEWED_COL_VALUE_LOC_MAP_N50` (`SD_ID`), + CONSTRAINT `SKEWED_COL_VALUE_LOC_MAP_FK2` FOREIGN KEY (`STRING_LIST_ID_KID`) REFERENCES `SKEWED_STRING_LIST` (`STRING_LIST_ID`), + CONSTRAINT `SKEWED_COL_VALUE_LOC_MAP_FK1` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; diff --git metastore/scripts/upgrade/oracle/010-HIVE-3072.oracle.sql metastore/scripts/upgrade/oracle/010-HIVE-3072.oracle.sql index 799b2bf..38571e0 100644 --- metastore/scripts/upgrade/oracle/010-HIVE-3072.oracle.sql +++ metastore/scripts/upgrade/oracle/010-HIVE-3072.oracle.sql @@ -1,9 +1,9 @@ CREATE TABLE SKEWED_STRING_LIST ( - SD_ID NUMBER NOT NULL + STRING_LIST_ID NUMBER NOT NULL ); -ALTER TABLE SKEWED_STRING_LIST ADD CONSTRAINT SKEWED_STRING_LIST_PK PRIMARY KEY (SD_ID); +ALTER TABLE SKEWED_STRING_LIST ADD CONSTRAINT SKEWED_STRING_LIST_PK PRIMARY KEY (STRING_LIST_ID); CREATE TABLE SKEWED_STRING_LIST_VALUES ( @@ -27,18 +27,18 @@ ALTER TABLE SKEWED_COL_NAMES ADD CONSTRAINT SKEWED_COL_NAMES_PK PRIMARY KEY (SD_ ALTER TABLE SKEWED_COL_NAMES ADD CONSTRAINT SKEWED_COL_NAMES_FK1 FOREIGN KEY (SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; -CREATE TABLE SKEWED_COL_VALUE_LOCATION_MAPPING +CREATE TABLE SKEWED_COL_VALUE_LOC_MAP ( SD_ID NUMBER NOT NULL, STRING_LIST_ID_KID NUMBER NOT NULL, "LOCATION" VARCHAR2(4000) NULL ); -ALTER TABLE SKEWED_COL_VALUE_LOCATION_MAPPING ADD CONSTRAINT SKEWED_COL_VALUE_LOCATION_MAPPING_PK PRIMARY KEY (SD_ID,STRING_LIST_ID_KID); +ALTER TABLE SKEWED_COL_VALUE_LOC_MAP ADD CONSTRAINT SKEWED_COL_VALUE_LOC_MAP_PK PRIMARY KEY (SD_ID,STRING_LIST_ID_KID); -ALTER TABLE SKEWED_COL_VALUE_LOCATION_MAPPING ADD CONSTRAINT SKEWED_COL_VALUE_LOCATION_MAPPING_FK1 FOREIGN KEY (STRING_LIST_ID_KID) REFERENCES SKEWED_STRING_LIST (STRING_LIST_ID) INITIALLY DEFERRED ; +ALTER TABLE SKEWED_COL_VALUE_LOC_MAP ADD CONSTRAINT SKEWED_COL_VALUE_LOC_MAP_FK1 FOREIGN KEY (STRING_LIST_ID_KID) REFERENCES SKEWED_STRING_LIST (STRING_LIST_ID) INITIALLY DEFERRED ; -ALTER TABLE SKEWED_COL_VALUE_LOCATION_MAPPING ADD CONSTRAINT SKEWED_COL_VALUE_LOCATION_MAPPING_FK2 FOREIGN KEY (SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; +ALTER TABLE SKEWED_COL_VALUE_LOC_MAP ADD CONSTRAINT SKEWED_COL_VALUE_LOC_MAP_FK2 FOREIGN KEY (SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; CREATE TABLE SKEWED_VALUES ( @@ -51,4 +51,4 @@ ALTER TABLE SKEWED_VALUES ADD CONSTRAINT SKEWED_VALUES_PK PRIMARY KEY (SD_ID_OID ALTER TABLE SKEWED_VALUES ADD CONSTRAINT SKEWED_VALUES_FK1 FOREIGN KEY (STRING_LIST_ID_EID) REFERENCES SKEWED_STRING_LIST (STRING_LIST_ID) INITIALLY DEFERRED ; -ALTER TABLE SKEWED_VALUES ADD CONSTRAINT SKEWED_VALUES_FK2 FOREIGN KEY (SD_ID_OID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; \ No newline at end of file +ALTER TABLE SKEWED_VALUES ADD CONSTRAINT SKEWED_VALUES_FK2 FOREIGN KEY (SD_ID_OID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; diff --git metastore/scripts/upgrade/oracle/hive-schema-0.10.0.oracle.sql metastore/scripts/upgrade/oracle/hive-schema-0.10.0.oracle.sql index 7af52fb..a859548 100644 --- metastore/scripts/upgrade/oracle/hive-schema-0.10.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-schema-0.10.0.oracle.sql @@ -394,10 +394,10 @@ ALTER TABLE PARTITION_EVENTS ADD CONSTRAINT PARTITION_EVENTS_PK PRIMARY KEY (PAR -- Table SKEWED_STRING_LIST for classes [org.apache.hadoop.hive.metastore.model.MStringList] CREATE TABLE SKEWED_STRING_LIST ( - SD_ID NUMBER NOT NULL + STRING_LIST_ID NUMBER NOT NULL ); -ALTER TABLE SKEWED_STRING_LIST ADD CONSTRAINT SKEWED_STRING_LIST_PK PRIMARY KEY (SD_ID); +ALTER TABLE SKEWED_STRING_LIST ADD CONSTRAINT SKEWED_STRING_LIST_PK PRIMARY KEY (STRING_LIST_ID); CREATE TABLE SKEWED_STRING_LIST_VALUES ( @@ -421,7 +421,7 @@ ALTER TABLE SKEWED_COL_NAMES ADD CONSTRAINT SKEWED_COL_NAMES_PK PRIMARY KEY (SD_ ALTER TABLE SKEWED_COL_NAMES ADD CONSTRAINT SKEWED_COL_NAMES_FK1 FOREIGN KEY (SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; -CREATE TABLE SKEWED_COL_VALUE_LOCATION_MAPPING +CREATE TABLE SKEWED_COL_VALUE_LOC_MAP ( SD_ID NUMBER NOT NULL, STRING_LIST_ID_KID NUMBER NOT NULL, @@ -440,11 +440,11 @@ CREATE TABLE DELEGATION_TOKENS TOKEN VARCHAR2(767) NULL ); -ALTER TABLE SKEWED_COL_VALUE_LOCATION_MAPPING ADD CONSTRAINT SKEWED_COL_VALUE_LOCATION_MAPPING_PK PRIMARY KEY (SD_ID,STRING_LIST_ID_KID); +ALTER TABLE SKEWED_COL_VALUE_LOC_MAP ADD CONSTRAINT SKEWED_COL_VALUE_LOC_MAP_PK PRIMARY KEY (SD_ID,STRING_LIST_ID_KID); -ALTER TABLE SKEWED_COL_VALUE_LOCATION_MAPPING ADD CONSTRAINT SKEWED_COL_VALUE_LOCATION_MAPPING_FK1 FOREIGN KEY (STRING_LIST_ID_KID) REFERENCES SKEWED_STRING_LIST (STRING_LIST_ID) INITIALLY DEFERRED ; +ALTER TABLE SKEWED_COL_VALUE_LOC_MAP ADD CONSTRAINT SKEWED_COL_VALUE_LOC_MAP_FK1 FOREIGN KEY (STRING_LIST_ID_KID) REFERENCES SKEWED_STRING_LIST (STRING_LIST_ID) INITIALLY DEFERRED ; -ALTER TABLE SKEWED_COL_VALUE_LOCATION_MAPPING ADD CONSTRAINT SKEWED_COL_VALUE_LOCATION_MAPPING_FK2 FOREIGN KEY (SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; +ALTER TABLE SKEWED_COL_VALUE_LOC_MAP ADD CONSTRAINT SKEWED_COL_VALUE_LOC_MAP_FK2 FOREIGN KEY (SD_ID) REFERENCES SDS (SD_ID) INITIALLY DEFERRED ; CREATE TABLE SKEWED_VALUES ( diff --git metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql index f588284..a2e2a6c 100644 --- metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql +++ metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql @@ -31,20 +31,20 @@ ALTER TABLE ONLY "SKEWED_COL_NAMES" ALTER TABLE ONLY "SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_fkey" FOREIGN KEY ("SD_ID") REFERENCES "SDS"("SD_ID") DEFERRABLE; -CREATE TABLE "SKEWED_COL_VALUE_LOCATION_MAPPING" ( +CREATE TABLE "SKEWED_COL_VALUE_LOC_MAP" ( "SD_ID" bigint NOT NULL, "STRING_LIST_ID_KID" bigint NOT NULL, "LOCATION" character varying(4000) DEFAULT NULL::character varying ); -ALTER TABLE ONLY "SKEWED_COL_VALUE_LOCATION_MAPPING" - ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_pkey" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); +ALTER TABLE ONLY "SKEWED_COL_VALUE_LOC_MAP" + ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_pkey" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); -ALTER TABLE ONLY "SKEWED_COL_VALUE_LOCATION_MAPPING" - ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_fkey1" FOREIGN KEY ("SD_ID") REFERENCES "SDS"("SD_ID") DEFERRABLE; +ALTER TABLE ONLY "SKEWED_COL_VALUE_LOC_MAP" + ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_fkey1" FOREIGN KEY ("SD_ID") REFERENCES "SDS"("SD_ID") DEFERRABLE; -ALTER TABLE ONLY "SKEWED_COL_VALUE_LOCATION_MAPPING" - ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_fkey2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "SKEWED_STRING_LIST"("STRING_LIST_ID") DEFERRABLE; +ALTER TABLE ONLY "SKEWED_COL_VALUE_LOC_MAP" + ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_fkey2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "SKEWED_STRING_LIST"("STRING_LIST_ID") DEFERRABLE; CREATE TABLE "SKEWED_VALUES" ( "SD_ID_OID" bigint NOT NULL, @@ -59,4 +59,4 @@ ALTER TABLE ONLY "SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_fkey1" FOREIGN KEY ("STRING_LIST_ID_EID") REFERENCES "SKEWED_STRING_LIST"("STRING_LIST_ID") DEFERRABLE; ALTER TABLE ONLY "SKEWED_VALUES" - ADD CONSTRAINT "SKEWED_VALUES_fkey2" FOREIGN KEY ("SD_ID_OID") REFERENCES "SDS"("SD_ID") DEFERRABLE; \ No newline at end of file + ADD CONSTRAINT "SKEWED_VALUES_fkey2" FOREIGN KEY ("SD_ID_OID") REFERENCES "SDS"("SD_ID") DEFERRABLE; diff --git metastore/scripts/upgrade/postgres/hive-schema-0.10.0.postgres.sql metastore/scripts/upgrade/postgres/hive-schema-0.10.0.postgres.sql index f7e8d32..1712284 100644 --- metastore/scripts/upgrade/postgres/hive-schema-0.10.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-schema-0.10.0.postgres.sql @@ -462,7 +462,7 @@ CREATE TABLE "SKEWED_COL_NAMES" ( "INTEGER_IDX" bigint NOT NULL ); -CREATE TABLE "SKEWED_COL_VALUE_LOCATION_MAPPING" ( +CREATE TABLE "SKEWED_COL_VALUE_LOC_MAP" ( "SD_ID" bigint NOT NULL, "STRING_LIST_ID_KID" bigint NOT NULL, "LOCATION" character varying(4000) DEFAULT NULL::character varying @@ -831,8 +831,8 @@ ALTER TABLE ONLY SKEWED_STRING_LIST_VALUES" ALTER TABLE ONLY "SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_pkey" PRIMARY KEY ("SD_ID", "INTEGER_IDX"); -ALTER TABLE ONLY "SKEWED_COL_VALUE_LOCATION_MAPPING" - ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_pkey" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); +ALTER TABLE ONLY "SKEWED_COL_VALUE_LOC_MAP" + ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_pkey" PRIMARY KEY ("SD_ID", "STRING_LIST_ID_KID"); ALTER TABLE ONLY "SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_pkey" PRIMARY KEY ("SD_ID_OID", "INTEGER_IDX"); @@ -1132,11 +1132,11 @@ ALTER TABLE ONLY "SKEWED_COL_NAMES" ADD CONSTRAINT "SKEWED_COL_NAMES_fkey" FOREIGN KEY ("SD_ID") REFERENCES "SDS"("SD_ID") DEFERRABLE; -ALTER TABLE ONLY "SKEWED_COL_VALUE_LOCATION_MAPPING" - ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_fkey1" FOREIGN KEY ("SD_ID") REFERENCES "SDS"("SD_ID") DEFERRABLE; +ALTER TABLE ONLY "SKEWED_COL_VALUE_LOC_MAP" + ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_fkey1" FOREIGN KEY ("SD_ID") REFERENCES "SDS"("SD_ID") DEFERRABLE; -ALTER TABLE ONLY "SKEWED_COL_VALUE_LOCATION_MAPPING" - ADD CONSTRAINT "SKEWED_COL_VALUE_LOCATION_MAPPING_fkey2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "SKEWED_STRING_LIST"("STRING_LIST_ID") DEFERRABLE; +ALTER TABLE ONLY "SKEWED_COL_VALUE_LOC_MAP" + ADD CONSTRAINT "SKEWED_COL_VALUE_LOC_MAP_fkey2" FOREIGN KEY ("STRING_LIST_ID_KID") REFERENCES "SKEWED_STRING_LIST"("STRING_LIST_ID") DEFERRABLE; ALTER TABLE ONLY "SKEWED_VALUES" ADD CONSTRAINT "SKEWED_VALUES_fkey1" FOREIGN KEY ("STRING_LIST_ID_EID") REFERENCES "SKEWED_STRING_LIST"("STRING_LIST_ID") DEFERRABLE; diff --git metastore/src/model/package.jdo metastore/src/model/package.jdo index 9abd490..719778a 100644 --- metastore/src/model/package.jdo +++ metastore/src/model/package.jdo @@ -318,7 +318,7 @@ - +