You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2019/10/31 09:51:14 UTC
[hive] branch branch-3 updated: HIVE-22407: Hive metastore upgrade
scripts have incorrect (or outdated) comment syntax (Aditya Shah,
reviewed by Peter Vary)
This is an automated email from the ASF dual-hosted git repository.
pvary pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new f0af311 HIVE-22407: Hive metastore upgrade scripts have incorrect (or outdated) comment syntax (Aditya Shah, reviewed by Peter Vary)
f0af311 is described below
commit f0af311a0dadcd0925343fc3518d6bf410e4d748
Author: Peter Vary <pv...@cloudera.com>
AuthorDate: Thu Oct 31 10:50:47 2019 +0100
HIVE-22407: Hive metastore upgrade scripts have incorrect (or outdated) comment syntax (Aditya Shah, reviewed by Peter Vary)
---
.../sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql | 24 +++++++++++-----------
.../sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql | 6 +++---
.../sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql | 6 +++---
.../sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql | 2 +-
.../sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql | 12 +++++------
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql
index 1d85e2c..fc262eb 100644
--- a/standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql
@@ -1,5 +1,5 @@
SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS ' ';
---SOURCE 021-HIVE-7018.mysql.sql;
+-- SOURCE 021-HIVE-7018.mysql.sql;
ALTER TABLE `TBLS` DROP FOREIGN KEY `TBLS_FK3`;
ALTER TABLE `TBLS` DROP KEY `TBLS_N51`;
ALTER TABLE `TBLS` DROP COLUMN `LINK_TARGET_ID`;
@@ -8,7 +8,7 @@ ALTER TABLE `PARTITIONS` DROP FOREIGN KEY `PARTITIONS_FK3` ;
ALTER TABLE `PARTITIONS` DROP KEY `PARTITIONS_N51` ;
ALTER TABLE `PARTITIONS` DROP COLUMN `LINK_TARGET_ID` ;
---SOURCE 022-HIVE-11970.mysql.sql;
+-- SOURCE 022-HIVE-11970.mysql.sql;
ALTER TABLE `COLUMNS_V2` MODIFY `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
ALTER TABLE `PART_COL_PRIVS` MODIFY `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
ALTER TABLE `TBL_COL_PRIVS` MODIFY `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
@@ -16,16 +16,16 @@ ALTER TABLE `SORT_COLS` MODIFY `COLUMN_NAME` varchar(767) CHARACTER SET latin1 C
ALTER TABLE `TAB_COL_STATS` MODIFY `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
ALTER TABLE `PART_COL_STATS` MODIFY `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
---SOURCE 023-HIVE-12807.mysql.sql;
+-- SOURCE 023-HIVE-12807.mysql.sql;
ALTER TABLE `COMPACTION_QUEUE` ADD `CQ_HIGHEST_TXN_ID` bigint;
---SOURCE 024-HIVE-12814.mysql.sql;
+-- SOURCE 024-HIVE-12814.mysql.sql;
ALTER TABLE `COMPACTION_QUEUE` ADD `CQ_META_INFO` varbinary(2048);
---SOURCE 025-HIVE-12816.mysql.sql;
+-- SOURCE 025-HIVE-12816.mysql.sql;
ALTER TABLE `COMPACTION_QUEUE` ADD `CQ_HADOOP_JOB_ID` varchar(32);
---SOURCE 026-HIVE-12818.mysql.sql;
+-- SOURCE 026-HIVE-12818.mysql.sql;
CREATE TABLE COMPLETED_COMPACTIONS (
CC_ID bigint PRIMARY KEY,
CC_DATABASE varchar(128) NOT NULL,
@@ -44,24 +44,24 @@ CREATE TABLE COMPLETED_COMPACTIONS (
---SOURCE 027-HIVE-12819.mysql.sql;
+-- SOURCE 027-HIVE-12819.mysql.sql;
ALTER TABLE `TXNS` ADD `TXN_AGENT_INFO` varchar(128);
---SOURCE 028-HIVE-12821.mysql.sql;
+-- SOURCE 028-HIVE-12821.mysql.sql;
ALTER TABLE `TXNS` ADD `TXN_HEARTBEAT_COUNT` int;
ALTER TABLE `HIVE_LOCKS` ADD `HL_HEARTBEAT_COUNT` int;
---SOURCE 029-HIVE-12822.mysql.sql;
+-- SOURCE 029-HIVE-12822.mysql.sql;
ALTER TABLE `TXNS` ADD `TXN_META_INFO` varchar(128);
---SOURCE 030-HIVE-12823.mysql.sql;
+-- SOURCE 030-HIVE-12823.mysql.sql;
ALTER TABLE `HIVE_LOCKS` ADD `HL_AGENT_INFO` varchar(128);
---SOURCE 031-HIVE-12831.mysql.sql;
+-- SOURCE 031-HIVE-12831.mysql.sql;
ALTER TABLE `HIVE_LOCKS` ADD `HL_BLOCKEDBY_EXT_ID` bigint;
ALTER TABLE `HIVE_LOCKS` ADD `HL_BLOCKEDBY_INT_ID` bigint;
---SOURCE 032-HIVE-12832.mysql.sql;
+-- SOURCE 032-HIVE-12832.mysql.sql;
CREATE TABLE AUX_TABLE (
MT_KEY1 varchar(128) NOT NULL,
MT_KEY2 bigint NOT NULL,
diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
index 456d4cd..7505d36 100644
--- a/standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql
@@ -1,6 +1,6 @@
SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0' AS ' ';
---SOURCE 034-HIVE-13076.mysql.sql;
+-- SOURCE 034-HIVE-13076.mysql.sql;
CREATE TABLE IF NOT EXISTS `KEY_CONSTRAINTS`
(
`CHILD_CD_ID` BIGINT,
@@ -21,7 +21,7 @@ CREATE INDEX `CONSTRAINTS_PARENT_TABLE_ID_INDEX` ON KEY_CONSTRAINTS (`PARENT_TBL
---SOURCE 035-HIVE-13395.mysql.sql;
+-- SOURCE 035-HIVE-13395.mysql.sql;
CREATE TABLE WRITE_SET (
WS_DATABASE varchar(128) NOT NULL,
WS_TABLE varchar(128) NOT NULL,
@@ -33,7 +33,7 @@ CREATE TABLE WRITE_SET (
ALTER TABLE TXN_COMPONENTS ADD TC_OPERATION_TYPE char(1);
---SOURCE 036-HIVE-13354.mysql.sql;
+-- SOURCE 036-HIVE-13354.mysql.sql;
ALTER TABLE COMPACTION_QUEUE ADD CQ_TBLPROPERTIES varchar(2048);
ALTER TABLE COMPLETED_COMPACTIONS ADD CC_TBLPROPERTIES varchar(2048);
diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
index b114587..044568e 100644
--- a/standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
@@ -1,6 +1,6 @@
SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0' AS ' ';
---SOURCE 037-HIVE-14496.mysql.sql;
+-- SOURCE 037-HIVE-14496.mysql.sql;
-- Step 1: Add the column allowing null
ALTER TABLE `TBLS` ADD `IS_REWRITE_ENABLED` bit(1);
@@ -10,7 +10,7 @@ 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 DEFAULT 0;
---SOURCE 038-HIVE-10562.mysql.sql;
+-- SOURCE 038-HIVE-10562.mysql.sql;
-- Step 1: Add the column for format
ALTER TABLE `NOTIFICATION_LOG` ADD `MESSAGE_FORMAT` varchar(16);
-- if MESSAGE_FORMAT is null, then it is the legacy hcat JSONMessageFactory that created this message
@@ -18,7 +18,7 @@ ALTER TABLE `NOTIFICATION_LOG` ADD `MESSAGE_FORMAT` varchar(16);
-- Step 2 : Change the type of the MESSAGE field from mediumtext to longtext
ALTER TABLE `NOTIFICATION_LOG` MODIFY `MESSAGE` longtext;
---SOURCE 039-HIVE-12274.mysql.sql;
+-- SOURCE 039-HIVE-12274.mysql.sql;
ALTER TABLE COLUMNS_V2 MODIFY TYPE_NAME MEDIUMTEXT;
ALTER TABLE TABLE_PARAMS MODIFY PARAM_VALUE MEDIUMTEXT;
ALTER TABLE SERDE_PARAMS MODIFY PARAM_VALUE MEDIUMTEXT;
diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql
index aa5110f..9eda309 100644
--- a/standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql
@@ -1,6 +1,6 @@
SELECT 'Upgrading MetaStore schema from 2.2.0 to 2.3.0' AS ' ';
---SOURCE 040-HIVE-16399.mysql.sql;
+-- SOURCE 040-HIVE-16399.mysql.sql;
CREATE INDEX TC_TXNID_INDEX ON TXN_COMPONENTS (TC_TXNID);
UPDATE VERSION SET SCHEMA_VERSION='2.3.0', VERSION_COMMENT='Hive release version 2.3.0' where VER_ID=1;
diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
index 8e11ee8..8c49b5f 100644
--- a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
@@ -1,6 +1,6 @@
SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' ';
---SOURCE 041-HIVE-16556.mysql.sql;
+-- SOURCE 041-HIVE-16556.mysql.sql;
--
-- Table structure for table METASTORE_DB_PROPERTIES
--
@@ -11,22 +11,22 @@ CREATE TABLE IF NOT EXISTS `METASTORE_DB_PROPERTIES` (
PRIMARY KEY(`PROPERTY_KEY`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
---SOURCE 042-HIVE-16575.mysql.sql;
+-- SOURCE 042-HIVE-16575.mysql.sql;
CREATE INDEX `CONSTRAINTS_CONSTRAINT_TYPE_INDEX` ON KEY_CONSTRAINTS (`CONSTRAINT_TYPE`) USING BTREE;
---SOURCE 043-HIVE-16922.mysql.sql;
+-- SOURCE 043-HIVE-16922.mysql.sql;
UPDATE SERDE_PARAMS
SET PARAM_KEY='collection.delim'
WHERE PARAM_KEY='colelction.delim';
---SOURCE 044-HIVE-16997.mysql.sql;
+-- SOURCE 044-HIVE-16997.mysql.sql;
ALTER TABLE PART_COL_STATS ADD COLUMN BIT_VECTOR BLOB;
ALTER TABLE TAB_COL_STATS ADD COLUMN BIT_VECTOR BLOB;
---SOURCE 045-HIVE-16886.mysql.sql;
+-- SOURCE 045-HIVE-16886.mysql.sql;
INSERT INTO `NOTIFICATION_SEQUENCE` (`NNI_ID`, `NEXT_EVENT_ID`) SELECT * from (select 1 as `NNI_ID`, 1 as `NOTIFICATION_SEQUENCE`) a WHERE (SELECT COUNT(*) FROM `NOTIFICATION_SEQUENCE`) = 0;
---SOURCE 046-HIVE-17566.mysql.sql;
+-- SOURCE 046-HIVE-17566.mysql.sql;
CREATE TABLE IF NOT EXISTS WM_RESOURCEPLAN (
`RP_ID` bigint(20) NOT NULL,
`NAME` varchar(128) NOT NULL,