This is an automated email from the ASF dual-hosted git repository. dkuzmenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push: new 6e8fc53fb68 HIVE-26623: Maintain same columns in COMPACTIONS view present in SYS and INFORMATION_SCHEMA (Sourabh Badhya, reviewed by Laszlo Vegh, Denys Kuzmenko) 6e8fc53fb68 is described below commit 6e8fc53fb68898d1a404435859cea5bbc79200a4 Author: Sourabh Badhya <42867455+sourabhbad...@users.noreply.github.com> AuthorDate: Mon Oct 17 14:28:17 2022 +0530 HIVE-26623: Maintain same columns in COMPACTIONS view present in SYS and INFORMATION_SCHEMA (Sourabh Badhya, reviewed by Laszlo Vegh, Denys Kuzmenko) Closes #3661 --- .../hive/hive-schema-4.0.0-alpha-2.hive.sql | 14 ++++- ...upgrade-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql | 67 ++++++++++++++++++++++ .../test/results/clientpositive/llap/sysdb.q.out | 9 ++- 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-2.hive.sql b/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-2.hive.sql index 531fc2fd6db..4896576043f 100644 --- a/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-2.hive.sql +++ b/metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-2.hive.sql @@ -1924,12 +1924,17 @@ CREATE OR REPLACE VIEW `COMPACTIONS` `C_DURATION`, `C_HADOOP_JOB_ID`, `C_RUN_AS`, + `C_ERROR_MESSAGE`, + `C_NEXT_TXN_ID`, + `C_TXN_ID`, + `C_COMMIT_TIME`, `C_HIGHEST_WRITE_ID`, `C_INITIATOR_HOST`, `C_INITIATOR_ID`, `C_INITIATOR_VERSION`, `C_CLEANER_START`, - `C_POOL_NAME` + `C_POOL_NAME`, + `C_TBLPROPERTIES` ) AS SELECT DISTINCT C_ID, @@ -1947,12 +1952,17 @@ SELECT DISTINCT C_DURATION, C_HADOOP_JOB_ID, C_RUN_AS, + C_ERROR_MESSAGE, + C_NEXT_TXN_ID, + C_TXN_ID, + C_COMMIT_TIME, C_HIGHEST_WRITE_ID, C_INITIATOR_HOST, C_INITIATOR_ID, C_INITIATOR_VERSION, C_CLEANER_START, - NVL(C_POOL_NAME, 'default') + C_POOL_NAME, + C_TBLPROPERTIES FROM `sys`.`COMPACTIONS` C JOIN `sys`.`TBLS` T ON (C.`C_TABLE` = T.`TBL_NAME`) JOIN `sys`.`DBS` D ON (C.`C_DATABASE` = D.`NAME`) diff --git a/metastore/scripts/upgrade/hive/upgrade-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql b/metastore/scripts/upgrade/hive/upgrade-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql index 6f7dcda10e9..0d5af37fe02 100644 --- a/metastore/scripts/upgrade/hive/upgrade-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql +++ b/metastore/scripts/upgrade/hive/upgrade-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql @@ -276,4 +276,71 @@ JOIN WHERE SE.SCHEDULED_QUERY_ID=SQ.SCHEDULED_QUERY_ID; +-- HIVE-26623 +CREATE OR REPLACE VIEW `COMPACTIONS` +( + `C_ID`, + `C_CATALOG`, + `C_DATABASE`, + `C_TABLE`, + `C_PARTITION`, + `C_TYPE`, + `C_STATE`, + `C_WORKER_HOST`, + `C_WORKER_ID`, + `C_WORKER_VERSION`, + `C_ENQUEUE_TIME`, + `C_START`, + `C_DURATION`, + `C_HADOOP_JOB_ID`, + `C_RUN_AS`, + `C_ERROR_MESSAGE`, + `C_NEXT_TXN_ID`, + `C_TXN_ID`, + `C_COMMIT_TIME`, + `C_HIGHEST_WRITE_ID`, + `C_INITIATOR_HOST`, + `C_INITIATOR_ID`, + `C_INITIATOR_VERSION`, + `C_CLEANER_START`, + `C_POOL_NAME`, + `C_TBLPROPERTIES` +) AS +SELECT DISTINCT + C_ID, + C_CATALOG, + C_DATABASE, + C_TABLE, + C_PARTITION, + C_TYPE, + C_STATE, + C_WORKER_HOST, + C_WORKER_ID, + C_WORKER_VERSION, + C_ENQUEUE_TIME, + C_START, + C_DURATION, + C_HADOOP_JOB_ID, + C_RUN_AS, + C_ERROR_MESSAGE, + C_NEXT_TXN_ID, + C_TXN_ID, + C_COMMIT_TIME, + C_HIGHEST_WRITE_ID, + C_INITIATOR_HOST, + C_INITIATOR_ID, + C_INITIATOR_VERSION, + C_CLEANER_START, + C_POOL_NAME, + C_TBLPROPERTIES +FROM + `sys`.`COMPACTIONS` C JOIN `sys`.`TBLS` T ON (C.`C_TABLE` = T.`TBL_NAME`) + JOIN `sys`.`DBS` D ON (C.`C_DATABASE` = D.`NAME`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) +WHERE + (NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + AND (P.`PRINCIPAL_NAME`=current_user() AND P.`PRINCIPAL_TYPE`='USER' + OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP')) + AND P.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()); + SELECT 'Finished upgrading MetaStore schema from 4.0.0-alpha-1 to 4.0.0-alpha-2'; diff --git a/ql/src/test/results/clientpositive/llap/sysdb.q.out b/ql/src/test/results/clientpositive/llap/sysdb.q.out index 1c2fc5062f6..884c0d253d8 100644 --- a/ql/src/test/results/clientpositive/llap/sysdb.q.out +++ b/ql/src/test/results/clientpositive/llap/sysdb.q.out @@ -504,6 +504,7 @@ compactions c_catalog compactions c_cleaner_start compactions c_cleaner_start compactions c_commit_time +compactions c_commit_time compactions c_database compactions c_database compactions c_duration @@ -511,6 +512,7 @@ compactions c_duration compactions c_enqueue_time compactions c_enqueue_time compactions c_error_message +compactions c_error_message #### A masked pattern was here #### compactions c_highest_write_id compactions c_highest_write_id @@ -523,6 +525,7 @@ compactions c_initiator_id compactions c_initiator_version compactions c_initiator_version compactions c_next_txn_id +compactions c_next_txn_id compactions c_partition compactions c_partition compactions c_pool_name @@ -536,6 +539,8 @@ compactions c_state compactions c_table compactions c_table compactions c_tblproperties +compactions c_tblproperties +compactions c_txn_id compactions c_txn_id compactions c_type compactions c_type @@ -1815,5 +1820,5 @@ POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs POSTHOOK: Input: sys@tbls #### A masked pattern was here #### -1 default default scr_txn NULL major initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL #Masked# manual 4.0.0-alpha-2-SNAPSHOT NULL default -2 default default scr_txn_2 NULL minor initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL #Masked# manual 4.0.0-alpha-2-SNAPSHOT NULL default +1 default default scr_txn NULL major initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-alpha-2-SNAPSHOT NULL default NULL +2 default default scr_txn_2 NULL minor initiated NULL NULL NULL #Masked# NULL NULL NULL NULL NULL NULL NULL NULL NULL #Masked# manual 4.0.0-alpha-2-SNAPSHOT NULL default NULL