commit 8690b25e292be9103e17660159dd104aa5848738 Author: Thejas Nair Date: Mon Jun 27 08:22:22 2016 -0700 HIVE-14073 - add oozie, update tests diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 3783dc4..46881ae 100644 --- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -3765,6 +3765,7 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { * For internal use only. */ private static final String [] sqlStdAuthSafeVarNames = new String [] { + ConfVars.AGGR_JOIN_TRANSPOSE.varname, ConfVars.BYTESPERREDUCER.varname, ConfVars.CLIENT_STATS_COUNTERS.varname, ConfVars.DEFAULTPARTITIONNAME.varname, @@ -3774,6 +3775,7 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { ConfVars.HIVEENFORCEBUCKETMAPJOIN.varname, ConfVars.HIVEENFORCESORTMERGEBUCKETMAPJOIN.varname, ConfVars.HIVEEXPREVALUATIONCACHE.varname, + ConfVars.HIVEQUERYRESULTFILEFORMAT.varname, ConfVars.HIVEHASHTABLELOADFACTOR.varname, ConfVars.HIVEHASHTABLETHRESHOLD.varname, ConfVars.HIVEIGNOREMAPJOINHINT.varname, @@ -3787,11 +3789,13 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { ConfVars.HIVE_AUTOGEN_COLUMNALIAS_PREFIX_INCLUDEFUNCNAME.varname, ConfVars.HIVE_AUTOGEN_COLUMNALIAS_PREFIX_LABEL.varname, ConfVars.HIVE_CHECK_CROSS_PRODUCT.varname, + ConfVars.HIVE_CLI_TEZ_SESSION_ASYNC.varname, ConfVars.HIVE_COMPAT.varname, ConfVars.HIVE_CONCATENATE_CHECK_INDEX.varname, ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY.varname, ConfVars.HIVE_ERROR_ON_EMPTY_PARTITION.varname, ConfVars.HIVE_EXECUTION_ENGINE.varname, + ConfVars.HIVE_EXEC_COPYFILE_MAXSIZE.varname, ConfVars.HIVE_EXIM_URI_SCHEME_WL.varname, ConfVars.HIVE_FILE_MAX_FOOTER.varname, ConfVars.HIVE_INSERT_INTO_MULTILEVEL_DIRS.varname, @@ -3800,11 +3804,27 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { ConfVars.HIVE_QUOTEDID_SUPPORT.varname, ConfVars.HIVE_RESULTSET_USE_UNIQUE_COLUMN_NAMES.varname, ConfVars.HIVE_STATS_COLLECT_PART_LEVEL_STATS.varname, + ConfVars.HIVE_SCHEMA_EVOLUTION.varname, ConfVars.HIVE_SERVER2_LOGGING_OPERATION_LEVEL.varname, ConfVars.HIVE_SERVER2_THRIFT_RESULTSET_SERIALIZE_IN_TASKS.varname, ConfVars.HIVE_SUPPORT_SQL11_RESERVED_KEYWORDS.varname, + ConfVars.HIVE_SUPPORT_SPECICAL_CHARACTERS_IN_TABLE_NAMES.varname, ConfVars.JOB_DEBUG_CAPTURE_STACKTRACES.varname, ConfVars.JOB_DEBUG_TIMEOUT.varname, + ConfVars.LLAP_IO_ENABLED.varname, + ConfVars.LLAP_IO_USE_FILEID_PATH.varname, + ConfVars.LLAP_DAEMON_SERVICE_HOSTS.varname, + ConfVars.LLAP_EXECUTION_MODE.varname, + ConfVars.LLAP_AUTO_ALLOW_UBER.varname, + ConfVars.LLAP_AUTO_ENFORCE_TREE.varname, + ConfVars.LLAP_AUTO_ENFORCE_VECTORIZED.varname, + ConfVars.LLAP_AUTO_ENFORCE_STATS.varname, + ConfVars.LLAP_AUTO_MAX_INPUT.varname, + ConfVars.LLAP_AUTO_MAX_OUTPUT.varname, + ConfVars.LLAP_SKIP_COMPILE_UDF_CHECK.varname, + ConfVars.LLAP_CLIENT_CONSISTENT_SPLITS.varname, + ConfVars.LLAP_ENABLE_GRACE_JOIN_IN_LLAP.varname, + ConfVars.LLAP_ALLOW_PERMANENT_FNS.varname, ConfVars.MAXCREATEDFILES.varname, ConfVars.MAXREDUCERS.varname, ConfVars.NWAYJOINREORDER.varname, @@ -3851,6 +3871,7 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { "hive\\.skewjoin\\..*", "hive\\.smbjoin\\..*", "hive\\.stats\\..*", + "hive\\.strict\\..*", "hive\\.tez\\..*", "hive\\.vectorized\\..*", "mapred\\.map\\..*", @@ -3867,10 +3888,11 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { "mapreduce\\.reduce\\..*", "mapreduce\\.output\\.fileoutputformat\\.compress\\.codec", "mapreduce\\.output\\.fileoutputformat\\.compress\\.type", + "oozie\\..*", "tez\\.am\\..*", "tez\\.task\\..*", "tez\\.runtime\\..*", - "tez.queue.name", + "tez\\.queue\\.name", }; diff --git a/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java b/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java index 8f8b88a..37e12e8 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessControllerHS2.java @@ -88,7 +88,8 @@ private HiveConf newAuthEnabledConf() { // create list with variables that match some of the regexes List confVarRegexList = Arrays.asList("hive.convert.join.bucket.mapjoin.tez", "hive.optimize.index.filter.compact.maxsize", "hive.tez.dummy", "tez.task.dummy", - "hive.exec.dynamic.partition", "hive.exec.dynamic.partition.mode"); + "hive.exec.dynamic.partition", "hive.exec.dynamic.partition.mode", + "oozie.HadoopAccessorService.created", "tez.queue.name"); // combine two lists List varList = new ArrayList();