http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/ql/src/test/results/clientpositive/llap/resourceplan.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/resourceplan.q.out b/ql/src/test/results/clientpositive/llap/resourceplan.q.out index c11daf7..7fd7278 100644 --- a/ql/src/test/results/clientpositive/llap/resourceplan.q.out +++ b/ql/src/test/results/clientpositive/llap/resourceplan.q.out @@ -1838,14 +1838,14 @@ FROM POSTHOOK: type: CREATETABLE POSTHOOK: Output: SYS@PART_COL_STATS POSTHOOK: Output: database:sys -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: query: CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0' AS `SCHEMA_VERSION`, + 'Hive release version 4.0.0' AS `VERSION_COMMENT` PREHOOK: type: CREATEVIEW PREHOOK: Input: _dummy_database@_dummy_table PREHOOK: Output: SYS@VERSION PREHOOK: Output: database:sys -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: query: CREATE OR REPLACE VIEW `VERSION` AS SELECT 1 AS `VER_ID`, '4.0.0' AS `SCHEMA_VERSION`, + 'Hive release version 4.0.0' AS `VERSION_COMMENT` POSTHOOK: type: CREATEVIEW POSTHOOK: Input: _dummy_database@_dummy_table POSTHOOK: Output: SYS@VERSION @@ -2107,6 +2107,7 @@ POSTHOOK: Lineage: PARTITION_STATS_VIEW.total_size EXPRESSION [(partition_params 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 EXTERNAL TABLE IF NOT EXISTS `WM_RESOURCEPLANS` ( `NAME` string, + `NS` string, `STATUS` string, `QUERY_PARALLELISM` int, `DEFAULT_POOL_PATH` string @@ -2117,6 +2118,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\", + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"STATUS\", \"WM_RESOURCEPLAN\".\"QUERY_PARALLELISM\", \"WM_POOL\".\"PATH\" @@ -2128,6 +2130,7 @@ PREHOOK: Output: SYS@WM_RESOURCEPLANS PREHOOK: Output: database:sys POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_RESOURCEPLANS` ( `NAME` string, + `NS` string, `STATUS` string, `QUERY_PARALLELISM` int, `DEFAULT_POOL_PATH` string @@ -2138,6 +2141,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\", + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"STATUS\", \"WM_RESOURCEPLAN\".\"QUERY_PARALLELISM\", \"WM_POOL\".\"PATH\" @@ -2149,6 +2153,7 @@ POSTHOOK: Output: SYS@WM_RESOURCEPLANS POSTHOOK: Output: database:sys PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_TRIGGERS` ( `RP_NAME` string, + `NS` string, `NAME` string, `TRIGGER_EXPRESSION` string, `ACTION_EXPRESSION` string @@ -2159,6 +2164,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT r.\"NAME\" AS RP_NAME, + case when r.\"NS\" is null then 'default' else r.\"NS\" end, t.\"NAME\" AS NAME, \"TRIGGER_EXPRESSION\", \"ACTION_EXPRESSION\" @@ -2174,6 +2180,7 @@ PREHOOK: Output: SYS@WM_TRIGGERS PREHOOK: Output: database:sys POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_TRIGGERS` ( `RP_NAME` string, + `NS` string, `NAME` string, `TRIGGER_EXPRESSION` string, `ACTION_EXPRESSION` string @@ -2184,6 +2191,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT r.\"NAME\" AS RP_NAME, + case when r.\"NS\" is null then 'default' else r.\"NS\" end, t.\"NAME\" AS NAME, \"TRIGGER_EXPRESSION\", \"ACTION_EXPRESSION\" @@ -2199,6 +2207,7 @@ POSTHOOK: Output: SYS@WM_TRIGGERS POSTHOOK: Output: database:sys PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS` ( `RP_NAME` string, + `NS` string, `PATH` string, `ALLOC_FRACTION` double, `QUERY_PARALLELISM` int, @@ -2210,6 +2219,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\", + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"WM_POOL\".\"PATH\", \"WM_POOL\".\"ALLOC_FRACTION\", \"WM_POOL\".\"QUERY_PARALLELISM\", @@ -2226,6 +2236,7 @@ PREHOOK: Output: SYS@WM_POOLS PREHOOK: Output: database:sys POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS` ( `RP_NAME` string, + `NS` string, `PATH` string, `ALLOC_FRACTION` double, `QUERY_PARALLELISM` int, @@ -2237,6 +2248,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\", + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"WM_POOL\".\"PATH\", \"WM_POOL\".\"ALLOC_FRACTION\", \"WM_POOL\".\"QUERY_PARALLELISM\", @@ -2253,6 +2265,7 @@ POSTHOOK: Output: SYS@WM_POOLS POSTHOOK: Output: database:sys PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS_TO_TRIGGERS` ( `RP_NAME` string, + `NS` string, `POOL_PATH` string, `TRIGGER_NAME` string ) @@ -2262,6 +2275,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\" AS RP_NAME, + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"WM_POOL\".\"PATH\" AS POOL_PATH, \"WM_TRIGGER\".\"NAME\" AS TRIGGER_NAME FROM \"WM_POOL_TO_TRIGGER\" @@ -2271,6 +2285,7 @@ FROM \"WM_POOL_TO_TRIGGER\" UNION SELECT \"WM_RESOURCEPLAN\".\"NAME\" AS RP_NAME, + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, '<unmanaged queries>' AS POOL_PATH, \"WM_TRIGGER\".\"NAME\" AS TRIGGER_NAME FROM \"WM_TRIGGER\" @@ -2283,6 +2298,7 @@ PREHOOK: Output: SYS@WM_POOLS_TO_TRIGGERS PREHOOK: Output: database:sys POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_POOLS_TO_TRIGGERS` ( `RP_NAME` string, + `NS` string, `POOL_PATH` string, `TRIGGER_NAME` string ) @@ -2292,6 +2308,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\" AS RP_NAME, + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"WM_POOL\".\"PATH\" AS POOL_PATH, \"WM_TRIGGER\".\"NAME\" AS TRIGGER_NAME FROM \"WM_POOL_TO_TRIGGER\" @@ -2301,6 +2318,7 @@ FROM \"WM_POOL_TO_TRIGGER\" UNION SELECT \"WM_RESOURCEPLAN\".\"NAME\" AS RP_NAME, + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, '<unmanaged queries>' AS POOL_PATH, \"WM_TRIGGER\".\"NAME\" AS TRIGGER_NAME FROM \"WM_TRIGGER\" @@ -2313,6 +2331,7 @@ POSTHOOK: Output: SYS@WM_POOLS_TO_TRIGGERS POSTHOOK: Output: database:sys PREHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_MAPPINGS` ( `RP_NAME` string, + `NS` string, `ENTITY_TYPE` string, `ENTITY_NAME` string, `POOL_PATH` string, @@ -2324,6 +2343,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\", + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"ENTITY_TYPE\", \"ENTITY_NAME\", case when \"WM_POOL\".\"PATH\" is null then '<unmanaged>' else \"WM_POOL\".\"PATH\" end, @@ -2338,6 +2358,7 @@ PREHOOK: Output: SYS@WM_MAPPINGS PREHOOK: Output: database:sys POSTHOOK: query: CREATE EXTERNAL TABLE IF NOT EXISTS `WM_MAPPINGS` ( `RP_NAME` string, + `NS` string, `ENTITY_TYPE` string, `ENTITY_NAME` string, `POOL_PATH` string, @@ -2349,6 +2370,7 @@ TBLPROPERTIES ( "hive.sql.query" = "SELECT \"WM_RESOURCEPLAN\".\"NAME\", + case when \"WM_RESOURCEPLAN\".\"NS\" is null then 'default' else \"WM_RESOURCEPLAN\".\"NS\" end AS NS, \"ENTITY_TYPE\", \"ENTITY_NAME\", case when \"WM_POOL\".\"PATH\" is null then '<unmanaged>' else \"WM_POOL\".\"PATH\" end, @@ -2392,10 +2414,11 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `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`) + `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P WHERE - NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + NOT restrict_information_schema() OR + D.`DB_ID` = T.`DB_ID` + AND T.`TBL_ID` = P.`TBL_ID` 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` @@ -2424,10 +2447,11 @@ SELECT DISTINCT cast(null as string), `DB_LOCATION_URI` FROM - `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`) + `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P WHERE - NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + NOT restrict_information_schema() OR + D.`DB_ID` = T.`DB_ID` + AND T.`TBL_ID` = P.`TBL_ID` 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` @@ -2473,12 +2497,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `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`) + `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P WHERE - NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + D.`DB_ID` = T.`DB_ID` + AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` 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 @@ -2515,12 +2539,12 @@ SELECT DISTINCT 'NO', cast(null as string) FROM - `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`) + `sys`.`TBLS` T, `sys`.`DBS` D, `sys`.`TBL_PRIVS` P WHERE - NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + D.`DB_ID` = T.`DB_ID` + AND (NOT restrict_information_schema() OR T.`TBL_ID` = P.`TBL_ID` 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 @@ -2561,15 +2585,18 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `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`) + `sys`.`TBL_PRIVS` P, + `sys`.`TBLS` T, + `sys`.`DBS` D, + `sys`.`TBL_PRIVS` P2 WHERE - 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` + 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` 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 @@ -2597,15 +2624,18 @@ SELECT DISTINCT IF (P.`GRANT_OPTION` == 0, 'NO', 'YES'), 'NO' FROM - `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`) + `sys`.`TBL_PRIVS` P, + `sys`.`TBLS` T, + `sys`.`DBS` D, + `sys`.`TBL_PRIVS` P2 WHERE - 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` + 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` 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 @@ -2759,16 +2789,21 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `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`) + `sys`.`COLUMNS_V2` C, + `sys`.`SDS` S, + `sys`.`TBLS` T, + `sys`.`DBS` D, + `sys`.`TBL_COL_PRIVS` P WHERE - NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + 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` 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 @@ -2916,16 +2951,21 @@ SELECT DISTINCT WHEN lower(C.TYPE_NAME) like 'numeric%' THEN 10 ELSE null END FROM - `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`) + `sys`.`COLUMNS_V2` C, + `sys`.`SDS` S, + `sys`.`TBLS` T, + `sys`.`DBS` D, + `sys`.`TBL_COL_PRIVS` P WHERE - NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + 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` 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 @@ -3002,16 +3042,20 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `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`) + `sys`.`TBL_COL_PRIVS` P, + `sys`.`TBLS` T, + `sys`.`DBS` D, + `sys`.`SDS` S, + `sys`.`TBL_PRIVS` P2 WHERE - 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` + 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` 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 @@ -3041,16 +3085,20 @@ SELECT DISTINCT P.`TBL_COL_PRIV`, IF (P.`GRANT_OPTION` == 0, 'NO', 'YES') FROM - `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`) + `sys`.`TBL_COL_PRIVS` P, + `sys`.`TBLS` T, + `sys`.`DBS` D, + `sys`.`SDS` S, + `sys`.`TBL_PRIVS` P2 WHERE - 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` + 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` 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 @@ -3092,11 +3140,14 @@ SELECT DISTINCT false, false FROM - `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`) + `sys`.`DBS` D, + `sys`.`TBLS` T, + `sys`.`TBL_PRIVS` P WHERE - length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + 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` 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()) @@ -3131,11 +3182,14 @@ SELECT DISTINCT false, false FROM - `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`) + `sys`.`DBS` D, + `sys`.`TBLS` T, + `sys`.`TBL_PRIVS` P WHERE - length(T.VIEW_ORIGINAL_TEXT) > 0 - AND (NOT restrict_information_schema() OR P.`TBL_ID` IS NOT NULL + 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` 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()) @@ -3195,7 +3249,7 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 DISABLED NULL default +plan_1 default DISABLED NULL default PREHOOK: query: CREATE RESOURCE PLAN plan_2 WITH QUERY_PARALLELISM=5 PREHOOK: type: CREATE RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3229,8 +3283,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 DISABLED NULL default -plan_2 DISABLED 10 default +plan_1 default DISABLED NULL default +plan_2 default DISABLED 10 default PREHOOK: query: CREATE RESOURCE PLAN plan_2 PREHOOK: type: CREATE RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3253,8 +3307,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 DISABLED NULL default -plan_2 DISABLED 10 default +plan_1 default DISABLED NULL default +plan_2 default DISABLED 10 default PREHOOK: query: ALTER RESOURCE PLAN plan_1 RENAME TO plan_3 PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3268,8 +3322,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 4 PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3283,8 +3337,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED 4 default +plan_2 default DISABLED 10 default +plan_3 default DISABLED 4 default PREHOOK: query: ALTER RESOURCE PLAN plan_3 UNSET QUERY_PARALLELISM PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3298,8 +3352,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 SET QUERY_PARALLELISM = 30, DEFAULT POOL = default1 PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3312,8 +3366,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3340,8 +3394,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3354,8 +3408,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3369,8 +3423,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 DISABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default DISABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3384,8 +3438,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ENABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default ENABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3399,8 +3453,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ACTIVE NULL default +plan_2 default DISABLED 10 default +plan_3 default ACTIVE NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3414,8 +3468,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ACTIVE NULL default +plan_2 default DISABLED 10 default +plan_3 default ACTIVE NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3428,8 +3482,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ACTIVE NULL default +plan_2 default DISABLED 10 default +plan_3 default ACTIVE NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3442,8 +3496,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ACTIVE NULL default +plan_2 default DISABLED 10 default +plan_3 default ACTIVE NULL default PREHOOK: query: DISABLE WORKLOAD MANAGEMENT PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3457,8 +3511,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ENABLED NULL default +plan_2 default DISABLED 10 default +plan_3 default ENABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3477,8 +3531,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 DISABLED 10 default -plan_3 ACTIVE NULL default +plan_2 default DISABLED 10 default +plan_3 default ACTIVE NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_2 ENABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3492,8 +3546,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 ENABLED 10 default -plan_3 ACTIVE NULL default +plan_2 default ENABLED 10 default +plan_3 default ACTIVE NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_2 ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3507,8 +3561,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 ACTIVE 10 default -plan_3 ENABLED NULL default +plan_2 default ACTIVE 10 default +plan_3 default ENABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 ENABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3522,8 +3576,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 ACTIVE 10 default -plan_3 ENABLED NULL default +plan_2 default ACTIVE 10 default +plan_3 default ENABLED NULL default PREHOOK: query: ALTER RESOURCE PLAN plan_3 DISABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3537,8 +3591,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 ACTIVE 10 default -plan_3 DISABLED NULL default +plan_2 default ACTIVE 10 default +plan_3 default DISABLED NULL default PREHOOK: query: DROP RESOURCE PLAN plan_2 PREHOOK: type: DROP RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3556,7 +3610,7 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 ACTIVE 10 default +plan_2 default ACTIVE 10 default PREHOOK: query: DROP RESOURCE PLAN plan_99999 PREHOOK: type: DROP RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3584,8 +3638,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_2 ACTIVE 10 default -table DISABLED 1 default +plan_2 default ACTIVE 10 default +table default DISABLED 1 default PREHOOK: query: create table wm_test(key string) PREHOOK: type: CREATETABLE PREHOOK: Output: INFORMATION_SCHEMA@wm_test @@ -3636,7 +3690,7 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_1 BYTES_READ > '10kb' KILL +plan_1 default trigger_1 BYTES_READ > '10kb' KILL PREHOOK: query: CREATE TRIGGER plan_1.trigger_1 WHEN ELAPSED_TIME > 300 DO KILL PREHOOK: type: CREATE TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3660,8 +3714,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_1 BYTES_READ > '10kb' KILL -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +plan_1 default trigger_1 BYTES_READ > '10kb' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool PREHOOK: query: ALTER TRIGGER plan_1.trigger_1 WHEN BYTES_READ > '1min' DO KILL PREHOOK: type: ALTER TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3675,8 +3729,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_1 BYTES_READ > '1min' KILL -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +plan_1 default trigger_1 BYTES_READ > '1min' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool PREHOOK: query: DROP TRIGGER plan_1.trigger_1 PREHOOK: type: DROP TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3690,7 +3744,7 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool PREHOOK: query: CREATE TRIGGER plan_2.trigger_1 WHEN BYTES_READ > '100mb' DO MOVE TO null_pool PREHOOK: type: CREATE TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3728,12 +3782,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool -table database BYTES_WRITTEN > "1GB" MOVE TO default -table table BYTES_WRITTEN > '100KB' MOVE TO table -table trigger BYTES_WRITTEN > '100MB' MOVE TO default -table trigger1 ELAPSED_TIME > 10 KILL -table trigger2 ELAPSED_TIME > '1hour' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +table default database BYTES_WRITTEN > "1GB" MOVE TO default +table default table BYTES_WRITTEN > '100KB' MOVE TO table +table default trigger BYTES_WRITTEN > '100MB' MOVE TO default +table default trigger1 ELAPSED_TIME > 10 KILL +table default trigger2 ELAPSED_TIME > '1hour' KILL PREHOOK: query: DROP TRIGGER `table`.`database` PREHOOK: type: DROP TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3747,11 +3801,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool -table table BYTES_WRITTEN > '100KB' MOVE TO table -table trigger BYTES_WRITTEN > '100MB' MOVE TO default -table trigger1 ELAPSED_TIME > 10 KILL -table trigger2 ELAPSED_TIME > '1hour' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +table default table BYTES_WRITTEN > '100KB' MOVE TO table +table default trigger BYTES_WRITTEN > '100MB' MOVE TO default +table default trigger1 ELAPSED_TIME > 10 KILL +table default trigger2 ELAPSED_TIME > '1hour' KILL PREHOOK: query: ALTER RESOURCE PLAN plan_1 ENABLE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3765,9 +3819,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ENABLED NULL default -plan_2 ACTIVE 10 default -table DISABLED 1 default +plan_1 default ENABLED NULL default +plan_2 default ACTIVE 10 default +table default DISABLED 1 default PREHOOK: query: DROP TRIGGER plan_1.trigger_2 PREHOOK: type: DROP TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3789,9 +3843,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ACTIVE NULL default -plan_2 ENABLED 10 default -table DISABLED 1 default +plan_1 default ACTIVE NULL default +plan_2 default ENABLED 10 default +table default DISABLED 1 default PREHOOK: query: DROP TRIGGER plan_1.trigger_2 PREHOOK: type: DROP TRIGGER PREHOOK: Output: dummyHostnameForTest @@ -3818,12 +3872,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool -plan_2 trigger_1 BYTES_READ > 0 MOVE TO null_pool -table table BYTES_WRITTEN > '100KB' MOVE TO table -table trigger BYTES_WRITTEN > '100MB' MOVE TO default -table trigger1 ELAPSED_TIME > 10 KILL -table trigger2 ELAPSED_TIME > '1hour' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +plan_2 default trigger_1 BYTES_READ > 0 MOVE TO null_pool +table default table BYTES_WRITTEN > '100KB' MOVE TO table +table default trigger BYTES_WRITTEN > '100MB' MOVE TO default +table default trigger1 ELAPSED_TIME > 10 KILL +table default trigger2 ELAPSED_TIME > '1hour' KILL PREHOOK: query: CREATE POOL plan_1.default WITH ALLOC_FRACTION=1.0, QUERY_PARALLELISM=5, SCHEDULING_POLICY='default' PREHOOK: type: CREATE POOL @@ -3843,9 +3897,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 5 NULL -table default 1.0 4 NULL +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 5 NULL +table default default 1.0 4 NULL FAILED: SemanticException Invalid scheduling policy invalid PREHOOK: query: CREATE POOL plan_2.default.c1 WITH ALLOC_FRACTION=0.3, QUERY_PARALLELISM=3, SCHEDULING_POLICY='fair' @@ -3855,26 +3909,26 @@ POSTHOOK: query: CREATE POOL plan_2.default.c1 WITH ALLOC_FRACTION=0.3, QUERY_PARALLELISM=3, SCHEDULING_POLICY='fair' POSTHOOK: type: CREATE POOL PREHOOK: query: CREATE POOL plan_2.default.c2 WITH - QUERY_PARALLELISM=2, SCHEDULING_POLICY='fair', ALLOC_FRACTION=0.7 + QUERY_PARALLELISM=2, SCHEDULING_POLICY='fair', ALLOC_FRACTION=0.75 PREHOOK: type: CREATE POOL PREHOOK: Output: dummyHostnameForTest POSTHOOK: query: CREATE POOL plan_2.default.c2 WITH - QUERY_PARALLELISM=2, SCHEDULING_POLICY='fair', ALLOC_FRACTION=0.7 + QUERY_PARALLELISM=2, SCHEDULING_POLICY='fair', ALLOC_FRACTION=0.75 POSTHOOK: type: CREATE POOL PREHOOK: query: ALTER RESOURCE PLAN plan_2 VALIDATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest POSTHOOK: query: ALTER RESOURCE PLAN plan_2 VALIDATE POSTHOOK: type: ALTER RESOURCEPLAN -Sum of children pools' alloc fraction should be less than 1 got: 1.0 for pool: default +Sum of children pools' alloc fraction should be less than 1 got: 1.05 for pool: default PREHOOK: query: ALTER RESOURCE PLAN plan_2 ENABLE ACTIVATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:ResourcePlan: plan_2 is invalid: [Sum of children pools' alloc fraction should be less than 1 got: 1.0 for pool: default]) -PREHOOK: query: ALTER POOL plan_2.default.c2 SET ALLOC_FRACTION = 0.5, QUERY_PARALLELISM = 1 +FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:ResourcePlan: plan_2 is invalid: [Sum of children pools' alloc fraction should be less than 1 got: 1.05 for pool: default]) +PREHOOK: query: ALTER POOL plan_2.default.c2 SET ALLOC_FRACTION = 0.7, QUERY_PARALLELISM = 1 PREHOOK: type: ALTER POOL PREHOOK: Output: dummyHostnameForTest -POSTHOOK: query: ALTER POOL plan_2.default.c2 SET ALLOC_FRACTION = 0.5, QUERY_PARALLELISM = 1 +POSTHOOK: query: ALTER POOL plan_2.default.c2 SET ALLOC_FRACTION = 0.7, QUERY_PARALLELISM = 1 POSTHOOK: type: ALTER POOL PREHOOK: query: ALTER POOL plan_2.default.c2 SET SCHEDULING_POLICY='fair' PREHOOK: type: ALTER POOL @@ -3889,11 +3943,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 5 NULL -plan_2 default.c1 0.3 3 fair -plan_2 default.c2 0.5 1 fair -table default 1.0 4 NULL +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 5 NULL +plan_2 default default.c1 0.3 3 fair +plan_2 default default.c2 0.7 1 fair +table default default 1.0 4 NULL PREHOOK: query: ALTER POOL plan_2.default.c2 UNSET SCHEDULING_POLICY PREHOOK: type: ALTER POOL PREHOOK: Output: dummyHostnameForTest @@ -3907,11 +3961,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 5 NULL -plan_2 default.c1 0.3 3 fair -plan_2 default.c2 0.5 1 NULL -table default 1.0 4 NULL +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 5 NULL +plan_2 default default.c1 0.3 3 fair +plan_2 default default.c2 0.7 1 NULL +table default default 1.0 4 NULL PREHOOK: query: ALTER RESOURCE PLAN plan_2 VALIDATE PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -3946,11 +4000,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table default 1.0 4 NULL +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default default 1.0 4 NULL PREHOOK: query: DROP POOL plan_2.default PREHOOK: type: DROP POOL PREHOOK: Output: dummyHostnameForTest @@ -3963,11 +4017,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table default 1.0 4 NULL +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default default 1.0 4 NULL PREHOOK: query: CREATE POOL plan_2.child1.child2 WITH QUERY_PARALLELISM=2, SCHEDULING_POLICY='fifo', ALLOC_FRACTION=0.8 PREHOOK: type: CREATE POOL @@ -4014,15 +4068,15 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table default 1.0 4 NULL -table table 0.0 1 fifo -table table.pool1 0.9 3 fair -table table.pool1.child1 0.3 1 fair -table table.pool1.child2 0.7 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default default 1.0 4 NULL +table default table 0.0 1 fifo +table default table.pool1 0.9 3 fair +table default table.pool1.child1 0.3 1 fair +table default table.pool1.child2 0.7 3 fair PREHOOK: query: ALTER POOL `table`.`table`.pool1 SET PATH = `table`.pool PREHOOK: type: ALTER POOL PREHOOK: Output: dummyHostnameForTest @@ -4036,19 +4090,19 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table default 1.0 4 NULL -table table 0.0 1 fifo -table table.pool 0.9 3 fair -table table.pool.child1 0.3 1 fair -table table.pool.child2 0.7 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default default 1.0 4 NULL +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair +table default table.pool.child1 0.3 1 fair +table default table.pool.child2 0.7 3 fair PREHOOK: query: DROP POOL `table`.`table` PREHOOK: type: DROP POOL PREHOOK: Output: dummyHostnameForTest -FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Pool has children cannot drop.) +FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. InvalidOperationException(message:Cannot drop a pool that has child pools) PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools @@ -4057,15 +4111,15 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table default 1.0 4 NULL -table table 0.0 1 fifo -table table.pool 0.9 3 fair -table table.pool.child1 0.3 1 fair -table table.pool.child2 0.7 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default default 1.0 4 NULL +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair +table default table.pool.child1 0.3 1 fair +table default table.pool.child2 0.7 3 fair PREHOOK: query: DROP POOL `table`.default PREHOOK: type: DROP POOL PREHOOK: Output: dummyHostnameForTest @@ -4078,15 +4132,15 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table default 1.0 4 NULL -table table 0.0 1 fifo -table table.pool 0.9 3 fair -table table.pool.child1 0.3 1 fair -table table.pool.child2 0.7 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default default 1.0 4 NULL +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair +table default table.pool.child1 0.3 1 fair +table default table.pool.child2 0.7 3 fair PREHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_resourceplans @@ -4095,9 +4149,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ACTIVE NULL default -plan_2 DISABLED 10 def -table DISABLED 1 default +plan_1 default ACTIVE NULL default +plan_2 default DISABLED 10 def +table default DISABLED 1 default PREHOOK: query: ALTER RESOURCE PLAN `table` SET DEFAULT POOL = `table`.pool PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4116,14 +4170,14 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 def 1.0 5 NULL -plan_2 def.c1 0.3 3 fair -plan_2 def.c2 0.5 1 NULL -table table 0.0 1 fifo -table table.pool 0.9 3 fair -table table.pool.child1 0.3 1 fair -table table.pool.child2 0.7 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default def 1.0 5 NULL +plan_2 default def.c1 0.3 3 fair +plan_2 default def.c2 0.7 1 NULL +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair +table default table.pool.child1 0.3 1 fair +table default table.pool.child2 0.7 3 fair PREHOOK: query: ALTER RESOURCE PLAN `table` UNSET DEFAULT POOL PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4137,9 +4191,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ACTIVE NULL default -plan_2 DISABLED 10 def -table DISABLED 1 NULL +plan_1 default ACTIVE NULL default +plan_2 default DISABLED 10 def +table default DISABLED 1 NULL PREHOOK: query: ALTER POOL plan_2.def.c1 ADD TRIGGER trigger_1 PREHOOK: type: ALTER POOL PREHOOK: Output: dummyHostnameForTest @@ -4188,14 +4242,14 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -plan_2 def.c1 trigger_1 -plan_2 def.c2 trigger_1 -table <unmanaged queries> trigger1 -table table table -table table.pool.child1 table -table table.pool.child1 trigger1 -table table.pool.child2 trigger1 -table table.pool.child2 trigger2 +plan_2 default def.c1 trigger_1 +plan_2 default def.c2 trigger_1 +table default <unmanaged queries> trigger1 +table default table table +table default table.pool.child1 table +table default table.pool.child1 trigger1 +table default table.pool.child2 trigger1 +table default table.pool.child2 trigger2 PREHOOK: query: SHOW RESOURCE PLAN `table` PREHOOK: type: SHOW RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4233,12 +4287,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -plan_2 def.c1 trigger_1 -plan_2 def.c2 trigger_1 -table table table -table table.pool.child1 table -table table.pool.child1 trigger1 -table table.pool.child2 trigger2 +plan_2 default def.c1 trigger_1 +plan_2 default def.c2 trigger_1 +table default table table +table default table.pool.child1 table +table default table.pool.child1 trigger1 +table default table.pool.child2 trigger2 PREHOOK: query: ALTER POOL plan_2.default ADD TRIGGER trigger_1 PREHOOK: type: ALTER POOL PREHOOK: Output: dummyHostnameForTest @@ -4255,12 +4309,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -plan_2 def.c1 trigger_1 -plan_2 def.c2 trigger_1 -table table table -table table.pool.child1 table -table table.pool.child1 trigger1 -table table.pool.child2 trigger2 +plan_2 default def.c1 trigger_1 +plan_2 default def.c2 trigger_1 +table default table table +table default table.pool.child1 table +table default table.pool.child1 trigger1 +table default table.pool.child2 trigger2 PREHOOK: query: ALTER POOL plan_2.def.c1 DROP TRIGGER trigger_1 PREHOOK: type: ALTER POOL PREHOOK: Output: dummyHostnameForTest @@ -4288,8 +4342,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -plan_2 def.c2 trigger_1 -table table table +plan_2 default def.c2 trigger_1 +table default table table PREHOOK: query: CREATE USER MAPPING "user1" IN plan_2 TO def PREHOOK: type: CREATE MAPPING PREHOOK: Output: dummyHostnameForTest @@ -4334,7 +4388,7 @@ plan_2[status=DISABLED,parallelism=10,defaultPool=def] + def[allocFraction=1.0,schedulingPolicy=null,parallelism=5] | mapped for users: user2 | mapped for default - + c2[allocFraction=0.5,schedulingPolicy=null,parallelism=1] + + c2[allocFraction=0.7,schedulingPolicy=null,parallelism=1] | trigger trigger_1: if (BYTES_READ > 0) { MOVE TO null_pool } | mapped for groups: group2 + c1[allocFraction=0.3,schedulingPolicy=fair,parallelism=3] @@ -4351,12 +4405,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_MAPPINGS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_mappings #### A masked pattern was here #### -plan_2 APPLICATION app1 def.c1 0 -plan_2 GROUP group1 def.c1 0 -plan_2 GROUP group2 def.c2 1 -plan_2 GROUP group3 <unmanaged> 1 -plan_2 USER user1 <unmanaged> 0 -plan_2 USER user2 def 1 +plan_2 default APPLICATION app1 def.c1 0 +plan_2 default GROUP group1 def.c1 0 +plan_2 default GROUP group2 def.c2 1 +plan_2 default GROUP group3 <unmanaged> 1 +plan_2 default USER user1 <unmanaged> 0 +plan_2 default USER user2 def 1 PREHOOK: query: DROP POOL plan_2.def.c1 PREHOOK: type: DROP POOL PREHOOK: Output: dummyHostnameForTest @@ -4389,8 +4443,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_MAPPINGS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_mappings #### A masked pattern was here #### -plan_2 GROUP group1 def.c1 0 -plan_2 USER user1 <unmanaged> 0 +plan_2 default GROUP group1 def.c1 0 +plan_2 default USER user1 <unmanaged> 0 PREHOOK: query: CREATE RESOURCE PLAN plan_4 PREHOOK: type: CREATE RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4409,7 +4463,7 @@ POSTHOOK: type: SHOW RESOURCEPLAN plan_2[status=DISABLED,parallelism=10,defaultPool=def] + def[allocFraction=1.0,schedulingPolicy=null,parallelism=5] | mapped for default - + c2[allocFraction=0.5,schedulingPolicy=null,parallelism=1] + + c2[allocFraction=0.7,schedulingPolicy=null,parallelism=1] | trigger trigger_1: if (BYTES_READ > 0) { MOVE TO null_pool } + c1[allocFraction=0.3,schedulingPolicy=fair,parallelism=3] | mapped for groups: group1 @@ -4433,10 +4487,10 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ENABLED NULL default -plan_2 DISABLED NULL default -plan_4 ACTIVE NULL default -table DISABLED 1 NULL +plan_1 default ENABLED NULL default +plan_2 default DISABLED NULL default +plan_4 default ACTIVE NULL default +table default DISABLED 1 NULL PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools @@ -4445,11 +4499,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 4 NULL -plan_4 default 1.0 4 NULL -table table 0.0 1 fifo -table table.pool 0.9 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 4 NULL +plan_4 default default 1.0 4 NULL +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair PREHOOK: query: SELECT * FROM SYS.WM_TRIGGERS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_triggers @@ -4458,11 +4512,11 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool -table table BYTES_WRITTEN > '100KB' MOVE TO table -table trigger BYTES_WRITTEN > '100MB' MOVE TO default -table trigger1 ELAPSED_TIME > 10 KILL -table trigger2 ELAPSED_TIME > '1hour' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +table default table BYTES_WRITTEN > '100KB' MOVE TO table +table default trigger BYTES_WRITTEN > '100MB' MOVE TO default +table default trigger1 ELAPSED_TIME > 10 KILL +table default trigger2 ELAPSED_TIME > '1hour' KILL PREHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools_to_triggers @@ -4471,7 +4525,7 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -table table table +table default table table PREHOOK: query: SELECT * FROM SYS.WM_MAPPINGS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_mappings @@ -4528,12 +4582,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ENABLED NULL default -plan_2 DISABLED NULL default -plan_4 ACTIVE NULL default -plan_4a DISABLED NULL default -plan_4b DISABLED NULL default -table DISABLED 1 NULL +plan_1 default ENABLED NULL default +plan_2 default DISABLED NULL default +plan_4 default ACTIVE NULL default +plan_4a default DISABLED NULL default +plan_4b default DISABLED NULL default +table default DISABLED 1 NULL PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools @@ -4542,16 +4596,16 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 4 NULL -plan_4 default 1.0 4 NULL -plan_4a default 1.0 4 NULL -plan_4a pool1 0.0 2 fair -plan_4b default 1.0 4 NULL -plan_4b pool1 0.0 2 fair -plan_4b pool2 0.0 3 fair -table table 0.0 1 fifo -table table.pool 0.9 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 4 NULL +plan_4 default default 1.0 4 NULL +plan_4a default default 1.0 4 NULL +plan_4a default pool1 0.0 2 fair +plan_4b default default 1.0 4 NULL +plan_4b default pool1 0.0 2 fair +plan_4b default pool2 0.0 3 fair +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair PREHOOK: query: SELECT * FROM SYS.WM_TRIGGERS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_triggers @@ -4560,15 +4614,15 @@ POSTHOOK: query: SELECT * FROM SYS.WM_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_triggers #### A masked pattern was here #### -plan_1 trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool -plan_4a trigger_1 BYTES_READ > '10GB' KILL -plan_4a trigger_2 BYTES_READ > '11GB' KILL -plan_4b trigger_1 BYTES_READ > '10GB' KILL -plan_4b trigger_2 BYTES_READ > '11GB' KILL -table table BYTES_WRITTEN > '100KB' MOVE TO table -table trigger BYTES_WRITTEN > '100MB' MOVE TO default -table trigger1 ELAPSED_TIME > 10 KILL -table trigger2 ELAPSED_TIME > '1hour' KILL +plan_1 default trigger_2 ELAPSED_TIME > '30hour' MOVE TO slow_pool +plan_4a default trigger_1 BYTES_READ > '10GB' KILL +plan_4a default trigger_2 BYTES_READ > '11GB' KILL +plan_4b default trigger_1 BYTES_READ > '10GB' KILL +plan_4b default trigger_2 BYTES_READ > '11GB' KILL +table default table BYTES_WRITTEN > '100KB' MOVE TO table +table default trigger BYTES_WRITTEN > '100MB' MOVE TO default +table default trigger1 ELAPSED_TIME > 10 KILL +table default trigger2 ELAPSED_TIME > '1hour' KILL PREHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools_to_triggers @@ -4577,9 +4631,9 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS_TO_TRIGGERS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools_to_triggers #### A masked pattern was here #### -plan_4a pool1 trigger_2 -plan_4b pool1 trigger_2 -table table table +plan_4a default pool1 trigger_2 +plan_4b default pool1 trigger_2 +table default table table PREHOOK: query: SELECT * FROM SYS.WM_MAPPINGS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_mappings @@ -4588,8 +4642,8 @@ POSTHOOK: query: SELECT * FROM SYS.WM_MAPPINGS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_mappings #### A masked pattern was here #### -plan_4a USER user1 pool1 0 -plan_4b USER user1 pool1 0 +plan_4a default USER user1 pool1 0 +plan_4b default USER user1 pool1 0 PREHOOK: query: REPLACE RESOURCE PLAN plan_4a WITH plan_4b PREHOOK: type: ALTER RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4603,12 +4657,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ENABLED NULL default -plan_2 DISABLED NULL default -plan_4 ACTIVE NULL default -plan_4a DISABLED NULL default -plan_4a_old_0 DISABLED NULL default -table DISABLED 1 NULL +plan_1 default ENABLED NULL default +plan_2 default DISABLED NULL default +plan_4 default ACTIVE NULL default +plan_4a default DISABLED NULL default +plan_4a_old_0 default DISABLED NULL default +table default DISABLED 1 NULL PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools @@ -4617,16 +4671,16 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 4 NULL -plan_4 default 1.0 4 NULL -plan_4a default 1.0 4 NULL -plan_4a pool1 0.0 2 fair -plan_4a pool2 0.0 3 fair -plan_4a_old_0 default 1.0 4 NULL -plan_4a_old_0 pool1 0.0 2 fair -table table 0.0 1 fifo -table table.pool 0.9 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 4 NULL +plan_4 default default 1.0 4 NULL +plan_4a default default 1.0 4 NULL +plan_4a default pool1 0.0 2 fair +plan_4a default pool2 0.0 3 fair +plan_4a_old_0 default default 1.0 4 NULL +plan_4a_old_0 default pool1 0.0 2 fair +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair PREHOOK: query: SHOW RESOURCE PLAN plan_4a_old_0 PREHOOK: type: SHOW RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4653,12 +4707,12 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ENABLED NULL default -plan_2 DISABLED NULL default -plan_4 ACTIVE NULL default -plan_4_old_0 DISABLED NULL default -plan_4a_old_0 DISABLED NULL default -table DISABLED 1 NULL +plan_1 default ENABLED NULL default +plan_2 default DISABLED NULL default +plan_4 default ACTIVE NULL default +plan_4_old_0 default DISABLED NULL default +plan_4a_old_0 default DISABLED NULL default +table default DISABLED 1 NULL PREHOOK: query: CREATE RESOURCE PLAN plan_4a LIKE plan_4 PREHOOK: type: CREATE RESOURCEPLAN PREHOOK: Output: dummyHostnameForTest @@ -4682,13 +4736,13 @@ POSTHOOK: query: SELECT * FROM SYS.WM_RESOURCEPLANS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_resourceplans #### A masked pattern was here #### -plan_1 ENABLED NULL default -plan_2 DISABLED NULL default -plan_4 ACTIVE NULL default -plan_4_old_0 DISABLED NULL default -plan_4_old_1 DISABLED NULL default -plan_4a_old_0 DISABLED NULL default -table DISABLED 1 NULL +plan_1 default ENABLED NULL default +plan_2 default DISABLED NULL default +plan_4 default ACTIVE NULL default +plan_4_old_0 default DISABLED NULL default +plan_4_old_1 default DISABLED NULL default +plan_4a_old_0 default DISABLED NULL default +table default DISABLED 1 NULL PREHOOK: query: SELECT * FROM SYS.WM_POOLS PREHOOK: type: QUERY PREHOOK: Input: sys@wm_pools @@ -4697,17 +4751,17 @@ POSTHOOK: query: SELECT * FROM SYS.WM_POOLS POSTHOOK: type: QUERY POSTHOOK: Input: sys@wm_pools #### A masked pattern was here #### -plan_1 default 1.0 4 NULL -plan_2 default 1.0 4 NULL -plan_4 default 1.0 4 NULL -plan_4 pool1 0.0 2 fair -plan_4 pool2 0.0 3 fair -plan_4 pool3 0.0 3 fair -plan_4_old_0 default 1.0 4 NULL -plan_4_old_1 default 1.0 4 NULL -plan_4_old_1 pool1 0.0 2 fair -plan_4_old_1 pool2 0.0 3 fair -plan_4a_old_0 default 1.0 4 NULL -plan_4a_old_0 pool1 0.0 2 fair -table table 0.0 1 fifo -table table.pool 0.9 3 fair +plan_1 default default 1.0 4 NULL +plan_2 default default 1.0 4 NULL +plan_4 default default 1.0 4 NULL +plan_4 default pool1 0.0 2 fair +plan_4 default pool2 0.0 3 fair +plan_4 default pool3 0.0 3 fair +plan_4_old_0 default default 1.0 4 NULL +plan_4_old_1 default default 1.0 4 NULL +plan_4_old_1 default pool1 0.0 2 fair +plan_4_old_1 default pool2 0.0 3 fair +plan_4a_old_0 default default 1.0 4 NULL +plan_4a_old_0 default pool1 0.0 2 fair +table default table 0.0 1 fifo +table default table.pool 0.9 3 fair
http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java index 4124001..46882ec 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMAlterResourcePlanRequest.java @@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField IS_ENABLE_AND_ACTIVATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isEnableAndActivate", org.apache.thrift.protocol.TType.BOOL, (short)3); private static final org.apache.thrift.protocol.TField IS_FORCE_DEACTIVATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isForceDeactivate", org.apache.thrift.protocol.TType.BOOL, (short)4); private static final org.apache.thrift.protocol.TField IS_REPLACE_FIELD_DESC = new org.apache.thrift.protocol.TField("isReplace", org.apache.thrift.protocol.TType.BOOL, (short)5); + private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -55,6 +56,7 @@ import org.slf4j.LoggerFactory; private boolean isEnableAndActivate; // optional private boolean isForceDeactivate; // optional private boolean isReplace; // optional + private String ns; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -62,7 +64,8 @@ import org.slf4j.LoggerFactory; RESOURCE_PLAN((short)2, "resourcePlan"), IS_ENABLE_AND_ACTIVATE((short)3, "isEnableAndActivate"), IS_FORCE_DEACTIVATE((short)4, "isForceDeactivate"), - IS_REPLACE((short)5, "isReplace"); + IS_REPLACE((short)5, "isReplace"), + NS((short)6, "ns"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -87,6 +90,8 @@ import org.slf4j.LoggerFactory; return IS_FORCE_DEACTIVATE; case 5: // IS_REPLACE return IS_REPLACE; + case 6: // NS + return NS; default: return null; } @@ -131,7 +136,7 @@ import org.slf4j.LoggerFactory; private static final int __ISFORCEDEACTIVATE_ISSET_ID = 1; private static final int __ISREPLACE_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.RESOURCE_PLAN,_Fields.IS_ENABLE_AND_ACTIVATE,_Fields.IS_FORCE_DEACTIVATE,_Fields.IS_REPLACE}; + private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.RESOURCE_PLAN,_Fields.IS_ENABLE_AND_ACTIVATE,_Fields.IS_FORCE_DEACTIVATE,_Fields.IS_REPLACE,_Fields.NS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -145,6 +150,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.IS_REPLACE, new org.apache.thrift.meta_data.FieldMetaData("isReplace", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WMAlterResourcePlanRequest.class, metaDataMap); } @@ -166,6 +173,9 @@ import org.slf4j.LoggerFactory; this.isEnableAndActivate = other.isEnableAndActivate; this.isForceDeactivate = other.isForceDeactivate; this.isReplace = other.isReplace; + if (other.isSetNs()) { + this.ns = other.ns; + } } public WMAlterResourcePlanRequest deepCopy() { @@ -182,6 +192,7 @@ import org.slf4j.LoggerFactory; this.isForceDeactivate = false; setIsReplaceIsSet(false); this.isReplace = false; + this.ns = null; } public String getResourcePlanName() { @@ -296,6 +307,29 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISREPLACE_ISSET_ID, value); } + public String getNs() { + return this.ns; + } + + public void setNs(String ns) { + this.ns = ns; + } + + public void unsetNs() { + this.ns = null; + } + + /** Returns true if field ns is set (has been assigned a value) and false otherwise */ + public boolean isSetNs() { + return this.ns != null; + } + + public void setNsIsSet(boolean value) { + if (!value) { + this.ns = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case RESOURCE_PLAN_NAME: @@ -338,6 +372,14 @@ import org.slf4j.LoggerFactory; } break; + case NS: + if (value == null) { + unsetNs(); + } else { + setNs((String)value); + } + break; + } } @@ -358,6 +400,9 @@ import org.slf4j.LoggerFactory; case IS_REPLACE: return isIsReplace(); + case NS: + return getNs(); + } throw new IllegalStateException(); } @@ -379,6 +424,8 @@ import org.slf4j.LoggerFactory; return isSetIsForceDeactivate(); case IS_REPLACE: return isSetIsReplace(); + case NS: + return isSetNs(); } throw new IllegalStateException(); } @@ -441,6 +488,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_ns = true && this.isSetNs(); + boolean that_present_ns = true && that.isSetNs(); + if (this_present_ns || that_present_ns) { + if (!(this_present_ns && that_present_ns)) + return false; + if (!this.ns.equals(that.ns)) + return false; + } + return true; } @@ -473,6 +529,11 @@ import org.slf4j.LoggerFactory; if (present_isReplace) list.add(isReplace); + boolean present_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + return list.hashCode(); } @@ -534,6 +595,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetNs()).compareTo(other.isSetNs()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ns, other.ns); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -591,6 +662,16 @@ import org.slf4j.LoggerFactory; sb.append(this.isReplace); first = false; } + if (isSetNs()) { + if (!first) sb.append(", "); + sb.append("ns:"); + if (this.ns == null) { + sb.append("null"); + } else { + sb.append(this.ns); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -680,6 +761,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // NS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.ns = iprot.readString(); + struct.setNsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -722,6 +811,13 @@ import org.slf4j.LoggerFactory; oprot.writeBool(struct.isReplace); oprot.writeFieldEnd(); } + if (struct.ns != null) { + if (struct.isSetNs()) { + oprot.writeFieldBegin(NS_FIELD_DESC); + oprot.writeString(struct.ns); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -755,7 +851,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetIsReplace()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetNs()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetResourcePlanName()) { oprot.writeString(struct.resourcePlanName); } @@ -771,12 +870,15 @@ import org.slf4j.LoggerFactory; if (struct.isSetIsReplace()) { oprot.writeBool(struct.isReplace); } + if (struct.isSetNs()) { + oprot.writeString(struct.ns); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, WMAlterResourcePlanRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.resourcePlanName = iprot.readString(); struct.setResourcePlanNameIsSet(true); @@ -798,6 +900,10 @@ import org.slf4j.LoggerFactory; struct.isReplace = iprot.readBool(); struct.setIsReplaceIsSet(true); } + if (incoming.get(5)) { + struct.ns = iprot.readString(); + struct.setNsIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java index f807be9..1fc94d6 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/WMCreateOrDropTriggerToPoolMappingRequest.java @@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField TRIGGER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("triggerName", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField POOL_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("poolPath", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField DROP_FIELD_DESC = new org.apache.thrift.protocol.TField("drop", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -53,13 +54,15 @@ import org.slf4j.LoggerFactory; private String triggerName; // optional private String poolPath; // optional private boolean drop; // optional + private String ns; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { RESOURCE_PLAN_NAME((short)1, "resourcePlanName"), TRIGGER_NAME((short)2, "triggerName"), POOL_PATH((short)3, "poolPath"), - DROP((short)4, "drop"); + DROP((short)4, "drop"), + NS((short)5, "ns"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -82,6 +85,8 @@ import org.slf4j.LoggerFactory; return POOL_PATH; case 4: // DROP return DROP; + case 5: // NS + return NS; default: return null; } @@ -124,7 +129,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __DROP_ISSET_ID = 0; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.TRIGGER_NAME,_Fields.POOL_PATH,_Fields.DROP}; + private static final _Fields optionals[] = {_Fields.RESOURCE_PLAN_NAME,_Fields.TRIGGER_NAME,_Fields.POOL_PATH,_Fields.DROP,_Fields.NS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -136,6 +141,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DROP, new org.apache.thrift.meta_data.FieldMetaData("drop", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WMCreateOrDropTriggerToPoolMappingRequest.class, metaDataMap); } @@ -158,6 +165,9 @@ import org.slf4j.LoggerFactory; this.poolPath = other.poolPath; } this.drop = other.drop; + if (other.isSetNs()) { + this.ns = other.ns; + } } public WMCreateOrDropTriggerToPoolMappingRequest deepCopy() { @@ -171,6 +181,7 @@ import org.slf4j.LoggerFactory; this.poolPath = null; setDropIsSet(false); this.drop = false; + this.ns = null; } public String getResourcePlanName() { @@ -264,6 +275,29 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DROP_ISSET_ID, value); } + public String getNs() { + return this.ns; + } + + public void setNs(String ns) { + this.ns = ns; + } + + public void unsetNs() { + this.ns = null; + } + + /** Returns true if field ns is set (has been assigned a value) and false otherwise */ + public boolean isSetNs() { + return this.ns != null; + } + + public void setNsIsSet(boolean value) { + if (!value) { + this.ns = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case RESOURCE_PLAN_NAME: @@ -298,6 +332,14 @@ import org.slf4j.LoggerFactory; } break; + case NS: + if (value == null) { + unsetNs(); + } else { + setNs((String)value); + } + break; + } } @@ -315,6 +357,9 @@ import org.slf4j.LoggerFactory; case DROP: return isDrop(); + case NS: + return getNs(); + } throw new IllegalStateException(); } @@ -334,6 +379,8 @@ import org.slf4j.LoggerFactory; return isSetPoolPath(); case DROP: return isSetDrop(); + case NS: + return isSetNs(); } throw new IllegalStateException(); } @@ -387,6 +434,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_ns = true && this.isSetNs(); + boolean that_present_ns = true && that.isSetNs(); + if (this_present_ns || that_present_ns) { + if (!(this_present_ns && that_present_ns)) + return false; + if (!this.ns.equals(that.ns)) + return false; + } + return true; } @@ -414,6 +470,11 @@ import org.slf4j.LoggerFactory; if (present_drop) list.add(drop); + boolean present_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + return list.hashCode(); } @@ -465,6 +526,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetNs()).compareTo(other.isSetNs()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ns, other.ns); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -520,6 +591,16 @@ import org.slf4j.LoggerFactory; sb.append(this.drop); first = false; } + if (isSetNs()) { + if (!first) sb.append(", "); + sb.append("ns:"); + if (this.ns == null) { + sb.append("null"); + } else { + sb.append(this.ns); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -597,6 +678,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 5: // NS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.ns = iprot.readString(); + struct.setNsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -636,6 +725,13 @@ import org.slf4j.LoggerFactory; oprot.writeBool(struct.drop); oprot.writeFieldEnd(); } + if (struct.ns != null) { + if (struct.isSetNs()) { + oprot.writeFieldBegin(NS_FIELD_DESC); + oprot.writeString(struct.ns); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -666,7 +762,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetDrop()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetNs()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetResourcePlanName()) { oprot.writeString(struct.resourcePlanName); } @@ -679,12 +778,15 @@ import org.slf4j.LoggerFactory; if (struct.isSetDrop()) { oprot.writeBool(struct.drop); } + if (struct.isSetNs()) { + oprot.writeString(struct.ns); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, WMCreateOrDropTriggerToPoolMappingRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.resourcePlanName = iprot.readString(); struct.setResourcePlanNameIsSet(true); @@ -701,6 +803,10 @@ import org.slf4j.LoggerFactory; struct.drop = iprot.readBool(); struct.setDropIsSet(true); } + if (incoming.get(4)) { + struct.ns = iprot.readString(); + struct.setNsIsSet(true); + } } }
