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 e818e1b7e2..4994763d50 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 @@ -22,7 +22,7 @@ CREATE TABLE "APP"."DBS" ( "NAME" VARCHAR(128), "OWNER_NAME" VARCHAR(128), "OWNER_TYPE" VARCHAR(10), - "CTLG_NAME" VARCHAR(256) NOT NULL + "CTLG_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive' ); CREATE TABLE "APP"."TBL_PRIVS" ("TBL_GRANT_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "GRANT_OPTION" SMALLINT NOT NULL, "GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PRINCIPAL_NAME" VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "TBL_PRIV" VARCHAR(128), "TBL_ID" BIGINT); @@ -211,6 +211,9 @@ CREATE TABLE "APP"."CTLGS" ( "DESC" VARCHAR(4000), "LOCATION_URI" VARCHAR(4000) NOT NULL); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "APP"."CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); + -- ---------------------------------------------- -- DML Statements -- ---------------------------------------------- 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 043cf07729..74582e1c63 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 @@ -22,7 +22,7 @@ CREATE TABLE "APP"."DBS" ( "NAME" VARCHAR(128), "OWNER_NAME" VARCHAR(128), "OWNER_TYPE" VARCHAR(10), - "CTLG_NAME" VARCHAR(256) NOT NULL + "CTLG_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive' ); CREATE TABLE "APP"."TBL_PRIVS" ("TBL_GRANT_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "GRANT_OPTION" SMALLINT NOT NULL, "GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PRINCIPAL_NAME" VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "TBL_PRIV" VARCHAR(128), "TBL_ID" BIGINT, "AUTHORIZER" VARCHAR(128)); @@ -212,6 +212,9 @@ CREATE TABLE "APP"."CTLGS" ( "DESC" VARCHAR(4000), "LOCATION_URI" VARCHAR(4000) NOT NULL); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "APP"."CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); + -- ---------------------------------------------- -- DML Statements -- ---------------------------------------------- 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 cff37c0468..74ca44e081 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 @@ -22,7 +22,7 @@ CREATE TABLE "APP"."DBS" ( "NAME" VARCHAR(128), "OWNER_NAME" VARCHAR(128), "OWNER_TYPE" VARCHAR(10), - "CTLG_NAME" VARCHAR(256) NOT NULL, + "CTLG_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "CREATE_TIME" INTEGER ); @@ -214,6 +214,9 @@ CREATE TABLE "APP"."CTLGS" ( "LOCATION_URI" VARCHAR(4000) NOT NULL, "CREATE_TIME" INTEGER); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "APP"."CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); + -- ---------------------------------------------- -- DML Statements -- ---------------------------------------------- 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 02ff4aed8f..cac59bce97 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 @@ -22,7 +22,7 @@ CREATE TABLE "APP"."DBS" ( "NAME" VARCHAR(128), "OWNER_NAME" VARCHAR(128), "OWNER_TYPE" VARCHAR(10), - "CTLG_NAME" VARCHAR(256) NOT NULL, + "CTLG_NAME" VARCHAR(256) NOT NULL DEFAULT 'hive', "CREATE_TIME" INTEGER ); @@ -216,6 +216,9 @@ CREATE TABLE "APP"."CTLGS" ( "LOCATION_URI" VARCHAR(4000) NOT NULL, "CREATE_TIME" INTEGER); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "APP"."CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); + -- ---------------------------------------------- -- DML Statements -- ---------------------------------------------- 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 10f1373c13..aaaaefd729 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 @@ -190,7 +190,7 @@ UPDATE "APP"."DBS" SET "CTLG_NAME" = 'hive'; -- Add the not null constraint -ALTER TABLE "APP"."DBS" ALTER COLUMN "CTLG_NAME" NOT NULL; +ALTER TABLE "APP"."DBS" ALTER COLUMN "CTLG_NAME" NOT NULL DEFAULT 'hive'; -- Put back the unique index CREATE UNIQUE INDEX "APP"."UNIQUE_DATABASE" ON "APP"."DBS" ("NAME", "CTLG_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 c88fb18973..156a21344e 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 @@ -279,7 +279,7 @@ CREATE TABLE DBS "NAME" nvarchar(128) NULL, OWNER_NAME nvarchar(128) NULL, OWNER_TYPE nvarchar(10) NULL, - CTLG_NAME nvarchar(256) + CTLG_NAME nvarchar(256) DEFAULT 'hive' ); ALTER TABLE DBS ADD CONSTRAINT DBS_PK PRIMARY KEY (DB_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 fef6ab932b..f0ed94057f 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 @@ -285,7 +285,7 @@ CREATE TABLE DBS "NAME" nvarchar(128) NULL, OWNER_NAME nvarchar(128) NULL, OWNER_TYPE nvarchar(10) NULL, - CTLG_NAME nvarchar(256) + CTLG_NAME nvarchar(256) DEFAULT 'hive' ); ALTER TABLE DBS ADD CONSTRAINT DBS_PK PRIMARY KEY (DB_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 cd04b4cc1a..c8b31e2002 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 @@ -285,7 +285,7 @@ CREATE TABLE DBS "NAME" nvarchar(128) NULL, OWNER_NAME nvarchar(128) NULL, OWNER_TYPE nvarchar(10) NULL, - CTLG_NAME nvarchar(256), + CTLG_NAME nvarchar(256) DEFAULT 'hive', CREATE_TIME INT ); 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 cde23edafd..cd46b210fa 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 @@ -285,7 +285,7 @@ CREATE TABLE DBS "NAME" nvarchar(128) NULL, OWNER_NAME nvarchar(128) NULL, OWNER_TYPE nvarchar(10) NULL, - CTLG_NAME nvarchar(256), + CTLG_NAME nvarchar(256) DEFAULT 'hive', CREATE_TIME INT ); 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 da42e7738f..2e51b9bc8a 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 @@ -269,7 +269,7 @@ UPDATE DBS SET "CTLG_NAME" = 'hive'; -- Add the not null constraint -ALTER TABLE DBS ALTER COLUMN CTLG_NAME nvarchar(256) NOT NULL; +ALTER TABLE DBS ALTER COLUMN CTLG_NAME nvarchar(256) NOT NULL DEFAULT 'hive'; -- Put back the unique index CREATE UNIQUE INDEX UNIQUEDATABASE ON DBS ("NAME", "CTLG_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 c65af1e80c..c793102ffa 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 @@ -85,6 +85,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); -- -- Table structure for table `DBS` @@ -99,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT 'hive', PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), CONSTRAINT `CTLG_FK1` FOREIGN KEY (`CTLG_NAME`) REFERENCES `CTLGS` (`NAME`) 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 8510ceb3e8..048162c98a 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 @@ -85,6 +85,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); -- -- Table structure for table `DBS` @@ -99,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT 'hive', PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), CONSTRAINT `CTLG_FK1` FOREIGN KEY (`CTLG_NAME`) REFERENCES `CTLGS` (`NAME`) 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 bd0447e3e9..d791dd9d99 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 @@ -86,6 +86,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); -- -- Table structure for table `DBS` @@ -100,7 +102,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT 'hive', `CREATE_TIME` INT(11), PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), 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 cd03ba7ec6..e8af9a1b11 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 @@ -86,6 +86,8 @@ CREATE TABLE `CTLGS` ( UNIQUE KEY `UNIQUE_CATALOG` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO `CTLGS` VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); -- -- Table structure for table `DBS` @@ -100,7 +102,7 @@ CREATE TABLE IF NOT EXISTS `DBS` ( `NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, `OWNER_TYPE` varchar(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, - `CTLG_NAME` varchar(256) NOT NULL, + `CTLG_NAME` varchar(256) NOT NULL DEFAULT 'hive', `CREATE_TIME` INT(11), PRIMARY KEY (`DB_ID`), UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`), 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 786e38ac6e..8e11ee8cab 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 @@ -235,8 +235,8 @@ ALTER TABLE `DBS` ADD COLUMN `CTLG_NAME` VARCHAR(256); UPDATE `DBS` SET `CTLG_NAME` = 'hive'; --- Add the not null constraint -ALTER TABLE `DBS` CHANGE COLUMN `CTLG_NAME` `CTLG_NAME` varchar(256) NOT NULL; +-- Add the not null constraint and default value +ALTER TABLE `DBS` CHANGE COLUMN `CTLG_NAME` `CTLG_NAME` varchar(256) NOT NULL DEFAULT 'hive'; -- Put back the unique index ALTER TABLE `DBS` ADD UNIQUE KEY `UNIQUE_DATABASE` (`NAME`, `CTLG_NAME`); 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 93e032f3a1..be4c7c3605 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 @@ -86,6 +86,9 @@ CREATE TABLE CTLGS ( UNIQUE ("NAME") ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO CTLGS VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); + -- Table DBS for classes [org.apache.hadoop.hive.metastore.model.MDatabase] CREATE TABLE DBS ( @@ -95,7 +98,7 @@ CREATE TABLE DBS "NAME" VARCHAR2(128) NULL, OWNER_NAME VARCHAR2(128) NULL, OWNER_TYPE VARCHAR2(10) NULL, - CTLG_NAME VARCHAR2(256) + CTLG_NAME VARCHAR2(256) DEFAULT 'hive' ); ALTER TABLE DBS ADD CONSTRAINT DBS_PK PRIMARY KEY (DB_ID); 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 895ee48d78..958e62acd0 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 @@ -87,6 +87,9 @@ CREATE TABLE CTLGS ( UNIQUE ("NAME") ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO CTLGS VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); + -- Table DBS for classes [org.apache.hadoop.hive.metastore.model.MDatabase] CREATE TABLE DBS ( @@ -96,7 +99,7 @@ CREATE TABLE DBS "NAME" VARCHAR2(128) NULL, OWNER_NAME VARCHAR2(128) NULL, OWNER_TYPE VARCHAR2(10) NULL, - CTLG_NAME VARCHAR2(256) + CTLG_NAME VARCHAR2(256) DEFAULT 'hive' ); ALTER TABLE DBS ADD CONSTRAINT DBS_PK PRIMARY KEY (DB_ID); 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 8b911465c2..c62ad6a662 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 @@ -88,6 +88,9 @@ CREATE TABLE CTLGS ( UNIQUE ("NAME") ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO CTLGS VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); + -- Table DBS for classes [org.apache.hadoop.hive.metastore.model.MDatabase] CREATE TABLE DBS ( @@ -97,7 +100,7 @@ CREATE TABLE DBS "NAME" VARCHAR2(128) NULL, OWNER_NAME VARCHAR2(128) NULL, OWNER_TYPE VARCHAR2(10) NULL, - CTLG_NAME VARCHAR2(256), + CTLG_NAME VARCHAR2(256) DEFAULT 'hive', CREATE_TIME NUMBER (10) ); 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 16140d1a47..b3c2f792dc 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 @@ -88,6 +88,9 @@ CREATE TABLE CTLGS ( UNIQUE ("NAME") ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO CTLGS VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); + -- Table DBS for classes [org.apache.hadoop.hive.metastore.model.MDatabase] CREATE TABLE DBS ( @@ -97,7 +100,7 @@ CREATE TABLE DBS "NAME" VARCHAR2(128) NULL, OWNER_NAME VARCHAR2(128) NULL, OWNER_TYPE VARCHAR2(10) NULL, - CTLG_NAME VARCHAR2(256), + CTLG_NAME VARCHAR2(256) DEFAULT 'hive', CREATE_TIME NUMBER (10) ); 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 b5486653bd..a75ee5da78 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 @@ -250,7 +250,7 @@ UPDATE DBS SET "CTLG_NAME" = 'hive'; -- Add the not null constraint -ALTER TABLE DBS MODIFY CTLG_NAME NOT NULL; +ALTER TABLE DBS MODIFY CTLG_NAME DEFAULT 'hive' NOT NULL; -- Put back the unique index CREATE UNIQUE INDEX UNIQUE_DATABASE ON DBS ("NAME", CTLG_NAME); diff --git standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql index b89c87f41e..3f94f5bb9b 100644 --- standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql +++ standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql @@ -66,6 +66,9 @@ CREATE TABLE "CTLGS" ( "LOCATION_URI" VARCHAR(4000) NOT NULL ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); + -- -- Name: DBS; Type: TABLE; Schema: public; Owner: hiveuser; Tablespace: -- @@ -77,7 +80,7 @@ CREATE TABLE "DBS" ( "NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_TYPE" character varying(10) DEFAULT NULL::character varying, - "CTLG_NAME" varchar(256) + "CTLG_NAME" varchar(256) DEFAULT 'hive' ); diff --git standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql index 3281c1f294..4d1ae84e1f 100644 --- standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql +++ standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.1.0.postgres.sql @@ -66,6 +66,9 @@ CREATE TABLE "CTLGS" ( "LOCATION_URI" VARCHAR(4000) NOT NULL ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD'); + -- -- Name: DBS; Type: TABLE; Schema: public; Owner: hiveuser; Tablespace: -- @@ -77,7 +80,7 @@ CREATE TABLE "DBS" ( "NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_TYPE" character varying(10) DEFAULT NULL::character varying, - "CTLG_NAME" varchar(256) + "CTLG_NAME" varchar(256) DEFAULT 'hive' ); diff --git standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.2.0.postgres.sql standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.2.0.postgres.sql index 3854905cfd..337b0266f1 100644 --- standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.2.0.postgres.sql +++ standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-3.2.0.postgres.sql @@ -67,6 +67,9 @@ CREATE TABLE "CTLGS" ( "CREATE_TIME" bigint ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); + -- -- Name: DBS; Type: TABLE; Schema: public; Owner: hiveuser; Tablespace: -- @@ -78,7 +81,7 @@ CREATE TABLE "DBS" ( "NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_TYPE" character varying(10) DEFAULT NULL::character varying, - "CTLG_NAME" varchar(256), + "CTLG_NAME" varchar(256) DEFAULT 'hive', "CREATE_TIME" bigint ); diff --git standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql index 2aff1e44bc..db5259959b 100644 --- standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql +++ standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0.postgres.sql @@ -67,6 +67,9 @@ CREATE TABLE "CTLGS" ( "CREATE_TIME" bigint ); +-- Insert a default value. The location is TBD. Hive will fix this when it starts +INSERT INTO "CTLGS" VALUES (1, 'hive', 'Default catalog for Hive', 'TBD', NULL); + -- -- Name: DBS; Type: TABLE; Schema: public; Owner: hiveuser; Tablespace: -- @@ -78,7 +81,7 @@ CREATE TABLE "DBS" ( "NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_NAME" character varying(128) DEFAULT NULL::character varying, "OWNER_TYPE" character varying(10) DEFAULT NULL::character varying, - "CTLG_NAME" varchar(256), + "CTLG_NAME" varchar(256) DEFAULT 'hive', "CREATE_TIME" bigint ); 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 f2571d8f2b..06e758ccdb 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 @@ -268,6 +268,9 @@ UPDATE "DBS" -- Add the not null constraint ALTER TABLE "DBS" ALTER COLUMN "CTLG_NAME" SET NOT NULL; +-- Add the default catalog name +ALTER TABLE "DBS" ALTER COLUMN "CTLG_NAME" SET DEFAULT 'hive'; + -- Put back the unique index ALTER TABLE "DBS" ADD CONSTRAINT "UNIQUE_DATABASE" UNIQUE ("NAME", "CTLG_NAME");