diff --git metastore/scripts/upgrade/derby/037-HIVE-14496.derby.sql metastore/scripts/upgrade/derby/037-HIVE-14496.derby.sql index 0c294cee94..86c6673afd 100644 --- metastore/scripts/upgrade/derby/037-HIVE-14496.derby.sql +++ metastore/scripts/upgrade/derby/037-HIVE-14496.derby.sql @@ -5,4 +5,5 @@ ALTER TABLE "APP"."TBLS" ADD "IS_REWRITE_ENABLED" CHAR(1); UPDATE "APP"."TBLS" SET "IS_REWRITE_ENABLED" = 'N'; -- Step 3: Alter the column to disallow null values +ALTER TABLE "APP"."TBLS" ALTER COLUMN "IS_REWRITE_ENABLED" SET DEFAULT 'N'; ALTER TABLE "APP"."TBLS" ALTER COLUMN "IS_REWRITE_ENABLED" NOT NULL; diff --git metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql index 6dd3deec7b..2e3aaf00fb 100644 --- metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql @@ -60,7 +60,7 @@ CREATE TABLE "APP"."COLUMNS" ("SD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(256), " CREATE TABLE "APP"."ROLES" ("ROLE_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "ROLE_NAME" VARCHAR(128)); -CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL); +CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N'); CREATE TABLE "APP"."PARTITION_KEYS" ("TBL_ID" BIGINT NOT NULL, "PKEY_COMMENT" VARCHAR(4000), "PKEY_NAME" VARCHAR(128) NOT NULL, "PKEY_TYPE" VARCHAR(767) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL); diff --git metastore/scripts/upgrade/derby/hive-schema-2.3.0.derby.sql metastore/scripts/upgrade/derby/hive-schema-2.3.0.derby.sql index b2916c88ba..3c4d9ee535 100644 --- metastore/scripts/upgrade/derby/hive-schema-2.3.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-schema-2.3.0.derby.sql @@ -60,7 +60,7 @@ CREATE TABLE "APP"."COLUMNS" ("SD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(256), " CREATE TABLE "APP"."ROLES" ("ROLE_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "ROLE_NAME" VARCHAR(128)); -CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL); +CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N'); CREATE TABLE "APP"."PARTITION_KEYS" ("TBL_ID" BIGINT NOT NULL, "PKEY_COMMENT" VARCHAR(4000), "PKEY_NAME" VARCHAR(128) NOT NULL, "PKEY_TYPE" VARCHAR(767) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL); 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 1d21fa2f47..16aae7a5f5 100644 --- metastore/scripts/upgrade/derby/hive-schema-3.0.0.derby.sql +++ metastore/scripts/upgrade/derby/hive-schema-3.0.0.derby.sql @@ -60,7 +60,7 @@ CREATE TABLE "APP"."COLUMNS" ("SD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(256), " CREATE TABLE "APP"."ROLES" ("ROLE_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "ROLE_NAME" VARCHAR(128)); -CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL); +CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N'); CREATE TABLE "APP"."PARTITION_KEYS" ("TBL_ID" BIGINT NOT NULL, "PKEY_COMMENT" VARCHAR(4000), "PKEY_NAME" VARCHAR(128) NOT NULL, "PKEY_TYPE" VARCHAR(767) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL); diff --git metastore/scripts/upgrade/mssql/022-HIVE-14496.mssql.sql metastore/scripts/upgrade/mssql/022-HIVE-14496.mssql.sql index 0c59467005..c3ee236507 100644 --- metastore/scripts/upgrade/mssql/022-HIVE-14496.mssql.sql +++ metastore/scripts/upgrade/mssql/022-HIVE-14496.mssql.sql @@ -1 +1 @@ -ALTER TABLE TBLS ADD IS_REWRITE_ENABLED bit NOT NULL DEFAULT 0; +ALTER TABLE TBLS ADD IS_REWRITE_ENABLED bit NOT NULL DEFAULT(0); diff --git metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql index b6fdc7bdf1..7cd49b3ec8 100644 --- metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql @@ -359,7 +359,7 @@ CREATE TABLE TBLS TBL_TYPE nvarchar(128) NULL, VIEW_EXPANDED_TEXT text NULL, VIEW_ORIGINAL_TEXT text NULL, - IS_REWRITE_ENABLED bit NOT NULL + IS_REWRITE_ENABLED bit NOT NULL DEFAULT 0 ); ALTER TABLE TBLS ADD CONSTRAINT TBLS_PK PRIMARY KEY (TBL_ID); diff --git metastore/scripts/upgrade/mssql/hive-schema-2.3.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-2.3.0.mssql.sql index c117a32d08..3df5369fac 100644 --- metastore/scripts/upgrade/mssql/hive-schema-2.3.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-2.3.0.mssql.sql @@ -359,7 +359,7 @@ CREATE TABLE TBLS TBL_TYPE nvarchar(128) NULL, VIEW_EXPANDED_TEXT text NULL, VIEW_ORIGINAL_TEXT text NULL, - IS_REWRITE_ENABLED bit NOT NULL + IS_REWRITE_ENABLED bit NOT NULL DEFAULT 0 ); ALTER TABLE TBLS ADD CONSTRAINT TBLS_PK PRIMARY KEY (TBL_ID); 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 b189c31ff6..70e126770f 100644 --- metastore/scripts/upgrade/mssql/hive-schema-3.0.0.mssql.sql +++ metastore/scripts/upgrade/mssql/hive-schema-3.0.0.mssql.sql @@ -361,7 +361,7 @@ CREATE TABLE TBLS TBL_TYPE nvarchar(128) NULL, VIEW_EXPANDED_TEXT text NULL, VIEW_ORIGINAL_TEXT text NULL, - IS_REWRITE_ENABLED bit NOT NULL + IS_REWRITE_ENABLED bit NOT NULL DEFAULT 0 ); ALTER TABLE TBLS ADD CONSTRAINT TBLS_PK PRIMARY KEY (TBL_ID); diff --git metastore/scripts/upgrade/mysql/037-HIVE-14496.mysql.sql metastore/scripts/upgrade/mysql/037-HIVE-14496.mysql.sql index 6cccefe546..5a5a5e42c1 100644 --- metastore/scripts/upgrade/mysql/037-HIVE-14496.mysql.sql +++ metastore/scripts/upgrade/mysql/037-HIVE-14496.mysql.sql @@ -5,4 +5,4 @@ ALTER TABLE `TBLS` ADD `IS_REWRITE_ENABLED` bit(1); UPDATE `TBLS` SET `IS_REWRITE_ENABLED` = false; -- Step 3: Alter the column to disallow null values -ALTER TABLE `TBLS` MODIFY COLUMN `IS_REWRITE_ENABLED` bit(1) NOT NULL; +ALTER TABLE `TBLS` MODIFY COLUMN `IS_REWRITE_ENABLED` bit(1) NOT NULL DEFAULT 0; diff --git metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql index d1852dfe7f..9b20b487ed 100644 --- metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql @@ -587,7 +587,7 @@ CREATE TABLE IF NOT EXISTS `TBLS` ( `TBL_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `VIEW_EXPANDED_TEXT` mediumtext, `VIEW_ORIGINAL_TEXT` mediumtext, - `IS_REWRITE_ENABLED` bit(1) NOT NULL, + `IS_REWRITE_ENABLED` bit(1) NOT NULL DEFAULT 0, PRIMARY KEY (`TBL_ID`), UNIQUE KEY `UNIQUETABLE` (`TBL_NAME`,`DB_ID`), KEY `TBLS_N50` (`SD_ID`), diff --git metastore/scripts/upgrade/mysql/hive-schema-2.3.0.mysql.sql metastore/scripts/upgrade/mysql/hive-schema-2.3.0.mysql.sql index 1403e38569..133edcb90c 100644 --- metastore/scripts/upgrade/mysql/hive-schema-2.3.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-schema-2.3.0.mysql.sql @@ -587,7 +587,7 @@ CREATE TABLE IF NOT EXISTS `TBLS` ( `TBL_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `VIEW_EXPANDED_TEXT` mediumtext, `VIEW_ORIGINAL_TEXT` mediumtext, - `IS_REWRITE_ENABLED` bit(1) NOT NULL, + `IS_REWRITE_ENABLED` bit(1) NOT NULL DEFAULT 0, PRIMARY KEY (`TBL_ID`), UNIQUE KEY `UNIQUETABLE` (`TBL_NAME`,`DB_ID`), KEY `TBLS_N50` (`SD_ID`), 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 702a929582..9b66e8325c 100644 --- metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql @@ -587,7 +587,7 @@ CREATE TABLE IF NOT EXISTS `TBLS` ( `TBL_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `VIEW_EXPANDED_TEXT` mediumtext, `VIEW_ORIGINAL_TEXT` mediumtext, - `IS_REWRITE_ENABLED` bit(1) NOT NULL, + `IS_REWRITE_ENABLED` bit(1) NOT NULL DEFAULT 0, PRIMARY KEY (`TBL_ID`), UNIQUE KEY `UNIQUETABLE` (`TBL_NAME`,`DB_ID`), KEY `TBLS_N50` (`SD_ID`), diff --git metastore/scripts/upgrade/oracle/037-HIVE-14496.oracle.sql metastore/scripts/upgrade/oracle/037-HIVE-14496.oracle.sql index 2b3bb77b0a..73ee21d6a6 100644 --- metastore/scripts/upgrade/oracle/037-HIVE-14496.oracle.sql +++ metastore/scripts/upgrade/oracle/037-HIVE-14496.oracle.sql @@ -5,5 +5,6 @@ ALTER TABLE TBLS ADD IS_REWRITE_ENABLED NUMBER(1) NULL; UPDATE TBLS SET IS_REWRITE_ENABLED = 0; -- Step 3: Alter the column to disallow null values +ALTER TABLE TBLS MODIFY(IS_REWRITE_ENABLED DEFAULT 0); ALTER TABLE TBLS MODIFY(IS_REWRITE_ENABLED NOT NULL); ALTER TABLE TBLS ADD CONSTRAINT REWRITE_CHECK CHECK (IS_REWRITE_ENABLED IN (1,0)); diff --git metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql index 4aaa5e72d0..3824ea9383 100644 --- metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql @@ -376,7 +376,7 @@ CREATE TABLE TBLS TBL_TYPE VARCHAR2(128) NULL, VIEW_EXPANDED_TEXT CLOB NULL, VIEW_ORIGINAL_TEXT CLOB NULL, - IS_REWRITE_ENABLED NUMBER(1) NOT NULL CHECK (IS_REWRITE_ENABLED IN (1,0)) + IS_REWRITE_ENABLED NUMBER(1) DEFAULT 0 NOT NULL CHECK (IS_REWRITE_ENABLED IN (1,0)) ); ALTER TABLE TBLS ADD CONSTRAINT TBLS_PK PRIMARY KEY (TBL_ID); diff --git metastore/scripts/upgrade/oracle/hive-schema-2.3.0.oracle.sql metastore/scripts/upgrade/oracle/hive-schema-2.3.0.oracle.sql index 259a2ad0b8..3b2b512e95 100644 --- metastore/scripts/upgrade/oracle/hive-schema-2.3.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-schema-2.3.0.oracle.sql @@ -376,7 +376,7 @@ CREATE TABLE TBLS TBL_TYPE VARCHAR2(128) NULL, VIEW_EXPANDED_TEXT CLOB NULL, VIEW_ORIGINAL_TEXT CLOB NULL, - IS_REWRITE_ENABLED NUMBER(1) NOT NULL CHECK (IS_REWRITE_ENABLED IN (1,0)) + IS_REWRITE_ENABLED NUMBER(1) DEFAULT 0 NOT NULL CHECK (IS_REWRITE_ENABLED IN (1,0)) ); ALTER TABLE TBLS ADD CONSTRAINT TBLS_PK PRIMARY KEY (TBL_ID); 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 6e9c7ff5d1..de55e70414 100644 --- metastore/scripts/upgrade/oracle/hive-schema-3.0.0.oracle.sql +++ metastore/scripts/upgrade/oracle/hive-schema-3.0.0.oracle.sql @@ -376,7 +376,7 @@ CREATE TABLE TBLS TBL_TYPE VARCHAR2(128) NULL, VIEW_EXPANDED_TEXT CLOB NULL, VIEW_ORIGINAL_TEXT CLOB NULL, - IS_REWRITE_ENABLED NUMBER(1) NOT NULL CHECK (IS_REWRITE_ENABLED IN (1,0)) + IS_REWRITE_ENABLED NUMBER(1) DEFAULT 0 NOT NULL CHECK (IS_REWRITE_ENABLED IN (1,0)) ); ALTER TABLE TBLS ADD CONSTRAINT TBLS_PK PRIMARY KEY (TBL_ID); diff --git metastore/scripts/upgrade/postgres/036-HIVE-14496.postgres.sql metastore/scripts/upgrade/postgres/036-HIVE-14496.postgres.sql index 1910cc388a..22dc855ab0 100644 --- metastore/scripts/upgrade/postgres/036-HIVE-14496.postgres.sql +++ metastore/scripts/upgrade/postgres/036-HIVE-14496.postgres.sql @@ -6,3 +6,4 @@ UPDATE "TBLS" SET "IS_REWRITE_ENABLED" = false; -- Step 3: Alter the column to disallow null values ALTER TABLE "TBLS" ALTER COLUMN "IS_REWRITE_ENABLED" SET NOT NULL; +ALTER TABLE "TBLS" ALTER COLUMN "IS_REWRITE_ENABLED" SET DEFAULT false; diff --git metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql index 5feab4eca9..63acce7d72 100644 --- metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql @@ -373,7 +373,7 @@ CREATE TABLE "TBLS" ( "TBL_TYPE" character varying(128) DEFAULT NULL::character varying, "VIEW_EXPANDED_TEXT" text, "VIEW_ORIGINAL_TEXT" text, - "IS_REWRITE_ENABLED" boolean NOT NULL + "IS_REWRITE_ENABLED" boolean NOT NULL DEFAULT false ); diff --git metastore/scripts/upgrade/postgres/hive-schema-2.3.0.postgres.sql metastore/scripts/upgrade/postgres/hive-schema-2.3.0.postgres.sql index a6d976fc6e..a04883cb06 100644 --- metastore/scripts/upgrade/postgres/hive-schema-2.3.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-schema-2.3.0.postgres.sql @@ -373,7 +373,7 @@ CREATE TABLE "TBLS" ( "TBL_TYPE" character varying(128) DEFAULT NULL::character varying, "VIEW_EXPANDED_TEXT" text, "VIEW_ORIGINAL_TEXT" text, - "IS_REWRITE_ENABLED" boolean NOT NULL + "IS_REWRITE_ENABLED" boolean NOT NULL DEFAULT false ); 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 750460475b..23626c037e 100644 --- metastore/scripts/upgrade/postgres/hive-schema-3.0.0.postgres.sql +++ metastore/scripts/upgrade/postgres/hive-schema-3.0.0.postgres.sql @@ -373,7 +373,7 @@ CREATE TABLE "TBLS" ( "TBL_TYPE" character varying(128) DEFAULT NULL::character varying, "VIEW_EXPANDED_TEXT" text, "VIEW_ORIGINAL_TEXT" text, - "IS_REWRITE_ENABLED" boolean NOT NULL + "IS_REWRITE_ENABLED" boolean NOT NULL DEFAULT false );