diff --git standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.0.0.derby.sql standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.0.0.derby.sql index 4994763d50..0822ad4e7f 100644 --- standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.0.0.derby.sql +++ standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.0.0.derby.sql @@ -86,7 +86,7 @@ CREATE TABLE "APP"."SDS" ("SD_ID" BIGINT NOT NULL, "INPUT_FORMAT" VARCHAR(4000), CREATE TABLE "APP"."SEQUENCE_TABLE" ("SEQUENCE_NAME" VARCHAR(256) NOT NULL, "NEXT_VAL" BIGINT NOT NULL); CREATE TABLE "APP"."TAB_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "COLUMN_NAME" VARCHAR(767) NOT NULL, @@ -134,7 +134,7 @@ CREATE TABLE "APP"."MASTER_KEYS" ("KEY_ID" INTEGER NOT NULL generated always as CREATE TABLE "APP"."DELEGATION_TOKENS" ( "TOKEN_IDENT" VARCHAR(767) NOT NULL, "TOKEN" VARCHAR(767)); CREATE TABLE "APP"."PART_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "PARTITION_NAME" VARCHAR(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.0.derby.sql standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.0.derby.sql index 74582e1c63..f9f285d885 100644 --- standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.0.derby.sql +++ standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.1.0.derby.sql @@ -86,7 +86,7 @@ CREATE TABLE "APP"."SDS" ("SD_ID" BIGINT NOT NULL, "INPUT_FORMAT" VARCHAR(4000), CREATE TABLE "APP"."SEQUENCE_TABLE" ("SEQUENCE_NAME" VARCHAR(256) NOT NULL, "NEXT_VAL" BIGINT NOT NULL); CREATE TABLE "APP"."TAB_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "COLUMN_NAME" VARCHAR(767) NOT NULL, @@ -134,7 +134,7 @@ CREATE TABLE "APP"."MASTER_KEYS" ("KEY_ID" INTEGER NOT NULL generated always as CREATE TABLE "APP"."DELEGATION_TOKENS" ( "TOKEN_IDENT" VARCHAR(767) NOT NULL, "TOKEN" VARCHAR(767)); CREATE TABLE "APP"."PART_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "PARTITION_NAME" VARCHAR(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql index 74ca44e081..376b4337d1 100644 --- standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql +++ standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql @@ -87,7 +87,7 @@ CREATE TABLE "APP"."SDS" ("SD_ID" BIGINT NOT NULL, "INPUT_FORMAT" VARCHAR(4000), CREATE TABLE "APP"."SEQUENCE_TABLE" ("SEQUENCE_NAME" VARCHAR(256) NOT NULL, "NEXT_VAL" BIGINT NOT NULL); CREATE TABLE "APP"."TAB_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "COLUMN_NAME" VARCHAR(767) NOT NULL, @@ -135,7 +135,7 @@ CREATE TABLE "APP"."MASTER_KEYS" ("KEY_ID" INTEGER NOT NULL generated always as CREATE TABLE "APP"."DELEGATION_TOKENS" ( "TOKEN_IDENT" VARCHAR(767) NOT NULL, "TOKEN" VARCHAR(767)); CREATE TABLE "APP"."PART_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "PARTITION_NAME" VARCHAR(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql index 811f2b13fe..df0e30b2f0 100644 --- standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql +++ standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql @@ -88,7 +88,7 @@ CREATE TABLE "APP"."SDS" ("SD_ID" BIGINT NOT NULL, "INPUT_FORMAT" VARCHAR(4000), CREATE TABLE "APP"."SEQUENCE_TABLE" ("SEQUENCE_NAME" VARCHAR(256) NOT NULL, "NEXT_VAL" BIGINT NOT NULL); CREATE TABLE "APP"."TAB_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "COLUMN_NAME" VARCHAR(767) NOT NULL, @@ -137,7 +137,7 @@ CREATE TABLE "APP"."MASTER_KEYS" ("KEY_ID" INTEGER NOT NULL generated always as CREATE TABLE "APP"."DELEGATION_TOKENS" ( "TOKEN_IDENT" VARCHAR(767) NOT NULL, "TOKEN" VARCHAR(767)); CREATE TABLE "APP"."PART_COL_STATS"( - "CAT_NAME" VARCHAR(256) NOT NULL, + "CAT_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "DB_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(256) NOT NULL, "PARTITION_NAME" VARCHAR(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql index aded9ce9c0..cc6f6b53db 100644 --- standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql +++ standalone-metastore/metastore-server/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql @@ -215,6 +215,10 @@ UPDATE "APP"."PART_COL_STATS" ALTER TABLE "APP"."TAB_COL_STATS" ALTER COLUMN "CAT_NAME" NOT NULL; ALTER TABLE "APP"."PART_COL_STATS" ALTER COLUMN "CAT_NAME" NOT NULL; +-- Add the defaults +ALTER TABLE "APP"."TAB_COL_STATS" ALTER COLUMN "CAT_NAME" SET DEFAULT 'hive'; +ALTER TABLE "APP"."PART_COL_STATS" ALTER COLUMN "CAT_NAME" SET DEFAULT 'hive'; + -- Rebuild the index for Part col stats. No such index for table stats, which seems weird DROP INDEX "APP"."PCS_STATS_IDX"; CREATE INDEX "APP"."PCS_STATS_IDX" ON "APP"."PART_COL_STATS" ("CAT_NAME", "DB_NAME","TABLE_NAME","COLUMN_NAME","PARTITION_NAME"); diff --git standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql index 74460368ca..592d9ecc6d 100644 --- standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql +++ standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql @@ -94,7 +94,7 @@ CREATE TABLE PART_COL_STATS PART_ID bigint NULL, PARTITION_NAME nvarchar(767) NOT NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive' ); ALTER TABLE PART_COL_STATS ADD CONSTRAINT PART_COL_STATS_PK PRIMARY KEY (CS_ID); @@ -238,7 +238,7 @@ CREATE TABLE TAB_COL_STATS NUM_TRUES bigint NULL, TBL_ID bigint NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive' ); ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_PK PRIMARY KEY (CS_ID); diff --git standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql index ca2729d2be..9936c44ab3 100644 --- standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql +++ standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.1.0.mssql.sql @@ -94,7 +94,7 @@ CREATE TABLE PART_COL_STATS PART_ID bigint NULL, PARTITION_NAME nvarchar(767) NOT NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive' ); ALTER TABLE PART_COL_STATS ADD CONSTRAINT PART_COL_STATS_PK PRIMARY KEY (CS_ID); @@ -242,7 +242,7 @@ CREATE TABLE TAB_COL_STATS NUM_TRUES bigint NULL, TBL_ID bigint NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive' ); ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_PK PRIMARY KEY (CS_ID); diff --git standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.2.0.mssql.sql standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.2.0.mssql.sql index 345c046db9..6bfbc8900a 100644 --- standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.2.0.mssql.sql +++ standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-3.2.0.mssql.sql @@ -94,7 +94,7 @@ CREATE TABLE PART_COL_STATS PART_ID bigint NULL, PARTITION_NAME nvarchar(767) NOT NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive' ); ALTER TABLE PART_COL_STATS ADD CONSTRAINT PART_COL_STATS_PK PRIMARY KEY (CS_ID); @@ -242,7 +242,7 @@ CREATE TABLE TAB_COL_STATS NUM_TRUES bigint NULL, TBL_ID bigint NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive' ); ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_PK PRIMARY KEY (CS_ID); diff --git standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql index e5c4582f4a..f36e3572be 100644 --- standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql +++ standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql @@ -94,7 +94,7 @@ CREATE TABLE PART_COL_STATS PART_ID bigint NULL, PARTITION_NAME nvarchar(767) NOT NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL, + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive', "ENGINE" nvarchar(128) NOT NULL ); @@ -243,7 +243,7 @@ CREATE TABLE TAB_COL_STATS NUM_TRUES bigint NULL, TBL_ID bigint NULL, "TABLE_NAME" nvarchar(256) NOT NULL, - "CAT_NAME" nvarchar(256) NOT NULL, + "CAT_NAME" nvarchar(256) NOT NULL DEFAULT 'hive', "ENGINE" nvarchar(128) NOT NULL ); diff --git standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql index 53edaa2488..18b32213c2 100644 --- standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql +++ standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql @@ -295,6 +295,10 @@ UPDATE PART_COL_STATS ALTER TABLE TAB_COL_STATS ALTER COLUMN CAT_NAME nvarchar(256) NOT NULL; ALTER TABLE PART_COL_STATS ALTER COLUMN CAT_NAME nvarchar(256) NOT NULL; +-- Add the not null constraint and defaults +ALTER TABLE TAB_COL_STATS ADD DEFAULT 'hive' FOR CAT_NAME; +ALTER TABLE PART_COL_STATS ADD DEFAULT 'hive' FOR CAT_NAME; + -- Rebuild the index for Part col stats. No such index for table stats, which seems weird DROP INDEX PCS_STATS_IDX ON PART_COL_STATS; CREATE INDEX PCS_STATS_IDX ON PART_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COLUMN_NAME, PARTITION_NAME); diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql index c793102ffa..25e5441df3 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql @@ -702,7 +702,7 @@ CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( -- CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, @@ -731,7 +731,7 @@ CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( -- CREATE TABLE IF NOT EXISTS `PART_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `PARTITION_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql index 048162c98a..166cf9d4f9 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.1.0.mysql.sql @@ -709,7 +709,7 @@ CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( -- CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, @@ -739,7 +739,7 @@ CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, -- CREATE TABLE IF NOT EXISTS `PART_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `PARTITION_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql index d791dd9d99..be8a7b2e92 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-3.2.0.mysql.sql @@ -711,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( -- CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, @@ -741,7 +741,7 @@ CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, -- CREATE TABLE IF NOT EXISTS `PART_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `PARTITION_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql index e5eb9a1fd6..3afb912fa7 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql @@ -714,7 +714,7 @@ CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( -- CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, @@ -745,7 +745,7 @@ CREATE INDEX TAB_COL_STATS_IDX ON TAB_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, -- CREATE TABLE IF NOT EXISTS `PART_COL_STATS` ( `CS_ID` bigint(20) NOT NULL, - `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `CAT_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT 'hive', `DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `PARTITION_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql index ab27c1889d..2ded798271 100644 --- standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql +++ standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql @@ -254,9 +254,9 @@ UPDATE `TAB_COL_STATS` UPDATE `PART_COL_STATS` SET `CAT_NAME` = 'hive'; --- Add the not null constraint -ALTER TABLE `TAB_COL_STATS` CHANGE COLUMN `CAT_NAME` `CAT_NAME` varchar(256) NOT NULL; -ALTER TABLE `PART_COL_STATS` CHANGE COLUMN `CAT_NAME` `CAT_NAME` varchar(256) NOT NULL; +-- Add the not null constraint and defaults +ALTER TABLE `TAB_COL_STATS` CHANGE COLUMN `CAT_NAME` `CAT_NAME` varchar(256) NOT NULL DEFAULT 'hive'; +ALTER TABLE `PART_COL_STATS` CHANGE COLUMN `CAT_NAME` `CAT_NAME` varchar(256) NOT NULL DEFAULT 'hive'; -- Rebuild the index for Part col stats. No such index for table stats, which seems weird DROP INDEX `PCS_STATS_IDX` ON `PART_COL_STATS`; diff --git standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql index be4c7c3605..4cb0d62040 100644 --- standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql +++ standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql @@ -513,7 +513,7 @@ ALTER TABLE DBS ADD CONSTRAINT CTLGS_FK FOREIGN KEY (CTLG_NAME) REFERENCES CTLGS CREATE TABLE TAB_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, COLUMN_NAME VARCHAR2(767) NOT NULL, @@ -550,7 +550,7 @@ CREATE INDEX TAB_COL_STATS_N49 ON TAB_COL_STATS(TBL_ID); CREATE TABLE PART_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, PARTITION_NAME VARCHAR2(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql index 958e62acd0..0640413dc0 100644 --- standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql +++ standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.1.0.oracle.sql @@ -520,7 +520,7 @@ ALTER TABLE DBS ADD CONSTRAINT CTLGS_FK FOREIGN KEY (CTLG_NAME) REFERENCES CTLGS CREATE TABLE TAB_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, COLUMN_NAME VARCHAR2(767) NOT NULL, @@ -559,7 +559,7 @@ ALTER TABLE VERSION ADD CONSTRAINT VERSION_PK PRIMARY KEY (VER_ID); CREATE TABLE PART_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, PARTITION_NAME VARCHAR2(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.2.0.oracle.sql standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.2.0.oracle.sql index 42dc48f727..ce63f8f10d 100644 --- standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.2.0.oracle.sql +++ standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-3.2.0.oracle.sql @@ -522,7 +522,7 @@ ALTER TABLE DBS ADD CONSTRAINT CTLGS_FK FOREIGN KEY (CTLG_NAME) REFERENCES CTLGS CREATE TABLE TAB_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, COLUMN_NAME VARCHAR2(767) NOT NULL, @@ -561,7 +561,7 @@ ALTER TABLE VERSION ADD CONSTRAINT VERSION_PK PRIMARY KEY (VER_ID); CREATE TABLE PART_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, PARTITION_NAME VARCHAR2(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql index aefef5e0c8..85052081d3 100644 --- standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql +++ standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql @@ -525,7 +525,7 @@ ALTER TABLE DBS ADD CONSTRAINT CTLGS_FK FOREIGN KEY (CTLG_NAME) REFERENCES CTLGS CREATE TABLE TAB_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, COLUMN_NAME VARCHAR2(767) NOT NULL, @@ -565,7 +565,7 @@ ALTER TABLE VERSION ADD CONSTRAINT VERSION_PK PRIMARY KEY (VER_ID); CREATE TABLE PART_COL_STATS ( CS_ID NUMBER NOT NULL, - CAT_NAME VARCHAR2(256) NOT NULL, + CAT_NAME VARCHAR2(256) NOT NULL DEFAULT 'hive', DB_NAME VARCHAR2(128) NOT NULL, TABLE_NAME VARCHAR2(256) NOT NULL, PARTITION_NAME VARCHAR2(767) NOT NULL, diff --git standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql index a6dd445b11..d0f4160ebf 100644 --- standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql +++ standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql @@ -269,9 +269,9 @@ UPDATE TAB_COL_STATS UPDATE PART_COL_STATS SET CAT_NAME = 'hive'; --- Add the not null constraint -ALTER TABLE TAB_COL_STATS MODIFY CAT_NAME NOT NULL; -ALTER TABLE PART_COL_STATS MODIFY CAT_NAME NOT NULL; +-- Add the not null constraint and default +ALTER TABLE TAB_COL_STATS MODIFY CAT_NAME DEFAULT 'hive' NOT NULL; +ALTER TABLE PART_COL_STATS MODIFY CAT_NAME DEFAULT 'hive' NOT NULL; -- Rebuild the index for Part col stats. No such index for table stats, which seems weird DROP INDEX PCS_STATS_IDX; diff --git standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql index a531fc5efd..8ac056b54a 100644 --- standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql +++ standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql @@ -291,6 +291,10 @@ UPDATE "PART_COL_STATS" ALTER TABLE "TAB_COL_STATS" ALTER COLUMN "CAT_NAME" SET NOT NULL; ALTER TABLE "PART_COL_STATS" ALTER COLUMN "CAT_NAME" SET NOT NULL; +-- Add the defaults +ALTER TABLE "TAB_COL_STATS" ALTER COLUMN "CAT_NAME" SET DEFAULT 'hive'; +ALTER TABLE "PART_COL_STATS" ALTER COLUMN "CAT_NAME" SET DEFAULT 'hive'; + -- Rebuild the index for Part col stats. No such index for table stats, which seems weird DROP INDEX "PCS_STATS_IDX"; CREATE INDEX "PCS_STATS_IDX" ON "PART_COL_STATS" ("CAT_NAME", "DB_NAME", "TABLE_NAME", "COLUMN_NAME", "PARTITION_NAME");