diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java b/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java index 610e646..18b0b13 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java @@ -581,20 +581,20 @@ public void test() throws Exception { opHandle = serviceClient.executeStatement(sessHandle, "select * from INFORMATION_SCHEMA.SCHEMATA", confOverlay); rowSet = serviceClient.fetchResults(opHandle); - Assert.assertTrue(rowSet.numRows() > 2); + Assert.assertEquals(rowSet.numRows(), 5); opHandle = serviceClient.executeStatement(sessHandle, "select * from INFORMATION_SCHEMA.TABLES", confOverlay); rowSet = serviceClient.fetchResults(opHandle); - Assert.assertTrue(rowSet.numRows() > 10); + Assert.assertTrue(rowSet.numRows() > 50); opHandle = serviceClient.executeStatement(sessHandle, "select * from INFORMATION_SCHEMA.TABLE_PRIVILEGES", confOverlay); rowSet = serviceClient.fetchResults(opHandle); - Assert.assertEquals(rowSet.numRows(), 7); + Assert.assertTrue(rowSet.numRows() > 200); opHandle = serviceClient.executeStatement(sessHandle, "select * from INFORMATION_SCHEMA.COLUMNS", confOverlay); rowSet = serviceClient.fetchResults(opHandle); - Assert.assertTrue(rowSet.numRows() > 10); + Assert.assertTrue(rowSet.numRows() > 350); opHandle = serviceClient.executeStatement(sessHandle, "select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES", confOverlay); diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java index d07599e..2524afe 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java @@ -225,7 +225,6 @@ public MiniLlapLocalCliConfig() { includesFrom(testConfigProps, "minillaplocal.shared.query.files"); excludeQuery("bucket_map_join_tez1.q"); // Disabled in HIVE-19509 excludeQuery("special_character_in_tabnames_1.q"); // Disabled in HIVE-19509 - excludeQuery("sysdb.q"); // Disabled in HIVE-19509 excludeQuery("tez_smb_1.q"); // Disabled in HIVE-19509 excludeQuery("union_fast_stats.q"); // Disabled in HIVE-19509 excludeQuery("schema_evol_orc_acidvec_part.q"); // Disabled in HIVE-19509 diff --git a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql index f98894f..2d67242 100644 --- a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql +++ b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql @@ -1080,11 +1080,10 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER`; @@ -1118,12 +1117,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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'))) + 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(); CREATE OR REPLACE VIEW `TABLE_PRIVILEGES` @@ -1147,18 +1146,15 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' - OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer(); + OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()); CREATE OR REPLACE VIEW `COLUMNS` ( @@ -1299,21 +1295,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()); + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer(); CREATE OR REPLACE VIEW `COLUMN_PRIVILEGES` ( @@ -1336,20 +1327,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()); + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer(); CREATE OR REPLACE VIEW `VIEWS` ( @@ -1376,14 +1363,11 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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()); diff --git a/ql/src/test/queries/clientpositive/sysdb.q b/ql/src/test/queries/clientpositive/sysdb.q index ed2a45a..2c86490 100644 --- a/ql/src/test/queries/clientpositive/sysdb.q +++ b/ql/src/test/queries/clientpositive/sysdb.q @@ -69,8 +69,6 @@ select count(*) from sds; select param_key, param_value from sd_params order by param_key, param_value limit 5; -select sequence_name from sequence_table order by sequence_name limit 5; - select name, slib from serdes order by name, slib limit 5; select param_key, param_value from serde_params order by param_key, param_value limit 5; diff --git a/ql/src/test/results/clientpositive/llap/resourceplan.q.out b/ql/src/test/results/clientpositive/llap/resourceplan.q.out index 3933273..5132ac9 100644 --- a/ql/src/test/results/clientpositive/llap/resourceplan.q.out +++ b/ql/src/test/results/clientpositive/llap/resourceplan.q.out @@ -2392,11 +2392,10 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER` @@ -2425,11 +2424,10 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER` @@ -2475,12 +2473,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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'))) + 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() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs @@ -2517,12 +2515,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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'))) + 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() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs @@ -2563,18 +2561,15 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' - OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer() + OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()) PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@tbl_privs @@ -2602,18 +2597,15 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' - OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer() + OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()) POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs @@ -2767,21 +2759,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()) + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@columns_v2 PREHOOK: Input: sys@dbs @@ -2929,21 +2916,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()) + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@columns_v2 POSTHOOK: Input: sys@dbs @@ -3020,20 +3002,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@sds @@ -3063,20 +3041,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@sds @@ -3118,14 +3092,11 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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()) @@ -3160,14 +3131,11 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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()) diff --git a/ql/src/test/results/clientpositive/llap/strict_managed_tables_sysdb.q.out b/ql/src/test/results/clientpositive/llap/strict_managed_tables_sysdb.q.out index 7637f0e..d4aad39 100644 --- a/ql/src/test/results/clientpositive/llap/strict_managed_tables_sysdb.q.out +++ b/ql/src/test/results/clientpositive/llap/strict_managed_tables_sysdb.q.out @@ -2482,11 +2482,10 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER` @@ -2515,11 +2514,10 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER` @@ -2565,12 +2563,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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'))) + 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() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs @@ -2607,12 +2605,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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'))) + 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() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs @@ -2653,18 +2651,15 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' - OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer() + OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()) PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@tbl_privs @@ -2692,18 +2687,15 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' - OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer() + OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()) POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs @@ -2857,21 +2849,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()) + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@columns_v2 PREHOOK: Input: sys@dbs @@ -3019,21 +3006,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()) + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@columns_v2 POSTHOOK: Input: sys@dbs @@ -3110,20 +3092,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@sds @@ -3153,20 +3131,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()) + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@sds @@ -3208,14 +3182,11 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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()) @@ -3250,14 +3221,11 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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()) diff --git a/ql/src/test/results/clientpositive/llap/sysdb.q.out b/ql/src/test/results/clientpositive/llap/sysdb.q.out index 109fca6..7f2e60c 100644 --- a/ql/src/test/results/clientpositive/llap/sysdb.q.out +++ b/ql/src/test/results/clientpositive/llap/sysdb.q.out @@ -66,10 +66,6 @@ default scr_txn hive_test_user USER DELETE true -1 hive_test_user default scr_txn hive_test_user USER INSERT true -1 hive_test_user default scr_txn hive_test_user USER SELECT true -1 hive_test_user default scr_txn hive_test_user USER UPDATE true -1 hive_test_user -default src hive_test_user USER DELETE true -1 hive_test_user -default src hive_test_user USER INSERT true -1 hive_test_user -default src hive_test_user USER SELECT true -1 hive_test_user -default src hive_test_user USER UPDATE true -1 hive_test_user default src_buck hive_test_user USER DELETE true -1 hive_test_user default src_buck hive_test_user USER INSERT true -1 hive_test_user default src_buck hive_test_user USER SELECT true -1 hive_test_user @@ -78,14 +74,10 @@ default src_skew hive_test_user USER DELETE true -1 hive_test_user default src_skew hive_test_user USER INSERT true -1 hive_test_user default src_skew hive_test_user USER SELECT true -1 hive_test_user default src_skew hive_test_user USER UPDATE true -1 hive_test_user -PREHOOK: query: DROP DATABASE IF EXISTS SYS CASCADE -PREHOOK: type: DROPDATABASE -POSTHOOK: query: DROP DATABASE IF EXISTS SYS CASCADE -POSTHOOK: type: DROPDATABASE -PREHOOK: query: CREATE DATABASE SYS +PREHOOK: query: CREATE DATABASE IF NOT EXISTS SYS PREHOOK: type: CREATEDATABASE PREHOOK: Output: database:SYS -POSTHOOK: query: CREATE DATABASE SYS +POSTHOOK: query: CREATE DATABASE IF NOT EXISTS SYS POSTHOOK: type: CREATEDATABASE POSTHOOK: Output: database:SYS PREHOOK: query: USE SYS @@ -94,7 +86,7 @@ PREHOOK: Input: database:sys POSTHOOK: query: USE SYS POSTHOOK: type: SWITCHDATABASE POSTHOOK: Input: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `BUCKETING_COLS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `BUCKETING_COLS` ( `SD_ID` bigint, `BUCKET_COL_NAME` string, `INTEGER_IDX` int, @@ -114,7 +106,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@BUCKETING_COLS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `BUCKETING_COLS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `BUCKETING_COLS` ( `SD_ID` bigint, `BUCKET_COL_NAME` string, `INTEGER_IDX` int, @@ -134,7 +126,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@BUCKETING_COLS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `CDS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `CDS` ( `CD_ID` bigint, CONSTRAINT `SYS_PK_CDS` PRIMARY KEY (`CD_ID`) DISABLE ) @@ -150,7 +142,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@CDS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `CDS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `CDS` ( `CD_ID` bigint, CONSTRAINT `SYS_PK_CDS` PRIMARY KEY (`CD_ID`) DISABLE ) @@ -166,7 +158,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@CDS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `COLUMNS_V2` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `COLUMNS_V2` ( `CD_ID` bigint, `COMMENT` string, `COLUMN_NAME` string, @@ -190,7 +182,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@COLUMNS_V2 PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `COLUMNS_V2` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `COLUMNS_V2` ( `CD_ID` bigint, `COMMENT` string, `COLUMN_NAME` string, @@ -214,7 +206,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@COLUMNS_V2 POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `DATABASE_PARAMS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DATABASE_PARAMS` ( `DB_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -234,7 +226,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@DATABASE_PARAMS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `DATABASE_PARAMS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DATABASE_PARAMS` ( `DB_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -254,7 +246,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@DATABASE_PARAMS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `DBS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DBS` ( `DB_ID` bigint, `DB_LOCATION_URI` string, `NAME` string, @@ -278,7 +270,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@DBS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `DBS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DBS` ( `DB_ID` bigint, `DB_LOCATION_URI` string, `NAME` string, @@ -302,7 +294,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@DBS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `DB_PRIVS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DB_PRIVS` ( `DB_GRANT_ID` bigint, `CREATE_TIME` int, `DB_ID` bigint, @@ -312,6 +304,7 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS `DB_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `DB_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_DB_PRIVS` PRIMARY KEY (`DB_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -327,14 +320,15 @@ TBLPROPERTIES ( \"GRANTOR_TYPE\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"DB_PRIV\" + \"DB_PRIV\", + \"AUTHORIZER\" FROM \"DB_PRIVS\"" ) PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@DB_PRIVS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `DB_PRIVS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DB_PRIVS` ( `DB_GRANT_ID` bigint, `CREATE_TIME` int, `DB_ID` bigint, @@ -344,6 +338,7 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS `DB_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `DB_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_DB_PRIVS` PRIMARY KEY (`DB_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -359,14 +354,15 @@ TBLPROPERTIES ( \"GRANTOR_TYPE\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"DB_PRIV\" + \"DB_PRIV\", + \"AUTHORIZER\" FROM \"DB_PRIVS\"" ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@DB_PRIVS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `GLOBAL_PRIVS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `GLOBAL_PRIVS` ( `USER_GRANT_ID` bigint, `CREATE_TIME` int, `GRANT_OPTION` string, @@ -375,6 +371,7 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS `GLOBAL_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `USER_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_GLOBAL_PRIVS` PRIMARY KEY (`USER_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -389,14 +386,15 @@ TBLPROPERTIES ( \"GRANTOR_TYPE\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"USER_PRIV\" + \"USER_PRIV\", + \"AUTHORIZER\" FROM \"GLOBAL_PRIVS\"" ) PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@GLOBAL_PRIVS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `GLOBAL_PRIVS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `GLOBAL_PRIVS` ( `USER_GRANT_ID` bigint, `CREATE_TIME` int, `GRANT_OPTION` string, @@ -405,6 +403,7 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS `GLOBAL_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `USER_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_GLOBAL_PRIVS` PRIMARY KEY (`USER_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -419,14 +418,15 @@ TBLPROPERTIES ( \"GRANTOR_TYPE\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"USER_PRIV\" + \"USER_PRIV\", + \"AUTHORIZER\" FROM \"GLOBAL_PRIVS\"" ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@GLOBAL_PRIVS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITIONS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITIONS` ( `PART_ID` bigint, `CREATE_TIME` int, `LAST_ACCESS_TIME` int, @@ -452,7 +452,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PARTITIONS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITIONS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITIONS` ( `PART_ID` bigint, `CREATE_TIME` int, `LAST_ACCESS_TIME` int, @@ -478,7 +478,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PARTITIONS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITION_KEYS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITION_KEYS` ( `TBL_ID` bigint, `PKEY_COMMENT` string, `PKEY_NAME` string, @@ -502,7 +502,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PARTITION_KEYS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITION_KEYS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITION_KEYS` ( `TBL_ID` bigint, `PKEY_COMMENT` string, `PKEY_NAME` string, @@ -526,7 +526,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PARTITION_KEYS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITION_KEY_VALS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITION_KEY_VALS` ( `PART_ID` bigint, `PART_KEY_VAL` string, `INTEGER_IDX` int, @@ -546,7 +546,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PARTITION_KEY_VALS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITION_KEY_VALS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITION_KEY_VALS` ( `PART_ID` bigint, `PART_KEY_VAL` string, `INTEGER_IDX` int, @@ -566,7 +566,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PARTITION_KEY_VALS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITION_PARAMS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITION_PARAMS` ( `PART_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -586,7 +586,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PARTITION_PARAMS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PARTITION_PARAMS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PARTITION_PARAMS` ( `PART_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -606,7 +606,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PARTITION_PARAMS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PART_COL_PRIVS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PART_COL_PRIVS` ( `PART_COLUMN_GRANT_ID` bigint, `COLUMN_NAME` string, `CREATE_TIME` int, @@ -617,6 +617,7 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS `PART_COL_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `PART_COL_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_PART_COL_PRIVS` PRIMARY KEY (`PART_COLUMN_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -633,14 +634,15 @@ TBLPROPERTIES ( \"PART_ID\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"PART_COL_PRIV\" + \"PART_COL_PRIV\", + \"AUTHORIZER\" FROM \"PART_COL_PRIVS\"" ) PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PART_COL_PRIVS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PART_COL_PRIVS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PART_COL_PRIVS` ( `PART_COLUMN_GRANT_ID` bigint, `COLUMN_NAME` string, `CREATE_TIME` int, @@ -651,6 +653,7 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PART_COL_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `PART_COL_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_PART_COL_PRIVS` PRIMARY KEY (`PART_COLUMN_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -667,14 +670,15 @@ TBLPROPERTIES ( \"PART_ID\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"PART_COL_PRIV\" + \"PART_COL_PRIV\", + \"AUTHORIZER\" FROM \"PART_COL_PRIVS\"" ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PART_COL_PRIVS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PART_PRIVS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PART_PRIVS` ( `PART_GRANT_ID` bigint, `CREATE_TIME` int, `GRANT_OPTION` int, @@ -684,6 +688,7 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS `PART_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `PART_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_PART_PRIVS` PRIMARY KEY (`PART_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -699,14 +704,15 @@ TBLPROPERTIES ( \"PART_ID\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"PART_PRIV\" + \"PART_PRIV\", + \"AUTHORIZER\" FROM \"PART_PRIVS\"" ) PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PART_PRIVS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PART_PRIVS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PART_PRIVS` ( `PART_GRANT_ID` bigint, `CREATE_TIME` int, `GRANT_OPTION` int, @@ -716,6 +722,7 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PART_PRIVS` ( `PRINCIPAL_NAME` string, `PRINCIPAL_TYPE` string, `PART_PRIV` string, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_PART_PRIVS` PRIMARY KEY (`PART_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -731,14 +738,15 @@ TBLPROPERTIES ( \"PART_ID\", \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", - \"PART_PRIV\" + \"PART_PRIV\", + \"AUTHORIZER\" FROM \"PART_PRIVS\"" ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PART_PRIVS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `ROLES` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `ROLES` ( `ROLE_ID` bigint, `CREATE_TIME` int, `OWNER_NAME` string, @@ -760,7 +768,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@ROLES PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `ROLES` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `ROLES` ( `ROLE_ID` bigint, `CREATE_TIME` int, `OWNER_NAME` string, @@ -782,7 +790,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@ROLES POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `ROLE_MAP` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `ROLE_MAP` ( `ROLE_GRANT_ID` bigint, `ADD_TIME` int, `GRANT_OPTION` int, @@ -812,7 +820,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@ROLE_MAP PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `ROLE_MAP` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `ROLE_MAP` ( `ROLE_GRANT_ID` bigint, `ADD_TIME` int, `GRANT_OPTION` int, @@ -842,7 +850,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@ROLE_MAP POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SDS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SDS` ( `SD_ID` bigint, `CD_ID` bigint, `INPUT_FORMAT` string, @@ -874,7 +882,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SDS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SDS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SDS` ( `SD_ID` bigint, `CD_ID` bigint, `INPUT_FORMAT` string, @@ -906,7 +914,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SDS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SD_PARAMS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SD_PARAMS` ( `SD_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -926,7 +934,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SD_PARAMS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SD_PARAMS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SD_PARAMS` ( `SD_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -946,7 +954,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SD_PARAMS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SEQUENCE_TABLE` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SEQUENCE_TABLE` ( `SEQUENCE_NAME` string, `NEXT_VAL` bigint, CONSTRAINT `SYS_PK_SEQUENCE_TABLE` PRIMARY KEY (`SEQUENCE_NAME`) DISABLE @@ -964,7 +972,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SEQUENCE_TABLE PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SEQUENCE_TABLE` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SEQUENCE_TABLE` ( `SEQUENCE_NAME` string, `NEXT_VAL` bigint, CONSTRAINT `SYS_PK_SEQUENCE_TABLE` PRIMARY KEY (`SEQUENCE_NAME`) DISABLE @@ -982,7 +990,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SEQUENCE_TABLE POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SERDES` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SERDES` ( `SERDE_ID` bigint, `NAME` string, `SLIB` string, @@ -1002,7 +1010,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SERDES PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SERDES` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SERDES` ( `SERDE_ID` bigint, `NAME` string, `SLIB` string, @@ -1022,7 +1030,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SERDES POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SERDE_PARAMS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SERDE_PARAMS` ( `SERDE_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -1042,7 +1050,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SERDE_PARAMS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SERDE_PARAMS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SERDE_PARAMS` ( `SERDE_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -1062,7 +1070,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SERDE_PARAMS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_COL_NAMES` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_COL_NAMES` ( `SD_ID` bigint, `SKEWED_COL_NAME` string, `INTEGER_IDX` int, @@ -1082,7 +1090,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SKEWED_COL_NAMES PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_COL_NAMES` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_COL_NAMES` ( `SD_ID` bigint, `SKEWED_COL_NAME` string, `INTEGER_IDX` int, @@ -1102,7 +1110,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SKEWED_COL_NAMES POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOC_MAP` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOC_MAP` ( `SD_ID` bigint, `STRING_LIST_ID_KID` bigint, `LOCATION` string, @@ -1122,7 +1130,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SKEWED_COL_VALUE_LOC_MAP PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOC_MAP` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_COL_VALUE_LOC_MAP` ( `SD_ID` bigint, `STRING_LIST_ID_KID` bigint, `LOCATION` string, @@ -1142,7 +1150,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SKEWED_COL_VALUE_LOC_MAP POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_STRING_LIST` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_STRING_LIST` ( `STRING_LIST_ID` bigint, CONSTRAINT `SYS_PK_SKEWED_STRING_LIST` PRIMARY KEY (`STRING_LIST_ID`) DISABLE ) @@ -1158,7 +1166,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SKEWED_STRING_LIST PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_STRING_LIST` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_STRING_LIST` ( `STRING_LIST_ID` bigint, CONSTRAINT `SYS_PK_SKEWED_STRING_LIST` PRIMARY KEY (`STRING_LIST_ID`) DISABLE ) @@ -1174,7 +1182,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SKEWED_STRING_LIST POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_STRING_LIST_VALUES` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_STRING_LIST_VALUES` ( `STRING_LIST_ID` bigint, `STRING_LIST_VALUE` string, `INTEGER_IDX` int, @@ -1194,7 +1202,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SKEWED_STRING_LIST_VALUES PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_STRING_LIST_VALUES` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_STRING_LIST_VALUES` ( `STRING_LIST_ID` bigint, `STRING_LIST_VALUE` string, `INTEGER_IDX` int, @@ -1214,7 +1222,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SKEWED_STRING_LIST_VALUES POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_VALUES` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_VALUES` ( `SD_ID_OID` bigint, `STRING_LIST_ID_EID` bigint, `INTEGER_IDX` int, @@ -1234,7 +1242,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SKEWED_VALUES PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SKEWED_VALUES` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SKEWED_VALUES` ( `SD_ID_OID` bigint, `STRING_LIST_ID_EID` bigint, `INTEGER_IDX` int, @@ -1254,7 +1262,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SKEWED_VALUES POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `SORT_COLS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SORT_COLS` ( `SD_ID` bigint, `COLUMN_NAME` string, `ORDER` int, @@ -1276,7 +1284,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@SORT_COLS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `SORT_COLS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `SORT_COLS` ( `SD_ID` bigint, `COLUMN_NAME` string, `ORDER` int, @@ -1298,7 +1306,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@SORT_COLS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `TABLE_PARAMS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TABLE_PARAMS` ( `TBL_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -1318,7 +1326,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@TABLE_PARAMS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TABLE_PARAMS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TABLE_PARAMS` ( `TBL_ID` bigint, `PARAM_KEY` string, `PARAM_VALUE` string, @@ -1338,7 +1346,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@TABLE_PARAMS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `TBLS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TBLS` ( `TBL_ID` bigint, `CREATE_TIME` int, `DB_ID` bigint, @@ -1375,7 +1383,7 @@ FROM \"TBLS\"" PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@TBLS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TBLS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TBLS` ( `TBL_ID` bigint, `CREATE_TIME` int, `DB_ID` bigint, @@ -1412,7 +1420,7 @@ FROM \"TBLS\"" POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@TBLS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `MV_CREATION_METADATA` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `MV_CREATION_METADATA` ( `MV_CREATION_METADATA_ID` bigint, `DB_NAME` string, `TBL_NAME` string, @@ -1433,7 +1441,7 @@ FROM \"MV_CREATION_METADATA\"" PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@MV_CREATION_METADATA PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `MV_CREATION_METADATA` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `MV_CREATION_METADATA` ( `MV_CREATION_METADATA_ID` bigint, `DB_NAME` string, `TBL_NAME` string, @@ -1454,7 +1462,7 @@ FROM \"MV_CREATION_METADATA\"" POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@MV_CREATION_METADATA POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `MV_TABLES_USED` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `MV_TABLES_USED` ( `MV_CREATION_METADATA_ID` bigint, `TBL_ID` bigint ) @@ -1470,7 +1478,7 @@ FROM \"MV_TABLES_USED\"" PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@MV_TABLES_USED PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `MV_TABLES_USED` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `MV_TABLES_USED` ( `MV_CREATION_METADATA_ID` bigint, `TBL_ID` bigint ) @@ -1486,7 +1494,7 @@ FROM \"MV_TABLES_USED\"" POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@MV_TABLES_USED POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_COL_PRIVS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TBL_COL_PRIVS` ( `TBL_COLUMN_GRANT_ID` bigint, `COLUMN_NAME` string, `CREATE_TIME` int, @@ -1497,6 +1505,7 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_COL_PRIVS` ( `PRINCIPAL_TYPE` string, `TBL_COL_PRIV` string, `TBL_ID` bigint, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_TBL_COL_PRIVS` PRIMARY KEY (`TBL_COLUMN_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -1513,14 +1522,15 @@ TBLPROPERTIES ( \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", \"TBL_COL_PRIV\", - \"TBL_ID\" + \"TBL_ID\", + \"AUTHORIZER\" FROM \"TBL_COL_PRIVS\"" ) PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@TBL_COL_PRIVS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_COL_PRIVS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TBL_COL_PRIVS` ( `TBL_COLUMN_GRANT_ID` bigint, `COLUMN_NAME` string, `CREATE_TIME` int, @@ -1531,6 +1541,7 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_COL_PRIVS` ( `PRINCIPAL_TYPE` string, `TBL_COL_PRIV` string, `TBL_ID` bigint, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_TBL_COL_PRIVS` PRIMARY KEY (`TBL_COLUMN_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -1547,14 +1558,15 @@ TBLPROPERTIES ( \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", \"TBL_COL_PRIV\", - \"TBL_ID\" + \"TBL_ID\", + \"AUTHORIZER\" FROM \"TBL_COL_PRIVS\"" ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@TBL_COL_PRIVS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TBL_PRIVS` ( `TBL_GRANT_ID` bigint, `CREATE_TIME` int, `GRANT_OPTION` int, @@ -1564,6 +1576,7 @@ PREHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( `PRINCIPAL_TYPE` string, `TBL_PRIV` string, `TBL_ID` bigint, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_TBL_PRIVS` PRIMARY KEY (`TBL_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -1579,14 +1592,15 @@ TBLPROPERTIES ( \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", \"TBL_PRIV\", - \"TBL_ID\" + \"TBL_ID\", + \"AUTHORIZER\" FROM \"TBL_PRIVS\"" ) PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@TBL_PRIVS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TBL_PRIVS` ( `TBL_GRANT_ID` bigint, `CREATE_TIME` int, `GRANT_OPTION` int, @@ -1596,6 +1610,7 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TBL_PRIVS` ( `PRINCIPAL_TYPE` string, `TBL_PRIV` string, `TBL_ID` bigint, + `AUTHORIZER` string, CONSTRAINT `SYS_PK_TBL_PRIVS` PRIMARY KEY (`TBL_GRANT_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -1611,14 +1626,15 @@ TBLPROPERTIES ( \"PRINCIPAL_NAME\", \"PRINCIPAL_TYPE\", \"TBL_PRIV\", - \"TBL_ID\" + \"TBL_ID\", + \"AUTHORIZER\" FROM \"TBL_PRIVS\"" ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@TBL_PRIVS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TAB_COL_STATS` ( `CS_ID` bigint, `DB_NAME` string, `TABLE_NAME` string, @@ -1670,7 +1686,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@TAB_COL_STATS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `TAB_COL_STATS` ( `CS_ID` bigint, `DB_NAME` string, `TABLE_NAME` string, @@ -1722,7 +1738,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@TAB_COL_STATS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `PART_COL_STATS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PART_COL_STATS` ( `CS_ID` bigint, `DB_NAME` string, `TABLE_NAME` string, @@ -1776,7 +1792,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@PART_COL_STATS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `PART_COL_STATS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `PART_COL_STATS` ( `CS_ID` bigint, `DB_NAME` string, `TABLE_NAME` string, @@ -1830,36 +1846,22 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PART_COL_STATS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `VERSION` ( - `VER_ID` BIGINT, - `SCHEMA_VERSION` string, - `VERSION_COMMENT` string, - CONSTRAINT `SYS_PK_VERSION` PRIMARY KEY (`VER_ID`) DISABLE -) -PREHOOK: type: CREATETABLE +PREHOOK: query: CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '3.1.0' AS `SCHEMA_VERSION`, + 'Hive release version 3.1.0' AS `VERSION_COMMENT` +PREHOOK: type: CREATEVIEW +PREHOOK: Input: _dummy_database@_dummy_table PREHOOK: Output: SYS@VERSION PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `VERSION` ( - `VER_ID` BIGINT, - `SCHEMA_VERSION` string, - `VERSION_COMMENT` string, - CONSTRAINT `SYS_PK_VERSION` PRIMARY KEY (`VER_ID`) DISABLE -) -POSTHOOK: type: CREATETABLE +POSTHOOK: query: CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '3.1.0' AS `SCHEMA_VERSION`, + 'Hive release version 3.1.0' AS `VERSION_COMMENT` +POSTHOOK: type: CREATEVIEW +POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: SYS@VERSION POSTHOOK: Output: database:sys -PREHOOK: query: INSERT INTO `VERSION` VALUES (1, '3.1.0', 'Hive release version 3.1.0') -PREHOOK: type: QUERY -PREHOOK: Input: _dummy_database@_dummy_table -PREHOOK: Output: sys@version -POSTHOOK: query: INSERT INTO `VERSION` VALUES (1, '3.1.0', 'Hive release version 3.1.0') -POSTHOOK: type: QUERY -POSTHOOK: Input: _dummy_database@_dummy_table -POSTHOOK: Output: sys@version -POSTHOOK: Lineage: version.schema_version SCRIPT [] -POSTHOOK: Lineage: version.ver_id SCRIPT [] -POSTHOOK: Lineage: version.version_comment SCRIPT [] -PREHOOK: query: CREATE TABLE IF NOT EXISTS `DB_VERSION` ( +POSTHOOK: Lineage: VERSION.schema_version SIMPLE [] +POSTHOOK: Lineage: VERSION.ver_id SIMPLE [] +POSTHOOK: Lineage: VERSION.version_comment SIMPLE [] +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DB_VERSION` ( `VER_ID` BIGINT, `SCHEMA_VERSION` string, `VERSION_COMMENT` string, @@ -1879,7 +1881,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@DB_VERSION PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `DB_VERSION` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `DB_VERSION` ( `VER_ID` BIGINT, `SCHEMA_VERSION` string, `VERSION_COMMENT` string, @@ -1899,7 +1901,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@DB_VERSION POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `FUNCS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `FUNCS` ( `FUNC_ID` bigint, `CLASS_NAME` string, `CREATE_TIME` int, @@ -1929,7 +1931,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@FUNCS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `FUNCS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `FUNCS` ( `FUNC_ID` bigint, `CLASS_NAME` string, `CREATE_TIME` int, @@ -1959,7 +1961,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@FUNCS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `KEY_CONSTRAINTS` +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `KEY_CONSTRAINTS` ( `CHILD_CD_ID` bigint, `CHILD_INTEGER_IDX` int, @@ -2000,7 +2002,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@KEY_CONSTRAINTS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `KEY_CONSTRAINTS` +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `KEY_CONSTRAINTS` ( `CHILD_CD_ID` bigint, `CHILD_INTEGER_IDX` int, @@ -2041,7 +2043,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@KEY_CONSTRAINTS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE VIEW `TABLE_STATS_VIEW` AS +PREHOOK: query: CREATE OR REPLACE VIEW `TABLE_STATS_VIEW` AS SELECT `TBL_ID`, max(CASE `PARAM_KEY` WHEN 'COLUMN_STATS_ACCURATE' THEN `PARAM_VALUE` END) AS COLUMN_STATS_ACCURATE, @@ -2055,7 +2057,7 @@ PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@table_params PREHOOK: Output: SYS@TABLE_STATS_VIEW PREHOOK: Output: database:sys -POSTHOOK: query: CREATE VIEW `TABLE_STATS_VIEW` AS +POSTHOOK: query: CREATE OR REPLACE VIEW `TABLE_STATS_VIEW` AS SELECT `TBL_ID`, max(CASE `PARAM_KEY` WHEN 'COLUMN_STATS_ACCURATE' THEN `PARAM_VALUE` END) AS COLUMN_STATS_ACCURATE, @@ -2076,7 +2078,7 @@ POSTHOOK: Lineage: TABLE_STATS_VIEW.raw_data_size EXPRESSION [(table_params)tabl POSTHOOK: Lineage: TABLE_STATS_VIEW.tbl_id SIMPLE [(table_params)table_params.FieldSchema(name:tbl_id, type:bigint, comment:from deserializer), ] POSTHOOK: Lineage: TABLE_STATS_VIEW.total_size EXPRESSION [(table_params)table_params.FieldSchema(name:param_key, type:string, comment:from deserializer), (table_params)table_params.FieldSchema(name:param_value, type:string, comment:from deserializer), ] POSTHOOK: Lineage: TABLE_STATS_VIEW.transient_last_ddl_time EXPRESSION [(table_params)table_params.FieldSchema(name:param_key, type:string, comment:from deserializer), (table_params)table_params.FieldSchema(name:param_value, type:string, comment:from deserializer), ] -PREHOOK: query: CREATE VIEW `PARTITION_STATS_VIEW` AS +PREHOOK: query: CREATE OR REPLACE VIEW `PARTITION_STATS_VIEW` AS SELECT `PART_ID`, max(CASE `PARAM_KEY` WHEN 'COLUMN_STATS_ACCURATE' THEN `PARAM_VALUE` END) AS COLUMN_STATS_ACCURATE, @@ -2090,7 +2092,7 @@ PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@partition_params PREHOOK: Output: SYS@PARTITION_STATS_VIEW PREHOOK: Output: database:sys -POSTHOOK: query: CREATE VIEW `PARTITION_STATS_VIEW` AS +POSTHOOK: query: CREATE OR REPLACE VIEW `PARTITION_STATS_VIEW` AS SELECT `PART_ID`, max(CASE `PARAM_KEY` WHEN 'COLUMN_STATS_ACCURATE' THEN `PARAM_VALUE` END) AS COLUMN_STATS_ACCURATE, @@ -2111,7 +2113,7 @@ POSTHOOK: Lineage: PARTITION_STATS_VIEW.part_id SIMPLE [(partition_params)partit POSTHOOK: Lineage: PARTITION_STATS_VIEW.raw_data_size EXPRESSION [(partition_params)partition_params.FieldSchema(name:param_key, type:string, comment:from deserializer), (partition_params)partition_params.FieldSchema(name:param_value, type:string, comment:from deserializer), ] POSTHOOK: Lineage: PARTITION_STATS_VIEW.total_size EXPRESSION [(partition_params)partition_params.FieldSchema(name:param_key, type:string, comment:from deserializer), (partition_params)partition_params.FieldSchema(name:param_value, type:string, comment:from deserializer), ] POSTHOOK: Lineage: PARTITION_STATS_VIEW.transient_last_ddl_time EXPRESSION [(partition_params)partition_params.FieldSchema(name:param_key, type:string, comment:from deserializer), (partition_params)partition_params.FieldSchema(name:param_value, type:string, comment:from deserializer), ] -PREHOOK: query: CREATE TABLE IF NOT EXISTS `WM_RESOURCEPLANS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_RESOURCEPLANS` ( `NAME` string, `STATUS` string, `QUERY_PARALLELISM` int, @@ -2132,7 +2134,7 @@ FROM PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@WM_RESOURCEPLANS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `WM_RESOURCEPLANS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_RESOURCEPLANS` ( `NAME` string, `STATUS` string, `QUERY_PARALLELISM` int, @@ -2153,7 +2155,7 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@WM_RESOURCEPLANS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `WM_TRIGGERS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_TRIGGERS` ( `RP_NAME` string, `NAME` string, `TRIGGER_EXPRESSION` string, @@ -2178,7 +2180,7 @@ ON PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@WM_TRIGGERS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `WM_TRIGGERS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_TRIGGERS` ( `RP_NAME` string, `NAME` string, `TRIGGER_EXPRESSION` string, @@ -2203,7 +2205,7 @@ ON POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@WM_TRIGGERS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `WM_POOLS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS` ( `RP_NAME` string, `PATH` string, `ALLOC_FRACTION` double, @@ -2230,7 +2232,7 @@ ON PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@WM_POOLS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `WM_POOLS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS` ( `RP_NAME` string, `PATH` string, `ALLOC_FRACTION` double, @@ -2257,7 +2259,7 @@ ON POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@WM_POOLS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `WM_POOLS_TO_TRIGGERS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS_TO_TRIGGERS` ( `RP_NAME` string, `POOL_PATH` string, `TRIGGER_NAME` string @@ -2287,7 +2289,7 @@ WHERE CAST(\"WM_TRIGGER\".\"IS_IN_UNMANAGED\" AS CHAR) IN ('1', 't') PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@WM_POOLS_TO_TRIGGERS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `WM_POOLS_TO_TRIGGERS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS_TO_TRIGGERS` ( `RP_NAME` string, `POOL_PATH` string, `TRIGGER_NAME` string @@ -2317,7 +2319,7 @@ WHERE CAST(\"WM_TRIGGER\".\"IS_IN_UNMANAGED\" AS CHAR) IN ('1', 't') POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@WM_POOLS_TO_TRIGGERS POSTHOOK: Output: database:sys -PREHOOK: query: CREATE TABLE IF NOT EXISTS `WM_MAPPINGS` ( +PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_MAPPINGS` ( `RP_NAME` string, `ENTITY_TYPE` string, `ENTITY_NAME` string, @@ -2342,7 +2344,7 @@ LEFT OUTER JOIN \"WM_POOL\" ON \"WM_POOL\".\"POOL_ID\" = \"WM_MAPPING\".\"POOL_I PREHOOK: type: CREATETABLE PREHOOK: Output: SYS@WM_MAPPINGS PREHOOK: Output: database:sys -POSTHOOK: query: CREATE TABLE IF NOT EXISTS `WM_MAPPINGS` ( +POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_MAPPINGS` ( `RP_NAME` string, `ENTITY_TYPE` string, `ENTITY_NAME` string, @@ -2367,14 +2369,10 @@ LEFT OUTER JOIN \"WM_POOL\" ON \"WM_POOL\".\"POOL_ID\" = \"WM_MAPPING\".\"POOL_I POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@WM_MAPPINGS POSTHOOK: Output: database:sys -PREHOOK: query: DROP DATABASE IF EXISTS INFORMATION_SCHEMA CASCADE -PREHOOK: type: DROPDATABASE -POSTHOOK: query: DROP DATABASE IF EXISTS INFORMATION_SCHEMA CASCADE -POSTHOOK: type: DROPDATABASE -PREHOOK: query: CREATE DATABASE INFORMATION_SCHEMA +PREHOOK: query: CREATE DATABASE IF NOT EXISTS INFORMATION_SCHEMA PREHOOK: type: CREATEDATABASE PREHOOK: Output: database:INFORMATION_SCHEMA -POSTHOOK: query: CREATE DATABASE INFORMATION_SCHEMA +POSTHOOK: query: CREATE DATABASE IF NOT EXISTS INFORMATION_SCHEMA POSTHOOK: type: CREATEDATABASE POSTHOOK: Output: database:INFORMATION_SCHEMA PREHOOK: query: USE INFORMATION_SCHEMA @@ -2383,7 +2381,7 @@ PREHOOK: Input: database:information_schema POSTHOOK: query: USE INFORMATION_SCHEMA POSTHOOK: type: SWITCHDATABASE POSTHOOK: Input: database:information_schema -PREHOOK: query: CREATE VIEW IF NOT EXISTS `SCHEMATA` +PREHOOK: query: CREATE OR REPLACE VIEW `SCHEMATA` ( `CATALOG_NAME`, `SCHEMA_NAME`, @@ -2402,20 +2400,20 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER` PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@tbl_privs PREHOOK: Input: sys@tbls PREHOOK: Output: INFORMATION_SCHEMA@SCHEMATA PREHOOK: Output: database:information_schema -POSTHOOK: query: CREATE VIEW IF NOT EXISTS `SCHEMATA` +POSTHOOK: query: CREATE OR REPLACE VIEW `SCHEMATA` ( `CATALOG_NAME`, `SCHEMA_NAME`, @@ -2434,13 +2432,13 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P + `sys`.`DBS` D LEFT JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - NOT restrict_information_schema() OR - D.`DB_ID` = T.`DB_ID` - AND T.`TBL_ID` = P.`TBL_ID` + 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 current_authorizer() = P.`AUTHORIZER` POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs @@ -2454,7 +2452,7 @@ POSTHOOK: Lineage: SCHEMATA.default_character_set_schema EXPRESSION [] POSTHOOK: Lineage: SCHEMATA.schema_name SIMPLE [(dbs)d.FieldSchema(name:name, type:string, comment:from deserializer), ] #### A masked pattern was here #### POSTHOOK: Lineage: SCHEMATA.sql_path SIMPLE [(dbs)d.FieldSchema(name:db_location_uri, type:string, comment:from deserializer), ] -PREHOOK: query: CREATE VIEW IF NOT EXISTS `TABLES` +PREHOOK: query: CREATE OR REPLACE VIEW `TABLES` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -2483,20 +2481,20 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@tbl_privs PREHOOK: Input: sys@tbls PREHOOK: Output: INFORMATION_SCHEMA@TABLES PREHOOK: Output: database:information_schema -POSTHOOK: query: CREATE VIEW IF NOT EXISTS `TABLES` +POSTHOOK: query: CREATE OR REPLACE VIEW `TABLES` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -2525,13 +2523,13 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P + `sys`.`TBLS` T JOIN `sys`.`DBS` D ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` + 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.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs @@ -2550,7 +2548,7 @@ POSTHOOK: Lineage: TABLES.table_type EXPRESSION [(tbls)t.FieldSchema(name:view_o POSTHOOK: Lineage: TABLES.user_defined_type_catalog EXPRESSION [] POSTHOOK: Lineage: TABLES.user_defined_type_name EXPRESSION [] POSTHOOK: Lineage: TABLES.user_defined_type_schema EXPRESSION [] -PREHOOK: query: CREATE VIEW IF NOT EXISTS `TABLE_PRIVILEGES` +PREHOOK: query: CREATE OR REPLACE VIEW `TABLE_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -2571,25 +2569,22 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT') + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()) PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@tbl_privs PREHOOK: Input: sys@tbls PREHOOK: Output: INFORMATION_SCHEMA@TABLE_PRIVILEGES PREHOOK: Output: database:information_schema -POSTHOOK: query: CREATE VIEW IF NOT EXISTS `TABLE_PRIVILEGES` +POSTHOOK: query: CREATE OR REPLACE VIEW `TABLE_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -2610,18 +2605,15 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `sys`.`TBL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - P.`TBL_ID` = T.`TBL_ID` - AND T.`DB_ID` = D.`DB_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR + (P2.`TBL_ID` IS NOT NULL AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT') + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer()) POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs @@ -2636,7 +2628,7 @@ POSTHOOK: Lineage: TABLE_PRIVILEGES.table_catalog SIMPLE [] POSTHOOK: Lineage: TABLE_PRIVILEGES.table_name SIMPLE [(tbls)t.FieldSchema(name:tbl_name, type:string, comment:from deserializer), ] POSTHOOK: Lineage: TABLE_PRIVILEGES.table_schema SIMPLE [(dbs)d.FieldSchema(name:name, type:string, comment:from deserializer), ] POSTHOOK: Lineage: TABLE_PRIVILEGES.with_hierarchy SIMPLE [] -PREHOOK: query: CREATE VIEW IF NOT EXISTS `COLUMNS` +PREHOOK: query: CREATE OR REPLACE VIEW `COLUMNS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -2775,21 +2767,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT') + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@columns_v2 PREHOOK: Input: sys@dbs @@ -2798,7 +2785,7 @@ PREHOOK: Input: sys@tbl_col_privs PREHOOK: Input: sys@tbls PREHOOK: Output: INFORMATION_SCHEMA@COLUMNS PREHOOK: Output: database:information_schema -POSTHOOK: query: CREATE VIEW IF NOT EXISTS `COLUMNS` +POSTHOOK: query: CREATE OR REPLACE VIEW `COLUMNS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -2937,21 +2924,16 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `sys`.`COLUMNS_V2` C, - `sys`.`SDS` S, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`TBL_COL_PRIVS` P + `sys`.`COLUMNS_V2` C JOIN `sys`.`SDS` S ON (C.`CD_ID` = S.`CD_ID`) + JOIN `sys`.`TBLS` T ON (S.`SD_ID` = T.`SD_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + LEFT JOIN `sys`.`TBL_COL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND C.`CD_ID` = S.`CD_ID` - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL AND C.`COLUMN_NAME` = P.`COLUMN_NAME` 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_COL_PRIV`='SELECT') + AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@columns_v2 POSTHOOK: Input: sys@dbs @@ -3007,7 +2989,7 @@ POSTHOOK: Lineage: COLUMNS.table_schema SIMPLE [(dbs)d.FieldSchema(name:name, ty POSTHOOK: Lineage: COLUMNS.udt_catalog EXPRESSION [] POSTHOOK: Lineage: COLUMNS.udt_name EXPRESSION [] POSTHOOK: Lineage: COLUMNS.udt_schema EXPRESSION [] -PREHOOK: query: CREATE VIEW IF NOT EXISTS `COLUMN_PRIVILEGES` +PREHOOK: query: CREATE OR REPLACE VIEW `COLUMN_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -3028,20 +3010,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT') + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer() PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@sds @@ -3050,7 +3028,7 @@ PREHOOK: Input: sys@tbl_privs PREHOOK: Input: sys@tbls PREHOOK: Output: INFORMATION_SCHEMA@COLUMN_PRIVILEGES PREHOOK: Output: database:information_schema -POSTHOOK: query: CREATE VIEW IF NOT EXISTS `COLUMN_PRIVILEGES` +POSTHOOK: query: CREATE OR REPLACE VIEW `COLUMN_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -3071,20 +3049,16 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `sys`.`TBL_COL_PRIVS` P, - `sys`.`TBLS` T, - `sys`.`DBS` D, - `sys`.`SDS` S, - `sys`.`TBL_PRIVS` P2 + `sys`.`TBL_COL_PRIVS` P JOIN `sys`.`TBLS` T ON (P.`TBL_ID` = T.`TBL_ID`) + JOIN `sys`.`DBS` D ON (T.`DB_ID` = D.`DB_ID`) + JOIN `sys`.`SDS` S ON (S.`SD_ID` = T.`SD_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P2 ON (P.`TBL_ID` = P2.`TBL_ID`) WHERE - S.`SD_ID` = T.`SD_ID` - AND T.`DB_ID` = D.`DB_ID` - AND P.`TBL_ID` = T.`TBL_ID` - AND (NOT restrict_information_schema() OR - P.`TBL_ID` = P2.`TBL_ID` AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` + NOT restrict_information_schema() OR P2.`TBL_ID` IS NOT NULL + AND P.`PRINCIPAL_NAME` = P2.`PRINCIPAL_NAME` AND P.`PRINCIPAL_TYPE` = P2.`PRINCIPAL_TYPE` AND (P2.`PRINCIPAL_NAME`=current_user() AND P2.`PRINCIPAL_TYPE`='USER' OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) - AND P2.`TBL_PRIV`='SELECT') + AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer() POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@sds @@ -3101,7 +3075,7 @@ POSTHOOK: Lineage: COLUMN_PRIVILEGES.privilege_type SIMPLE [(tbl_col_privs)p.Fie POSTHOOK: Lineage: COLUMN_PRIVILEGES.table_catalog SIMPLE [] POSTHOOK: Lineage: COLUMN_PRIVILEGES.table_name SIMPLE [(tbls)t.FieldSchema(name:tbl_name, type:string, comment:from deserializer), ] POSTHOOK: Lineage: COLUMN_PRIVILEGES.table_schema SIMPLE [(dbs)d.FieldSchema(name:name, type:string, comment:from deserializer), ] -PREHOOK: query: CREATE VIEW IF NOT EXISTS `VIEWS` +PREHOOK: query: CREATE OR REPLACE VIEW `VIEWS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -3126,24 +3100,21 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()) PREHOOK: type: CREATEVIEW PREHOOK: Input: sys@dbs PREHOOK: Input: sys@tbl_privs PREHOOK: Input: sys@tbls PREHOOK: Output: INFORMATION_SCHEMA@VIEWS PREHOOK: Output: database:information_schema -POSTHOOK: query: CREATE VIEW IF NOT EXISTS `VIEWS` +POSTHOOK: query: CREATE OR REPLACE VIEW `VIEWS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -3168,17 +3139,14 @@ SELECT DISTINCT false, false FROM - `sys`.`DBS` D, - `sys`.`TBLS` T, - `sys`.`TBL_PRIVS` P + `sys`.`DBS` D JOIN `sys`.`TBLS` T ON (D.`DB_ID` = T.`DB_ID`) + LEFT JOIN `sys`.`TBL_PRIVS` P ON (T.`TBL_ID` = P.`TBL_ID`) WHERE - D.`DB_ID` = T.`DB_ID` - AND length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR - T.`TBL_ID` = P.`TBL_ID` + length(T.VIEW_ORIGINAL_TEXT) > 0 + AND (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.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()) POSTHOOK: type: CREATEVIEW POSTHOOK: Input: sys@dbs POSTHOOK: Input: sys@tbl_privs @@ -3219,7 +3187,7 @@ POSTHOOK: query: select count(*) from cds POSTHOOK: type: QUERY POSTHOOK: Input: sys@cds #### A masked pattern was here #### -57 +56 PREHOOK: query: select column_name, type_name, integer_idx from columns_v2 order by column_name, integer_idx limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@columns_v2 @@ -3232,7 +3200,7 @@ a decimal(10,2) 0 action_expression string 3 add_time int 1 alloc_fraction double 2 -avg_col_len double 14 +authorizer string 8 PREHOOK: query: select param_key, param_value from database_params order by param_key, param_value limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@database_params @@ -3357,23 +3325,54 @@ STAGE PLANS: TableScan alias: sds Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE + TableScan Vectorization: + native: true + vectorizationSchemaColumns: [0:sd_id:bigint, 1:cd_id:bigint, 2:input_format:string, 3:is_compressed:boolean, 4:is_storedassubdirectories:boolean, 5:location:string, 6:num_buckets:int, 7:output_format:string, 8:serde_id:bigint, 9:ROW__ID:struct] Select Operator + Select Vectorization: + className: VectorSelectOperator + native: true + projectedOutputColumnNums: [] Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: COMPLETE Group By Operator aggregations: count() + Group By Vectorization: + aggregators: VectorUDAFCountStar(*) -> bigint + className: VectorGroupByOperator + groupByMode: HASH + native: false + vectorProcessingMode: HASH + projectedOutputColumnNums: [0] mode: hash outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: COMPLETE Reduce Output Operator sort order: + Reduce Sink Vectorization: + className: VectorReduceSinkEmptyKeyOperator + keyColumnNums: [] + native: true + nativeConditionsMet: hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine tez IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true + valueColumnNums: [0] Statistics: Num rows: 1 Data size: 8 Basic stats: PARTIAL Column stats: COMPLETE value expressions: _col0 (type: bigint) - Execution mode: llap + Execution mode: vectorized, llap LLAP IO: no inputs Map Vectorization: - enabled: false - enabledConditionsNotMet: hive.vectorized.use.row.serde.deserialize IS true AND hive.vectorized.row.serde.inputformat.excludes NOT CONTAINS org.apache.hive.storage.jdbc.JdbcInputFormat IS false, hive.vectorized.use.row.serde.deserialize IS false + enabled: true + enabledConditionsMet: hive.vectorized.use.row.serde.deserialize IS true + inputFormatFeatureSupport: [] + featureSupportInUse: [] inputFileFormats: org.apache.hive.storage.jdbc.JdbcInputFormat + allNative: false + usesVectorUDFAdaptor: false + vectorized: true + rowBatchContext: + dataColumnCount: 9 + includeColumns: [] + dataColumns: sd_id:bigint, cd_id:bigint, input_format:string, is_compressed:boolean, is_storedassubdirectories:boolean, location:string, num_buckets:int, output_format:string, serde_id:bigint + partitionColumnCount: 0 + scratchColumnTypeNames: [] Reducer 2 Execution mode: vectorized, llap Reduce Vectorization: @@ -3427,7 +3426,7 @@ POSTHOOK: query: select count(*) from sds POSTHOOK: type: QUERY POSTHOOK: Input: sys@sds #### A masked pattern was here #### -57 +56 PREHOOK: query: select param_key, param_value from sd_params order by param_key, param_value limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@sd_params @@ -3436,19 +3435,6 @@ POSTHOOK: query: select param_key, param_value from sd_params order by param_key POSTHOOK: type: QUERY POSTHOOK: Input: sys@sd_params #### A masked pattern was here #### -PREHOOK: query: select sequence_name from sequence_table order by sequence_name limit 5 -PREHOOK: type: QUERY -PREHOOK: Input: sys@sequence_table -#### A masked pattern was here #### -POSTHOOK: query: select sequence_name from sequence_table order by sequence_name limit 5 -POSTHOOK: type: QUERY -POSTHOOK: Input: sys@sequence_table -#### A masked pattern was here #### -org.apache.hadoop.hive.metastore.model.MCatalog -org.apache.hadoop.hive.metastore.model.MColumnDescriptor -org.apache.hadoop.hive.metastore.model.MDatabase -org.apache.hadoop.hive.metastore.model.MFunction -org.apache.hadoop.hive.metastore.model.MGlobalPrivilege PREHOOK: query: select name, slib from serdes order by name, slib limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@serdes @@ -3540,7 +3526,7 @@ COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"a":"true","b":"true COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"action_expression":"true","name":"true","rp_name":"true","trigger_expression":"true"}} COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"add_time":"true","grant_option":"true","grantor":"true","grantor_type":"true","principal_name":"true","principal_type":"true","role_grant_id":"true","role_id":"true"}} COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"alloc_fraction":"true","path":"true","query_parallelism":"true","rp_name":"true","scheduling_policy":"true"}} -COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"avg_col_len":"true","big_decimal_high_value":"true","big_decimal_low_value":"true","column_name":"true","column_type":"true","cs_id":"true","db_name":"true","double_high_value":"true","double_low_value":"true","last_analyzed":"true","long_high_value":"true","long_low_value":"true","max_col_len":"true","num_distincts":"true","num_falses":"true","num_nulls":"true","num_trues":"true","part_id":"true","partition_name":"true","table_name":"true"}} +COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"authorizer":"true","column_name":"true","create_time":"true","grant_option":"true","grantor":"true","grantor_type":"true","part_col_priv":"true","part_column_grant_id":"true","part_id":"true","principal_name":"true","principal_type":"true"}} PREHOOK: query: select tbl_name from tbls order by tbl_name limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@tbls @@ -3583,15 +3569,15 @@ POSTHOOK: query: select table_name, column_name, num_nulls, num_distincts from t POSTHOOK: type: QUERY POSTHOOK: Input: sys@tab_col_stats #### A masked pattern was here #### -alltypesorc cbigint 3115 6064 +alltypesorc cbigint 3115 5917 alltypesorc cboolean1 3114 0 alltypesorc cboolean2 3115 0 -alltypesorc cdouble 3114 5569 +alltypesorc cdouble 3114 5527 alltypesorc cfloat 3115 131 -alltypesorc cint 3115 6029 -alltypesorc csmallint 3114 5594 -alltypesorc cstring1 3114 6058 -alltypesorc cstring2 3115 6040 +alltypesorc cint 3115 6104 +alltypesorc csmallint 3114 5666 +alltypesorc cstring1 3114 5979 +alltypesorc cstring2 3115 6122 alltypesorc ctimestamp1 3115 35 PREHOOK: query: select table_name, partition_name, column_name, num_nulls, num_distincts from part_col_stats order by table_name, partition_name, column_name limit 10 PREHOOK: type: QUERY @@ -3603,13 +3589,15 @@ POSTHOOK: Input: sys@part_col_stats #### A masked pattern was here #### PREHOOK: query: select schema_version from version order by schema_version limit 5 PREHOOK: type: QUERY +PREHOOK: Input: _dummy_database@_dummy_table PREHOOK: Input: sys@version #### A masked pattern was here #### POSTHOOK: query: select schema_version from version order by schema_version limit 5 POSTHOOK: type: QUERY +POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Input: sys@version #### A masked pattern was here #### -3.0.0 +3.1.0 PREHOOK: query: select func_name, func_type from funcs order by func_name, func_type limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@funcs @@ -3642,11 +3630,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: sys@table_params POSTHOOK: Input: sys@table_stats_view #### A masked pattern was here #### -{"BASIC_STATS":"true","COLUMN_STATS":{"action_expression":"true","name":"true","rp_name":"true","trigger_expression":"true"}} 0 0 0 0 -#### A masked pattern was here #### +{"BASIC_STATS":"true","COLUMN_STATS":{"a":"true","b":"true","c":"true","d":"true","e":"true","f":"true","g":"true"}} 0 0 0 0 +{"BASIC_STATS":"true","COLUMN_STATS":{"create_time":"true","last_access_time":"true","part_id":"true","part_name":"true","sd_id":"true","tbl_id":"true"}} 0 0 0 0 {"BASIC_STATS":"true","COLUMN_STATS":{"db_id":"true","param_key":"true","param_value":"true"}} 0 0 0 0 -{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} 0 0 0 0 -{"BASIC_STATS":"true","COLUMN_STATS":{"param_key":"true","param_value":"true","serde_id":"true"}} 0 0 0 0 +{"BASIC_STATS":"true","COLUMN_STATS":{"default_pool_path":"true","name":"true","query_parallelism":"true","status":"true"}} 0 0 0 0 +{"BASIC_STATS":"true","COLUMN_STATS":{"integer_idx":"true","part_id":"true","part_key_val":"true"}} 0 0 0 0 PREHOOK: query: select COLUMN_STATS_ACCURATE, NUM_FILES, NUM_ROWS, RAW_DATA_SIZE, TOTAL_SIZE FROM PARTITION_STATS_VIEW where COLUMN_STATS_ACCURATE is not null order by NUM_FILES, NUM_ROWS, RAW_DATA_SIZE limit 5 PREHOOK: type: QUERY PREHOOK: Input: sys@partition_params @@ -3716,7 +3704,7 @@ STAGE PLANS: sort order: Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: bigint) - Execution mode: llap + Execution mode: vectorized, llap LLAP IO: no inputs Reducer 2 Execution mode: vectorized, llap @@ -3748,14 +3736,13 @@ POSTHOOK: query: select max(num_distincts) from sys.tab_col_stats POSTHOOK: type: QUERY POSTHOOK: Input: sys@tab_col_stats #### A masked pattern was here #### -6064 +6122 PREHOOK: query: use INFORMATION_SCHEMA PREHOOK: type: SWITCHDATABASE PREHOOK: Input: database:information_schema POSTHOOK: query: use INFORMATION_SCHEMA POSTHOOK: type: SWITCHDATABASE POSTHOOK: Input: database:information_schema -Warning: Shuffle Join MERGEJOIN[20][tables = [d, t, p]] in Stage 'Reducer 2' is a cross product PREHOOK: query: select count(*) from SCHEMATA PREHOOK: type: QUERY PREHOOK: Input: information_schema@schemata @@ -3771,7 +3758,6 @@ POSTHOOK: Input: sys@tbl_privs POSTHOOK: Input: sys@tbls #### A masked pattern was here #### 3 -Warning: Shuffle Join MERGEJOIN[38][tables = [t, d, p]] in Stage 'Reducer 3' is a cross product PREHOOK: query: select * from TABLES order by TABLE_SCHEMA, TABLE_NAME PREHOOK: type: QUERY PREHOOK: Input: information_schema@tables @@ -3789,7 +3775,6 @@ POSTHOOK: Input: sys@tbls default default alltypesorc BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default default moretypes BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default default scr_txn BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL -default default src BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default default src_buck BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default default src_skew BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default information_schema column_privileges VIEW NULL NULL NULL NULL NULL NO NO NULL @@ -3837,13 +3822,12 @@ default sys table_stats_view VIEW NULL NULL NULL NULL NULL NO NO NULL default sys tbl_col_privs BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default sys tbl_privs BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default sys tbls BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL -default sys version BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL +default sys version VIEW NULL NULL NULL NULL NULL NO NO NULL default sys wm_mappings BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default sys wm_pools BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default sys wm_pools_to_triggers BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default sys wm_resourceplans BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL default sys wm_triggers BASE_TABLE NULL NULL NULL NULL NULL YES NO NULL -Warning: Shuffle Join MERGEJOIN[60][tables = [p, t, d, p2]] in Stage 'Reducer 4' is a cross product PREHOOK: query: select * from TABLE_PRIVILEGES order by GRANTOR, GRANTEE, TABLE_SCHEMA, TABLE_NAME, PRIVILEGE_TYPE limit 10 PREHOOK: type: QUERY PREHOOK: Input: information_schema@table_privileges @@ -3868,7 +3852,6 @@ hive_test_user hive_test_user default default moretypes SELECT YES NO hive_test_user hive_test_user default default moretypes UPDATE YES NO hive_test_user hive_test_user default default scr_txn DELETE YES NO hive_test_user hive_test_user default default scr_txn INSERT YES NO -Warning: Shuffle Join MERGEJOIN[82][tables = [c, s, t, d, p]] in Stage 'Reducer 5' is a cross product PREHOOK: query: select * from COLUMNS where TABLE_NAME = 'alltypesorc' or TABLE_NAME = 'moretypes' order by TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION PREHOOK: type: QUERY PREHOOK: Input: information_schema@columns @@ -3887,7 +3870,25 @@ POSTHOOK: Input: sys@sds POSTHOOK: Input: sys@tbl_col_privs POSTHOOK: Input: sys@tbls #### A masked pattern was here #### -Warning: Shuffle Join MERGEJOIN[82][tables = [p, t, d, s, p2]] in Stage 'Reducer 5' is a cross product +default default alltypesorc cbigint 3 NULL YES bigint NULL NULL 19 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES bigint 19 10 +default default alltypesorc cboolean1 10 NULL YES boolean NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES boolean NULL NULL +default default alltypesorc cboolean2 11 NULL YES boolean NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES boolean NULL NULL +default default alltypesorc cdouble 5 NULL YES double NULL NULL 53 2 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES double 53 2 +default default alltypesorc cfloat 4 NULL YES float NULL NULL 23 2 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES float 23 2 +default default alltypesorc cint 2 NULL YES int NULL NULL 10 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES int 10 10 +default default alltypesorc csmallint 1 NULL YES smallint NULL NULL 5 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES smallint 5 10 +default default alltypesorc cstring1 6 NULL YES string NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES string NULL NULL +default default alltypesorc cstring2 7 NULL YES string NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES string NULL NULL +default default alltypesorc ctimestamp1 8 NULL YES timestamp NULL NULL NULL NULL NULL 9 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES timestamp NULL NULL +default default alltypesorc ctimestamp2 9 NULL YES timestamp NULL NULL NULL NULL NULL 9 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES timestamp NULL NULL +default default alltypesorc ctinyint 0 NULL YES tinyint NULL NULL 3 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 1 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES tinyint 3 10 +default default moretypes a 0 NULL YES decimal(10,2) NULL NULL 10 10 2 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES decimal(10,2) 10 10 +default default moretypes b 1 NULL YES tinyint NULL NULL 3 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES tinyint 3 10 +default default moretypes c 2 NULL YES smallint NULL NULL 5 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES smallint 5 10 +default default moretypes d 3 NULL YES int NULL NULL 10 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES int 10 10 +default default moretypes e 4 NULL YES bigint NULL NULL 19 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES bigint 19 10 +default default moretypes f 5 NULL YES varchar(10) 10 10 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES varchar(10) NULL NULL +default default moretypes g 6 NULL YES char(3) 3 3 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 5 NO NO NULL NULL NULL NULL NULL NULL NEVER NULL NO NO NULL YES char(3) NULL NULL PREHOOK: query: select * from COLUMN_PRIVILEGES order by GRANTOR, GRANTEE, TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME limit 10 PREHOOK: type: QUERY PREHOOK: Input: information_schema@column_privileges @@ -3906,7 +3907,6 @@ POSTHOOK: Input: sys@tbl_col_privs POSTHOOK: Input: sys@tbl_privs POSTHOOK: Input: sys@tbls #### A masked pattern was here #### -Warning: Shuffle Join MERGEJOIN[38][tables = [d, t, p]] in Stage 'Reducer 3' is a cross product PREHOOK: query: select TABLE_SCHEMA, TABLE_NAME from views order by TABLE_SCHEMA, TABLE_NAME PREHOOK: type: QUERY PREHOOK: Input: information_schema@views @@ -3929,3 +3929,4 @@ information_schema tables information_schema views sys partition_stats_view sys table_stats_view +sys version