Skip to content

HIVE-26623: Maintain same columns in COMPACTIONS view present in SYS … #3661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deniskuzZ merged 3 commits into from
Oct 17, 2022
Merged

HIVE-26623: Maintain same columns in COMPACTIONS view present in SYS … #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f2893d
HIVE-26623: Maintain same columns in COMPACTIONS view present in SYS …
Oct 12, 2022
1188333
Address review comments - 1
Oct 12, 2022
568f2e6
Address review comments - 2
Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions metastore/scripts/upgrade/hive/hive-schema-4.0.0-alpha-2.hive.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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`)
Expand Down
67 changes: 67 additions & 0 deletions metastore/scripts/upgrade/hive/upgrade-4.0.0-alpha-1-to-4.0.0-alpha-2.hive.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
9 changes: 7 additions & 2 deletions ql/src/test/results/clientpositive/llap/sysdb.q.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,13 +504,15 @@ 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
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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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