diff --git a/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java b/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java index 3bb6436bff..1730d492d7 100644 --- a/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java +++ b/beeline/src/java/org/apache/hive/beeline/ColorBuffer.java @@ -78,6 +78,9 @@ ColorBuffer pad(ColorBuffer str, int len) { } ColorBuffer center(String str, int len) { + if (str == null) { + str = ""; + } StringBuilder buf = new StringBuilder(str); while (buf.length() < len) { buf.append(" "); diff --git a/beeline/src/java/org/apache/hive/beeline/Commands.java b/beeline/src/java/org/apache/hive/beeline/Commands.java index 90cae9f408..fd0af2ca0c 100644 --- a/beeline/src/java/org/apache/hive/beeline/Commands.java +++ b/beeline/src/java/org/apache/hive/beeline/Commands.java @@ -1052,7 +1052,9 @@ private boolean executeInternal(String sql, boolean call) { logThread.interrupt(); } logThread.join(DEFAULT_QUERY_PROGRESS_THREAD_TIMEOUT); - showRemainingLogsIfAny(stmnt); + if (stmnt != null) { + showRemainingLogsIfAny(stmnt); + } } if (stmnt != null) { stmnt.close(); diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql index 1d85e2c6c0..20ddd1ada6 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS MESSAGE; --SOURCE 021-HIVE-7018.mysql.sql; ALTER TABLE `TBLS` DROP FOREIGN KEY `TBLS_FK3`; ALTER TABLE `TBLS` DROP KEY `TBLS_N51`; @@ -71,5 +71,5 @@ CREATE TABLE AUX_TABLE ( UPDATE VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql index 456d4cd2ed..22a3c377b7 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.0.0-to-2.1.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 2.0.0 to 2.1.0' AS MESSAGE; --SOURCE 034-HIVE-13076.mysql.sql; CREATE TABLE IF NOT EXISTS `KEY_CONSTRAINTS` @@ -38,5 +38,5 @@ ALTER TABLE COMPACTION_QUEUE ADD CQ_TBLPROPERTIES varchar(2048); ALTER TABLE COMPLETED_COMPACTIONS ADD CC_TBLPROPERTIES varchar(2048); UPDATE VERSION SET SCHEMA_VERSION='2.1.0', VERSION_COMMENT='Hive release version 2.1.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 2.0.0 to 2.1.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 2.0.0 to 2.1.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql index b114587d1e..3346fe0bc2 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0' AS MESSAGE; --SOURCE 037-HIVE-14496.mysql.sql; -- Step 1: Add the column allowing null @@ -39,5 +39,5 @@ ALTER TABLE TAB_COL_STATS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 C ALTER TABLE PART_COL_STATS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL; UPDATE VERSION SET SCHEMA_VERSION='2.2.0', VERSION_COMMENT='Hive release version 2.2.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 2.1.0 to 2.2.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 2.1.0 to 2.2.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql index aa5110fb4d..37e817b7cf 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.2.0-to-2.3.0.mysql.sql @@ -1,8 +1,8 @@ -SELECT 'Upgrading MetaStore schema from 2.2.0 to 2.3.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 2.2.0 to 2.3.0' AS MESSAGE; --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; -SELECT 'Finished upgrading MetaStore schema from 2.2.0 to 2.3.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 2.2.0 to 2.3.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql index 8e11ee8cab..7140c2af17 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE; --SOURCE 041-HIVE-16556.mysql.sql; -- @@ -323,4 +323,4 @@ ALTER TABLE `TBLS` ADD COLUMN `OWNER_TYPE` VARCHAR(10) CHARACTER SET latin1 COLL -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql index bb5009f7e3..3eae9f2850 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.0.0-to-3.1.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 3.0.0 to 3.1.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 3.0.0 to 3.1.0' AS MESSAGE; -- HIVE-19440 ALTER TABLE `GLOBAL_PRIVS` ADD `AUTHORIZER` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL; @@ -53,4 +53,4 @@ CREATE TABLE MATERIALIZATION_REBUILD_LOCKS ( -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='3.1.0', VERSION_COMMENT='Hive release version 3.1.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 3.0.0 to 3.1.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 3.0.0 to 3.1.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-3.2.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-3.2.0.mysql.sql index 061aca0300..ebfb90c51e 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-3.2.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.1.0-to-3.2.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 3.1.0 to 3.2.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 3.1.0 to 3.2.0' AS MESSAGE; -- HIVE-19267 CREATE TABLE TXN_WRITE_NOTIFICATION_LOG ( @@ -25,5 +25,5 @@ ALTER TABLE `CTLGS` ADD `CREATE_TIME` INT(11); -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='3.2.0', VERSION_COMMENT='Hive release version 3.2.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 3.1.0 to 3.2.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 3.1.0 to 3.2.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql index 87e8aad7b6..296cb12ef0 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE; -- HIVE-19416 ALTER TABLE TBLS ADD WRITE_ID bigint DEFAULT 0; @@ -19,5 +19,5 @@ ALTER TABLE COLUMNS_V2 MODIFY COMMENT varchar(4000) CHARACTER SET latin1 COLLATE -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS ' '; +SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE;