diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 6adfb6d16c..2a2359402b 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -12149,7 +12149,7 @@ private void walkASTMarkTABREF(TableMask tableMask, ASTNode ast, Set cte } else { List colNames; List colTypes; - if (isCBOExecuted() && this.columnAccessInfo != null && + if (this.ctx.isCboSucceeded() && this.columnAccessInfo != null && (colNames = this.columnAccessInfo.getTableToColumnAllAccessMap().get(table.getCompleteName())) != null) { Map colNameToType = table.getAllCols().stream() .collect(Collectors.toMap(FieldSchema::getName, FieldSchema::getType)); diff --git ql/src/test/queries/clientpositive/masking_1.q ql/src/test/queries/clientpositive/masking_1.q index 858162c5ea..d8d069f8ef 100644 --- ql/src/test/queries/clientpositive/masking_1.q +++ ql/src/test/queries/clientpositive/masking_1.q @@ -1,6 +1,7 @@ --! qt:dataset:srcpart --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_n8 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_10.q ql/src/test/queries/clientpositive/masking_10.q index a26d2dea95..05c02c20c9 100644 --- ql/src/test/queries/clientpositive/masking_10.q +++ ql/src/test/queries/clientpositive/masking_10.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; drop table masking_test; diff --git ql/src/test/queries/clientpositive/masking_11.q ql/src/test/queries/clientpositive/masking_11.q index 53a90cd9ac..99fc225e00 100644 --- ql/src/test/queries/clientpositive/masking_11.q +++ ql/src/test/queries/clientpositive/masking_11.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table `masking_test` as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_12.q ql/src/test/queries/clientpositive/masking_12.q index 6bb941e87c..9b99f0c22a 100644 --- ql/src/test/queries/clientpositive/masking_12.q +++ ql/src/test/queries/clientpositive/masking_12.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table `masking_test_n5` as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_13.q ql/src/test/queries/clientpositive/masking_13.q index bb050b5d01..e14c4995a7 100644 --- ql/src/test/queries/clientpositive/masking_13.q +++ ql/src/test/queries/clientpositive/masking_13.q @@ -1,6 +1,7 @@ --! qt:dataset:srcpart --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_14.q ql/src/test/queries/clientpositive/masking_14.q index 50cda8cb0e..ee467930e9 100644 --- ql/src/test/queries/clientpositive/masking_14.q +++ ql/src/test/queries/clientpositive/masking_14.q @@ -1,6 +1,7 @@ --! qt:dataset:srcpart --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create database atlasmask; diff --git ql/src/test/queries/clientpositive/masking_1_newdb.q ql/src/test/queries/clientpositive/masking_1_newdb.q index 6626facac8..0208c43e59 100644 --- ql/src/test/queries/clientpositive/masking_1_newdb.q +++ ql/src/test/queries/clientpositive/masking_1_newdb.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create database newdb; diff --git ql/src/test/queries/clientpositive/masking_2.q ql/src/test/queries/clientpositive/masking_2.q index ece15186f9..eb581b41c1 100644 --- ql/src/test/queries/clientpositive/masking_2.q +++ ql/src/test/queries/clientpositive/masking_2.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create view masking_test_n1 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_3.q ql/src/test/queries/clientpositive/masking_3.q index 42706d01e0..2317b5049e 100644 --- ql/src/test/queries/clientpositive/masking_3.q +++ ql/src/test/queries/clientpositive/masking_3.q @@ -1,6 +1,7 @@ --! qt:dataset:srcpart --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_subq_n3 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_4.q ql/src/test/queries/clientpositive/masking_4.q index 48fe33c5aa..b4fc24a038 100644 --- ql/src/test/queries/clientpositive/masking_4.q +++ ql/src/test/queries/clientpositive/masking_4.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_n11 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_5.q ql/src/test/queries/clientpositive/masking_5.q index e24bb931d9..903afdbb4d 100644 --- ql/src/test/queries/clientpositive/masking_5.q +++ ql/src/test/queries/clientpositive/masking_5.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_n6 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_6.q ql/src/test/queries/clientpositive/masking_6.q index ddbe476878..e34994837d 100644 --- ql/src/test/queries/clientpositive/masking_6.q +++ ql/src/test/queries/clientpositive/masking_6.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; drop view masking_test_n0; diff --git ql/src/test/queries/clientpositive/masking_7.q ql/src/test/queries/clientpositive/masking_7.q index e4d6387d2d..68697caecf 100644 --- ql/src/test/queries/clientpositive/masking_7.q +++ ql/src/test/queries/clientpositive/masking_7.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; drop view masking_test_n14; diff --git ql/src/test/queries/clientpositive/masking_8.q ql/src/test/queries/clientpositive/masking_8.q index e402587c90..8bd131ff7a 100644 --- ql/src/test/queries/clientpositive/masking_8.q +++ ql/src/test/queries/clientpositive/masking_8.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; drop table masking_test_n2; diff --git ql/src/test/queries/clientpositive/masking_9.q ql/src/test/queries/clientpositive/masking_9.q index a67b63dacb..c6221a34d1 100644 --- ql/src/test/queries/clientpositive/masking_9.q +++ ql/src/test/queries/clientpositive/masking_9.q @@ -1,5 +1,6 @@ --! qt:dataset:src set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; drop table masking_test; diff --git ql/src/test/queries/clientpositive/masking_acid_no_masking.q ql/src/test/queries/clientpositive/masking_acid_no_masking.q index 75de085e11..ad3f976b5d 100644 --- ql/src/test/queries/clientpositive/masking_acid_no_masking.q +++ ql/src/test/queries/clientpositive/masking_acid_no_masking.q @@ -2,6 +2,7 @@ -- when all tables are marked eligible for masking. This shouldn't break any ACID operations. set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; diff --git ql/src/test/queries/clientpositive/masking_disablecbo_1.q ql/src/test/queries/clientpositive/masking_disablecbo_1.q index 0a4e09b77b..74771e561e 100644 --- ql/src/test/queries/clientpositive/masking_disablecbo_1.q +++ ql/src/test/queries/clientpositive/masking_disablecbo_1.q @@ -2,6 +2,7 @@ --! qt:dataset:src set hive.cbo.enable=false; set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_n10 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_disablecbo_2.q ql/src/test/queries/clientpositive/masking_disablecbo_2.q index a4129c2975..7be997509a 100644 --- ql/src/test/queries/clientpositive/masking_disablecbo_2.q +++ ql/src/test/queries/clientpositive/masking_disablecbo_2.q @@ -1,6 +1,7 @@ --! qt:dataset:src set hive.cbo.enable=false; set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create view masking_test_n13 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_disablecbo_3.q ql/src/test/queries/clientpositive/masking_disablecbo_3.q index 88ee96bc16..d76edc1919 100644 --- ql/src/test/queries/clientpositive/masking_disablecbo_3.q +++ ql/src/test/queries/clientpositive/masking_disablecbo_3.q @@ -2,6 +2,7 @@ --! qt:dataset:src set hive.cbo.enable=false; set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_subq as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_disablecbo_4.q ql/src/test/queries/clientpositive/masking_disablecbo_4.q index d81fd3b769..5fca6dd026 100644 --- ql/src/test/queries/clientpositive/masking_disablecbo_4.q +++ ql/src/test/queries/clientpositive/masking_disablecbo_4.q @@ -1,6 +1,7 @@ --! qt:dataset:src set hive.cbo.enable=false; set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table masking_test_n3 as select cast(key as int) as key, value from src; diff --git ql/src/test/queries/clientpositive/masking_mv.q ql/src/test/queries/clientpositive/masking_mv.q index 847b429a35..c7b0ac9935 100644 --- ql/src/test/queries/clientpositive/masking_mv.q +++ ql/src/test/queries/clientpositive/masking_mv.q @@ -3,6 +3,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table `masking_test_n_mv` stored as orc TBLPROPERTIES ('transactional'='true') as diff --git ql/src/test/queries/clientpositive/masking_reserved.q ql/src/test/queries/clientpositive/masking_reserved.q index 7fe94fa7e3..bf8fc1ece8 100644 --- ql/src/test/queries/clientpositive/masking_reserved.q +++ ql/src/test/queries/clientpositive/masking_reserved.q @@ -1,4 +1,5 @@ set hive.mapred.mode=nonstrict; +set hive.security.authorization.enabled=true; set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest; create table keyword_test_off (id int, `etad` string, key int);