diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index f065048..077e770 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -1304,11 +1304,6 @@ public void setSparkConfigUpdated(boolean isSparkConfigUpdated) { "we are increasing the number of files possibly by a big margin. So, we merge aggressively."), HIVEOPTCORRELATION("hive.optimize.correlation", false, "exploit intra-query correlations."), - HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES("hive.mapred.supports.subdirectories", false, - "Whether the version of Hadoop which is running supports sub-directories for tables/partitions. \n" + - "Many Hive optimizations can be applied if the Hadoop version supports sub-directories for\n" + - "tables/partitions. It was added by MAPREDUCE-1501"), - HIVE_OPTIMIZE_SKEWJOIN_COMPILETIME("hive.optimize.skewjoin.compiletime", false, "Whether to create a separate plan for skewed keys for the tables in the join.\n" + "This is based on the skewed keys stored in the metadata. At compile time, the plan is broken\n" + @@ -3048,7 +3043,6 @@ private static String getSQLStdAuthDefaultWhiteListPattern() { ConfVars.HIVE_EXECUTION_ENGINE.varname, ConfVars.HIVE_EXIM_URI_SCHEME_WL.varname, ConfVars.HIVE_FILE_MAX_FOOTER.varname, - ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES.varname, ConfVars.HIVE_INSERT_INTO_MULTILEVEL_DIRS.varname, ConfVars.HIVE_LOCALIZE_RESOURCE_NUM_WAIT_ATTEMPTS.varname, ConfVars.HIVE_MULTI_INSERT_MOVE_TASKS_SHARE_DEPENDENCIES.varname, diff --git ql/src/java/org/apache/hadoop/hive/ql/Driver.java ql/src/java/org/apache/hadoop/hive/ql/Driver.java index 3a3fcf1..2591a52 100644 --- ql/src/java/org/apache/hadoop/hive/ql/Driver.java +++ ql/src/java/org/apache/hadoop/hive/ql/Driver.java @@ -1405,18 +1405,7 @@ private CommandProcessorResponse createProcessorResponse(int ret) { * @return */ private boolean validateConfVariables() { - boolean valid = true; - if ((!conf.getBoolVar(HiveConf.ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES)) - && ((conf.getBoolVar(HiveConf.ConfVars.HADOOPMAPREDINPUTDIRRECURSIVE)) || (conf - .getBoolVar(HiveConf.ConfVars.HIVEOPTLISTBUCKETING)) || ((conf - .getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_UNION_REMOVE))))) { - errorMessage = "FAILED: Hive Internal Error: " - + ErrorMsg.SUPPORT_DIR_MUST_TRUE_FOR_LIST_BUCKETING.getMsg(); - SQLState = ErrorMsg.SUPPORT_DIR_MUST_TRUE_FOR_LIST_BUCKETING.getSQLState(); - console.printError(errorMessage + "\n"); - valid = false; - } - return valid; + return true; } /** diff --git ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java index c080570..39a881a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java +++ ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java @@ -254,12 +254,6 @@ ALTER_TBL_STOREDASDIR_NOT_SKEWED(10196, "This operation is only valid on skewed table."), ALTER_TBL_SKEWED_LOC_NO_LOC(10197, "Alter table skewed location doesn't have locations."), ALTER_TBL_SKEWED_LOC_NO_MAP(10198, "Alter table skewed location doesn't have location map."), - SUPPORT_DIR_MUST_TRUE_FOR_LIST_BUCKETING( - 10199, - "hive.mapred.supports.subdirectories must be true" - + " if any one of following is true: " - + " hive.optimize.listbucketing , mapred.input.dir.recursive" - + " and hive.optimize.union.remove."), SKEWED_TABLE_NO_COLUMN_NAME(10200, "No skewed column name."), SKEWED_TABLE_NO_COLUMN_VALUE(10201, "No skewed values."), SKEWED_TABLE_DUPLICATE_COLUMN_NAMES(10202, diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index c64d8d1..4a963e7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -1605,20 +1605,13 @@ private void constructOneLBLocationMap(FileStatus fSta, FileStatus[] leafStatus = HiveStatsUtils.getFileStatusRecurse(loadPath, numDP+1, fs); // Check for empty partitions for (FileStatus s : leafStatus) { - // Check if the hadoop version supports sub-directories for tables/partitions - if (s.isDir() && - !conf.getBoolVar(HiveConf.ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES)) { - // No leaves in this directory - LOG.info("NOT moving empty directory: " + s.getPath()); - } else { - try { - validatePartitionNameCharacters( - Warehouse.getPartValuesFromPartName(s.getPath().getParent().toString())); - } catch (MetaException e) { - throw new HiveException(e); - } - validPartitions.add(s.getPath().getParent()); + try { + validatePartitionNameCharacters( + Warehouse.getPartValuesFromPartName(s.getPath().getParent().toString())); + } catch (MetaException e) { + throw new HiveException(e); } + validPartitions.add(s.getPath().getParent()); } int partsToLoad = validPartitions.size(); @@ -2527,8 +2520,7 @@ public PrincipalPrivilegeSet get_privilege_set(HiveObjectType objectType, continue; } - if (!conf.getBoolVar(HiveConf.ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES) && - !HiveConf.getVar(conf, HiveConf.ConfVars.STAGINGDIR).equals(itemSource.getName()) && + if (!HiveConf.getVar(conf, HiveConf.ConfVars.STAGINGDIR).equals(itemSource.getName()) && item.isDir()) { throw new HiveException("checkPaths: " + src.getPath() + " has nested directory " + itemSource); diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/unionproc/UnionProcessor.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/unionproc/UnionProcessor.java index b1286e0..547b486 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/unionproc/UnionProcessor.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/unionproc/UnionProcessor.java @@ -100,11 +100,6 @@ public ParseContext transform(ParseContext pCtx) throws SemanticException { if (conf.getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_UNION_REMOVE) && !conf.getVar(HiveConf.ConfVars.HIVE_EXECUTION_ENGINE).equals("spark")) { - if (!conf.getBoolVar(HiveConf.ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES)) { - throw new - SemanticException(ErrorMsg.HIVE_UNION_REMOVE_OPTIMIZATION_NEEDS_SUBDIRECTORIES.getMsg()); - } - opRules.put(new RuleRegExp("R5", UnionOperator.getOperatorName() + "%" + ".*" + FileSinkOperator.getOperatorName() + "%"), UnionProcFactory.getUnionNoProcessFile()); 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 f47428c..3afa47c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -6648,7 +6648,6 @@ private void checkAcidConstraints(QB qb, TableDesc tableDesc, LOG.info("Modifying config values for ACID write"); conf.setBoolVar(ConfVars.HIVEOPTREDUCEDEDUPLICATION, true); conf.setIntVar(ConfVars.HIVEOPTREDUCEDEDUPLICATIONMINREDUCER, 1); - conf.setBoolVar(ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES, true); conf.set(AcidUtils.CONF_ACID_KEY, "true"); conf.setBoolVar(ConfVars.HIVEOPTSORTDYNAMICPARTITION, false); diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java index a60527b..774219a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java @@ -107,7 +107,6 @@ public void init(HiveConf conf, LogHelper console, Hive db) { // We require the use of recursive input dirs for union processing conf.setBoolean("mapred.input.dir.recursive", true); - HiveConf.setBoolVar(conf, ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES, true); } @Override diff --git ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q index 9a3e0b2..a736ad6 100644 --- ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q +++ ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q @@ -1,5 +1,3 @@ -set hive.mapred.supports.subdirectories=true; - CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6); ALTER TABLE skewedtable CHANGE key key INT; diff --git ql/src/test/queries/clientnegative/column_rename5.q ql/src/test/queries/clientnegative/column_rename5.q index 3827b83..97195ef 100644 --- ql/src/test/queries/clientnegative/column_rename5.q +++ ql/src/test/queries/clientnegative/column_rename5.q @@ -1,5 +1,3 @@ -set hive.mapred.supports.subdirectories=true; - CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6); ALTER TABLE skewedtable CHANGE key key_new STRING; diff --git ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q index 1d6574e..7e569dd 100644 --- ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q +++ ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q @@ -1,3 +1 @@ -set hive.mapred.supports.subdirectories=true; - CREATE TABLE skewed_table (key STRING, value STRING) SKEWED BY (key) ON ((1),(5,8),(6)); diff --git ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q index 726f6dd..626e5ae 100644 --- ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q +++ ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q @@ -1,3 +1 @@ -set hive.mapred.supports.subdirectories=true; - CREATE TABLE skewed_table (key STRING, value STRING) SKEWED BY (key,key) ON ((1),(5),(6)); diff --git ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q index 30dd418..fb5b375 100644 --- ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q +++ ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q @@ -1,4 +1 @@ -set hive.mapred.supports.subdirectories=true; - CREATE TABLE skewed_table (key STRING, value STRING) SKEWED BY (key_non) ON ((1),(5),(6)); - \ No newline at end of file diff --git ql/src/test/queries/clientnegative/invalid_config2.q ql/src/test/queries/clientnegative/invalid_config2.q index fa023c8..3fe405f 100644 --- ql/src/test/queries/clientnegative/invalid_config2.q +++ ql/src/test/queries/clientnegative/invalid_config2.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=false; set hive.optimize.union.remove=true; select count(1) from src; diff --git ql/src/test/queries/clientnegative/load_stored_as_dirs.q ql/src/test/queries/clientnegative/load_stored_as_dirs.q index c56f0d4..69e2309 100644 --- ql/src/test/queries/clientnegative/load_stored_as_dirs.q +++ ql/src/test/queries/clientnegative/load_stored_as_dirs.q @@ -1,5 +1,3 @@ -set hive.mapred.supports.subdirectories=true; - -- Load data can't work with table with stored as directories CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES; diff --git ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q index 0ece600..90f6cf7 100644 --- ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q +++ ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set mapred.input.dir.recursive=true; -- Tests truncating a column on which a table is list bucketed diff --git ql/src/test/queries/clientpositive/alter_skewed_table.q ql/src/test/queries/clientpositive/alter_skewed_table.q index cdc4567..cc781f4 100644 --- ql/src/test/queries/clientpositive/alter_skewed_table.q +++ ql/src/test/queries/clientpositive/alter_skewed_table.q @@ -1,5 +1,3 @@ -set hive.mapred.supports.subdirectories=true; - create table original (key STRING, value STRING); describe formatted original; diff --git ql/src/test/queries/clientpositive/create_alter_list_bucketing_table1.q ql/src/test/queries/clientpositive/create_alter_list_bucketing_table1.q index b51b238..bf89e8f 100644 --- ql/src/test/queries/clientpositive/create_alter_list_bucketing_table1.q +++ ql/src/test/queries/clientpositive/create_alter_list_bucketing_table1.q @@ -1,5 +1,3 @@ -set hive.mapred.supports.subdirectories=true; - -- Test stored as directories -- it covers a few cases diff --git ql/src/test/queries/clientpositive/create_skewed_table1.q ql/src/test/queries/clientpositive/create_skewed_table1.q index 5d3a48a..e4c211e 100644 --- ql/src/test/queries/clientpositive/create_skewed_table1.q +++ ql/src/test/queries/clientpositive/create_skewed_table1.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6'); CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6)); CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)); diff --git ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q index 7d3c0dc..64dd05d 100644 --- ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q +++ ql/src/test/queries/clientpositive/infer_bucket_sort_list_bucket.q @@ -1,5 +1,4 @@ -set hive.mapred.supports.subdirectories=true; -set hive.merge.mapfiles=false; +set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; set mapred.input.dir.recursive=true; diff --git ql/src/test/queries/clientpositive/lb_fs_stats.q ql/src/test/queries/clientpositive/lb_fs_stats.q index 11d3a5f..5ad3ff3 100644 --- ql/src/test/queries/clientpositive/lb_fs_stats.q +++ ql/src/test/queries/clientpositive/lb_fs_stats.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_1.q ql/src/test/queries/clientpositive/list_bucket_dml_1.q index 1062e55..1f3b616 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_1.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_1.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_10.q ql/src/test/queries/clientpositive/list_bucket_dml_10.q index 8b384d9..5d3dade 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_10.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_10.q @@ -1,5 +1,3 @@ -set hive.mapred.supports.subdirectories=true; - set mapred.input.dir.recursive=true; -- run this test case in minimr to ensure it works in cluster diff --git ql/src/test/queries/clientpositive/list_bucket_dml_11.q ql/src/test/queries/clientpositive/list_bucket_dml_11.q index 4f3eb12..80e6a97 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_11.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_11.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set mapred.input.dir.recursive=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_12.q ql/src/test/queries/clientpositive/list_bucket_dml_12.q index 0630059..7c1a67c 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_12.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_12.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set mapred.input.dir.recursive=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_13.q ql/src/test/queries/clientpositive/list_bucket_dml_13.q index eda2576..b355147 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_13.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_13.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set mapred.input.dir.recursive=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_14.q ql/src/test/queries/clientpositive/list_bucket_dml_14.q index f60c5b0..abe5ea7 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_14.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_14.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_2.q ql/src/test/queries/clientpositive/list_bucket_dml_2.q index f795f61..5970f1b 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_2.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_2.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_3.q ql/src/test/queries/clientpositive/list_bucket_dml_3.q index a43613c..53f0a24 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_3.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_3.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_4.q ql/src/test/queries/clientpositive/list_bucket_dml_4.q index d51ba89..f863dde 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_4.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_4.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_5.q ql/src/test/queries/clientpositive/list_bucket_dml_5.q index 2176d82..cc14529 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_5.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_5.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_6.q ql/src/test/queries/clientpositive/list_bucket_dml_6.q index b129e23..d25ff63 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_6.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_6.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_7.q ql/src/test/queries/clientpositive/list_bucket_dml_7.q index cacf4ea..a74b7cf 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_7.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_7.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_8.q ql/src/test/queries/clientpositive/list_bucket_dml_8.q index 1fd60cc..85cea9d 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_8.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_8.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_dml_9.q ql/src/test/queries/clientpositive/list_bucket_dml_9.q index 095dffe..175f812 100644 --- ql/src/test/queries/clientpositive/list_bucket_dml_9.q +++ ql/src/test/queries/clientpositive/list_bucket_dml_9.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q index 48b1ff3..13d2e16 100644 --- ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q +++ ql/src/test/queries/clientpositive/list_bucket_query_multiskew_1.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q index 00410d1..532188b 100644 --- ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q +++ ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q @@ -1,4 +1,3 @@ - set hive.mapred.supports.subdirectories=true; set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q index 2d1193d..2fd7b13 100644 --- ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q +++ ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q index 84727fe..c3912dc 100644 --- ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q +++ ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q index 29409e1..7bdb3b2 100644 --- ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q +++ ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q index 5d69906..d34c52a 100644 --- ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q +++ ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q @@ -1,7 +1,6 @@ set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; -set hive.mapred.supports.subdirectories=true; -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- SORT_QUERY_RESULTS diff --git ql/src/test/queries/clientpositive/quotedid_skew.q ql/src/test/queries/clientpositive/quotedid_skew.q index 7088ea1..5634ff2 100644 --- ql/src/test/queries/clientpositive/quotedid_skew.q +++ ql/src/test/queries/clientpositive/quotedid_skew.q @@ -1,7 +1,6 @@ set hive.support.quoted.identifiers=column; -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(`!@#$%^&*()_q` string, `y&y` string) diff --git ql/src/test/queries/clientpositive/recursive_dir.q ql/src/test/queries/clientpositive/recursive_dir.q index 709c6eb..d703b8e 100644 --- ql/src/test/queries/clientpositive/recursive_dir.q +++ ql/src/test/queries/clientpositive/recursive_dir.q @@ -11,7 +11,6 @@ ALTER TABLE fact_daily SET TBLPROPERTIES('EXTERNAL'='TRUE'); ALTER TABLE fact_daily ADD PARTITION (ds='1') LOCATION 'pfile:${system:test.tmp.dir}/fact_tz/ds=1'; -set hive.mapred.supports.subdirectories=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q index 3986060..f768919 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin1.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q index 69070d4..3ebf459 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin10.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q index d907f07..b1ad7a4 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin11.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q index 8cb774c..278986d 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin2.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q index be97bce..5ea4650 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin3.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q index bad79cc..ac4cc2f 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin4.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q index f7b6023..63ef6e8 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin5.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q index a1134fe..d06652f 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q index 5b33b07..4336a39 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin7.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q index fc4f9ca..8ca9c87 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin8.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q index 3b76c22..6ba2424 100644 --- ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q +++ ql/src/test/queries/clientpositive/skewjoin_mapjoin9.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; set hive.auto.convert.join=true; diff --git ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q index d4f8538..9b0dec5 100644 --- ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q +++ ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q @@ -1,5 +1,4 @@ set hive.optimize.skewjoin.compiletime = true; -set hive.mapred.supports.subdirectories=true; set hive.stats.autogather=false; set hive.optimize.union.remove=true; diff --git ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q index f68137c..26db5e1 100644 --- ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q +++ ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q @@ -1,5 +1,4 @@ set hive.optimize.skewjoin.compiletime = true; -set hive.mapred.supports.subdirectories=true; set hive.stats.autogather=false; set hive.optimize.union.remove=true; diff --git ql/src/test/queries/clientpositive/skewjoinopt1.q ql/src/test/queries/clientpositive/skewjoinopt1.q index 1f72a80..8a4a03e 100644 --- ql/src/test/queries/clientpositive/skewjoinopt1.q +++ ql/src/test/queries/clientpositive/skewjoinopt1.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt10.q ql/src/test/queries/clientpositive/skewjoinopt10.q index eba7f9a..f6ccc9b 100644 --- ql/src/test/queries/clientpositive/skewjoinopt10.q +++ ql/src/test/queries/clientpositive/skewjoinopt10.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/skewjoinopt11.q ql/src/test/queries/clientpositive/skewjoinopt11.q index 6e54202..88a55c5 100644 --- ql/src/test/queries/clientpositive/skewjoinopt11.q +++ ql/src/test/queries/clientpositive/skewjoinopt11.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt12.q ql/src/test/queries/clientpositive/skewjoinopt12.q index edf19aa..ad01cef 100644 --- ql/src/test/queries/clientpositive/skewjoinopt12.q +++ ql/src/test/queries/clientpositive/skewjoinopt12.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt13.q ql/src/test/queries/clientpositive/skewjoinopt13.q index 9511975..92b1ab7 100644 --- ql/src/test/queries/clientpositive/skewjoinopt13.q +++ ql/src/test/queries/clientpositive/skewjoinopt13.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/skewjoinopt14.q ql/src/test/queries/clientpositive/skewjoinopt14.q index 1bb01b0..5f223e6 100644 --- ql/src/test/queries/clientpositive/skewjoinopt14.q +++ ql/src/test/queries/clientpositive/skewjoinopt14.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt15.q ql/src/test/queries/clientpositive/skewjoinopt15.q index 8aeabf5..9fb928f 100644 --- ql/src/test/queries/clientpositive/skewjoinopt15.q +++ ql/src/test/queries/clientpositive/skewjoinopt15.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/skewjoinopt16.q ql/src/test/queries/clientpositive/skewjoinopt16.q index 18dc87f..0d5a31f 100644 --- ql/src/test/queries/clientpositive/skewjoinopt16.q +++ ql/src/test/queries/clientpositive/skewjoinopt16.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt17.q ql/src/test/queries/clientpositive/skewjoinopt17.q index a2f5c8a..2e55903 100644 --- ql/src/test/queries/clientpositive/skewjoinopt17.q +++ ql/src/test/queries/clientpositive/skewjoinopt17.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) @@ -45,4 +44,4 @@ EXPLAIN SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val; SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val -ORDER BY a.key, b.key, a.val, b.val; \ No newline at end of file +ORDER BY a.key, b.key, a.val, b.val; diff --git ql/src/test/queries/clientpositive/skewjoinopt18.q ql/src/test/queries/clientpositive/skewjoinopt18.q index 4999aaf..ac2643c 100644 --- ql/src/test/queries/clientpositive/skewjoinopt18.q +++ ql/src/test/queries/clientpositive/skewjoinopt18.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE tmpT1(key STRING, val STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/skewjoinopt19.q ql/src/test/queries/clientpositive/skewjoinopt19.q index 94f4551..5317ee0 100644 --- ql/src/test/queries/clientpositive/skewjoinopt19.q +++ ql/src/test/queries/clientpositive/skewjoinopt19.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt2.q ql/src/test/queries/clientpositive/skewjoinopt2.q index 867cc79..099e2b8 100644 --- ql/src/test/queries/clientpositive/skewjoinopt2.q +++ ql/src/test/queries/clientpositive/skewjoinopt2.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; -- SORT_QUERY_RESULTS diff --git ql/src/test/queries/clientpositive/skewjoinopt20.q ql/src/test/queries/clientpositive/skewjoinopt20.q index cc21d7b..c798213 100644 --- ql/src/test/queries/clientpositive/skewjoinopt20.q +++ ql/src/test/queries/clientpositive/skewjoinopt20.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt3.q ql/src/test/queries/clientpositive/skewjoinopt3.q index 889f289..e4812a6 100644 --- ql/src/test/queries/clientpositive/skewjoinopt3.q +++ ql/src/test/queries/clientpositive/skewjoinopt3.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt4.q ql/src/test/queries/clientpositive/skewjoinopt4.q index 7e1303e..7d5b335 100644 --- ql/src/test/queries/clientpositive/skewjoinopt4.q +++ ql/src/test/queries/clientpositive/skewjoinopt4.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt5.q ql/src/test/queries/clientpositive/skewjoinopt5.q index 75d8e92..b19b7bc 100644 --- ql/src/test/queries/clientpositive/skewjoinopt5.q +++ ql/src/test/queries/clientpositive/skewjoinopt5.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt6.q ql/src/test/queries/clientpositive/skewjoinopt6.q index 5a7580e..134bf03 100644 --- ql/src/test/queries/clientpositive/skewjoinopt6.q +++ ql/src/test/queries/clientpositive/skewjoinopt6.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt7.q ql/src/test/queries/clientpositive/skewjoinopt7.q index b9a4c49..3dd53a3 100644 --- ql/src/test/queries/clientpositive/skewjoinopt7.q +++ ql/src/test/queries/clientpositive/skewjoinopt7.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/skewjoinopt8.q ql/src/test/queries/clientpositive/skewjoinopt8.q index e8d98ad..917db65 100644 --- ql/src/test/queries/clientpositive/skewjoinopt8.q +++ ql/src/test/queries/clientpositive/skewjoinopt8.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/skewjoinopt9.q ql/src/test/queries/clientpositive/skewjoinopt9.q index b5d06a3..10cdca4 100644 --- ql/src/test/queries/clientpositive/skewjoinopt9.q +++ ql/src/test/queries/clientpositive/skewjoinopt9.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.optimize.skewjoin.compiletime = true; CREATE TABLE T1(key STRING, val STRING) diff --git ql/src/test/queries/clientpositive/stats_list_bucket.q ql/src/test/queries/clientpositive/stats_list_bucket.q index b4e813b..73403ab 100644 --- ql/src/test/queries/clientpositive/stats_list_bucket.q +++ ql/src/test/queries/clientpositive/stats_list_bucket.q @@ -1,6 +1,4 @@ -set hive.mapred.supports.subdirectories=true; - -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- JAVA_VERSION_SPECIFIC_OUTPUT diff --git ql/src/test/queries/clientpositive/truncate_column_list_bucket.q ql/src/test/queries/clientpositive/truncate_column_list_bucket.q index 87289f0..4067c5f 100644 --- ql/src/test/queries/clientpositive/truncate_column_list_bucket.q +++ ql/src/test/queries/clientpositive/truncate_column_list_bucket.q @@ -1,4 +1,3 @@ -set hive.mapred.supports.subdirectories=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_1.q ql/src/test/queries/clientpositive/union_remove_1.q index b5d829c..2b1a99b 100644 --- ql/src/test/queries/clientpositive/union_remove_1.q +++ ql/src/test/queries/clientpositive/union_remove_1.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_10.q ql/src/test/queries/clientpositive/union_remove_10.q index c79d160..a00599c 100644 --- ql/src/test/queries/clientpositive/union_remove_10.q +++ ql/src/test/queries/clientpositive/union_remove_10.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_11.q ql/src/test/queries/clientpositive/union_remove_11.q index 4ebcc02..a6378f7 100644 --- ql/src/test/queries/clientpositive/union_remove_11.q +++ ql/src/test/queries/clientpositive/union_remove_11.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_12.q ql/src/test/queries/clientpositive/union_remove_12.q index 6dbf3a6..ca4885a 100644 --- ql/src/test/queries/clientpositive/union_remove_12.q +++ ql/src/test/queries/clientpositive/union_remove_12.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.auto.convert.join=true; set hive.merge.sparkfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_13.q ql/src/test/queries/clientpositive/union_remove_13.q index 6b01bc8..4fcec6b 100644 --- ql/src/test/queries/clientpositive/union_remove_13.q +++ ql/src/test/queries/clientpositive/union_remove_13.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.auto.convert.join=true; set hive.merge.sparkfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_14.q ql/src/test/queries/clientpositive/union_remove_14.q index b4535c6..0044db3 100644 --- ql/src/test/queries/clientpositive/union_remove_14.q +++ ql/src/test/queries/clientpositive/union_remove_14.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_15.q ql/src/test/queries/clientpositive/union_remove_15.q index e3def4c..ca5706d 100644 --- ql/src/test/queries/clientpositive/union_remove_15.q +++ ql/src/test/queries/clientpositive/union_remove_15.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_16.q ql/src/test/queries/clientpositive/union_remove_16.q index cfd901f..ebb0a5f 100644 --- ql/src/test/queries/clientpositive/union_remove_16.q +++ ql/src/test/queries/clientpositive/union_remove_16.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_17.q ql/src/test/queries/clientpositive/union_remove_17.q index 817ad50..20cf534 100644 --- ql/src/test/queries/clientpositive/union_remove_17.q +++ ql/src/test/queries/clientpositive/union_remove_17.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_18.q ql/src/test/queries/clientpositive/union_remove_18.q index e2ba33e..f5cbed2 100644 --- ql/src/test/queries/clientpositive/union_remove_18.q +++ ql/src/test/queries/clientpositive/union_remove_18.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_19.q ql/src/test/queries/clientpositive/union_remove_19.q index d3c17e1..6244eb0 100644 --- ql/src/test/queries/clientpositive/union_remove_19.q +++ ql/src/test/queries/clientpositive/union_remove_19.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_2.q ql/src/test/queries/clientpositive/union_remove_2.q index 0982a62..a9cd571 100644 --- ql/src/test/queries/clientpositive/union_remove_2.q +++ ql/src/test/queries/clientpositive/union_remove_2.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_20.q ql/src/test/queries/clientpositive/union_remove_20.q index a782feb..3c19c59 100644 --- ql/src/test/queries/clientpositive/union_remove_20.q +++ ql/src/test/queries/clientpositive/union_remove_20.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_21.q ql/src/test/queries/clientpositive/union_remove_21.q index 09c537c..f7a1e0f 100644 --- ql/src/test/queries/clientpositive/union_remove_21.q +++ ql/src/test/queries/clientpositive/union_remove_21.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_22.q ql/src/test/queries/clientpositive/union_remove_22.q index d2c22e0..981f440 100644 --- ql/src/test/queries/clientpositive/union_remove_22.q +++ ql/src/test/queries/clientpositive/union_remove_22.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_23.q ql/src/test/queries/clientpositive/union_remove_23.q index d3c4b73..7f741f7 100644 --- ql/src/test/queries/clientpositive/union_remove_23.q +++ ql/src/test/queries/clientpositive/union_remove_23.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_24.q ql/src/test/queries/clientpositive/union_remove_24.q index 10cec54..055a428 100644 --- ql/src/test/queries/clientpositive/union_remove_24.q +++ ql/src/test/queries/clientpositive/union_remove_24.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_25.q ql/src/test/queries/clientpositive/union_remove_25.q index be50c0f..33ed118 100644 --- ql/src/test/queries/clientpositive/union_remove_25.q +++ ql/src/test/queries/clientpositive/union_remove_25.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.exec.dynamic.partition=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.merge.sparkfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_3.q ql/src/test/queries/clientpositive/union_remove_3.q index 0e491eb..8d28277 100644 --- ql/src/test/queries/clientpositive/union_remove_3.q +++ ql/src/test/queries/clientpositive/union_remove_3.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_4.q ql/src/test/queries/clientpositive/union_remove_4.q index b8b72e7..1affbc5 100644 --- ql/src/test/queries/clientpositive/union_remove_4.q +++ ql/src/test/queries/clientpositive/union_remove_4.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_5.q ql/src/test/queries/clientpositive/union_remove_5.q index 4845c8c..5769ba8 100644 --- ql/src/test/queries/clientpositive/union_remove_5.q +++ ql/src/test/queries/clientpositive/union_remove_5.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true; diff --git ql/src/test/queries/clientpositive/union_remove_6.q ql/src/test/queries/clientpositive/union_remove_6.q index 8208fe2..5bc62d7 100644 --- ql/src/test/queries/clientpositive/union_remove_6.q +++ ql/src/test/queries/clientpositive/union_remove_6.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_6_subq.q ql/src/test/queries/clientpositive/union_remove_6_subq.q index b0c0539..1b717c7 100644 --- ql/src/test/queries/clientpositive/union_remove_6_subq.q +++ ql/src/test/queries/clientpositive/union_remove_6_subq.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.mapfiles=false; set hive.merge.mapredfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_7.q ql/src/test/queries/clientpositive/union_remove_7.q index a915226..4e33188 100644 --- ql/src/test/queries/clientpositive/union_remove_7.q +++ ql/src/test/queries/clientpositive/union_remove_7.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_8.q ql/src/test/queries/clientpositive/union_remove_8.q index 462c3fd..e809710 100644 --- ql/src/test/queries/clientpositive/union_remove_8.q +++ ql/src/test/queries/clientpositive/union_remove_8.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=false; set hive.merge.mapfiles=false; diff --git ql/src/test/queries/clientpositive/union_remove_9.q ql/src/test/queries/clientpositive/union_remove_9.q index a2674c8..906c2a5 100644 --- ql/src/test/queries/clientpositive/union_remove_9.q +++ ql/src/test/queries/clientpositive/union_remove_9.q @@ -1,6 +1,5 @@ set hive.stats.autogather=false; set hive.optimize.union.remove=true; -set hive.mapred.supports.subdirectories=true; set hive.merge.sparkfiles=true; set hive.merge.mapfiles=true;