You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mg...@apache.org on 2020/05/24 19:12:49 UTC

[hive] branch master updated: HIVE-23510 TestMiniLlapLocalCliDriver should be the default driver for q tests (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)

This is an automated email from the ASF dual-hosted git repository.

mgergely pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 8354b31  HIVE-23510 TestMiniLlapLocalCliDriver should be the default driver for q tests (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)
8354b31 is described below

commit 8354b31102f6f10f208a65e01580d1e5cc1c7d1f
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Wed May 20 00:08:35 2020 +0200

    HIVE-23510 TestMiniLlapLocalCliDriver should be the default driver for q tests (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)
---
 .../test/resources/testconfiguration.properties    | 3902 +++-----------------
 .../apache/hadoop/hive/cli/control/CliConfigs.java |   38 +-
 .../llap/quotedid_basic_standard.q.out             |  557 +++
 .../clientpositive/quotedid_basic_standard.q.out   |  568 ---
 4 files changed, 1164 insertions(+), 3901 deletions(-)

diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index 38a8103..7a91eef 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -1,394 +1,76 @@
 # Note: the *.shared groups also run on TestCliDriver
 
 # DO NOT USE minimr, as MR is deprecated and MinimrCliDriver will be removed
-minimr.query.files=doesnotexist.q\
+minimr.query.files=\
+  doesnotexist.q
 
-# NOTE: Add tests to minitez only if it is very
-# specific to tez and cannot be added to minillap.
-minitez.query.files.shared=delete_orig_table.q,\
-  orc_merge12.q,\
-  orc_vectorization_ppd.q,\
-  update_orig_table.q,\
-  vector_join_part_col_char.q,\
-  vector_non_string_partition.q
+# Queries ran by both MiniLlapLocal and MiniTez
+minitez.query.files.shared=\
+  hybridgrace_hashjoin_1.q,\
+  hybridgrace_hashjoin_2.q
 
 # NOTE: Add tests to minitez only if it is very
 # specific to tez and cannot be added to minillap.
-minitez.query.files=acid_vectorization_original_tez.q,\
+minitez.query.files=\
+  acid_vectorization_original_tez.q,\
+  delete_orig_table.q,\
   explainuser_3.q,\
   explainanalyze_1.q,\
   explainanalyze_3.q,\
   explainanalyze_4.q,\
   explainanalyze_5.q,\
-  hybridgrace_hashjoin_1.q,\
-  hybridgrace_hashjoin_2.q,\
   multi_count_distinct.q,\
+  orc_merge12.q,\
+  orc_vectorization_ppd.q,\
   tez-tag.q,\
   tez_union_with_udf.q,\
   tez_union_udtf.q,\
-  tez_complextype_with_null.q
-
+  tez_complextype_with_null.q,\
+  update_orig_table.q,\
+  vector_join_part_col_char.q,\
+  vector_non_string_partition.q
 
-minillap.shared.query.files=acid_direct_insert_insert_overwrite.q,\
+minillap.query.files=\
+  acid_bucket_pruning.q,\
+  acid_direct_insert_insert_overwrite.q,\
   acid_multiinsert_dyn_part.q,\
+  add_part_with_loc.q,\
+  alter_table_location2.q,\
+  alter_table_location3.q,\
+  bucket5.q,\
+  bucket6.q,\
+  cte_2.q,\
+  cte_4.q,\
+  dynamic_semijoin_user_level.q,\
+  except_distinct.q,\
+  explainuser_2.q,\
+  empty_dir_in_table.q,\
   insert_into1.q,\
   insert_into2.q,\
+  intersect_all.q,\
+  intersect_distinct.q,\
+  intersect_merge.q,\
+  llap_udf.q,\
   llapdecider.q,\
   mapreduce1.q,\
   mapreduce2.q,\
   mm_all.q,\
   mm_cttas.q,\
+  mm_dp.q,\
   orc_merge1.q,\
   orc_merge10.q,\
   orc_merge2.q,\
   orc_merge3.q,\
   orc_merge4.q,\
   orc_merge_diff_fs.q,\
+  orc_struct_type_vectorization.q,\
   parallel_colstats.q,\
   parquet_types_vectorization.q,\
   parquet_complex_types_vectorization.q,\
   parquet_map_type_vectorization.q,\
   parquet_struct_type_vectorization.q,\
-  orc_struct_type_vectorization.q,\
-  cte_2.q,\
-  cte_4.q
-
-minillaplocal.shared.query.files=alter_merge_2_orc.q,\
-  alter_merge_orc.q,\
-  alter_merge_stats_orc.q,\
-  authorization_view_8.q,\
-  auto_join0.q,\
-  auto_join1.q,\
-  auto_join21.q,\
-  auto_join29.q,\
-  auto_join30.q,\
-  auto_join_filters.q,\
-  auto_join_nulls.q,\
-  autoColumnStats_1.q,\
-  autoColumnStats_10.q,\
-  autoColumnStats_2.q,\
-  bucket2.q,\
-  bucket3.q,\
-  bucket4.q,\
-  cbo_gby.q,\
-  cbo_gby_empty.q,\
-  cbo_join.q,\
-  cbo_limit.q,\
-  cbo_semijoin.q,\
-  cbo_simple_select.q,\
-  cbo_stats.q,\
-  cbo_subq_exists.q,\
-  cbo_subq_in.q,\
-  cbo_subq_not_in.q,\
-  cbo_udf_udaf.q,\
-  cbo_union.q,\
-  cbo_views.q,\
-  cbo_windowing.q,\
-  column_names_with_leading_and_trailing_spaces.q,\
-  constprog_dpp.q,\
-  constprog_semijoin.q,\
-  convert_decimal64_to_decimal.q,\
-  correlationoptimizer1.q,\
-  count.q,\
-  count_dist_rewrite.q,\
-  create_merge_compressed.q,\
-  cross_join.q,\
-  cross_prod_1.q,\
-  cross_prod_3.q,\
-  cross_prod_4.q,\
-  cross_product_check_1.q,\
-  cross_product_check_2.q,\
-  ctas.q,\
-  cte_1.q,\
-  cte_3.q,\
-  cte_5.q,\
-  cte_mat_1.q,\
-  cte_mat_2.q,\
-  cte_mat_3.q,\
-  cte_mat_4.q,\
-  cte_mat_5.q,\
-  custom_input_output_format.q,\
-  deleteAnalyze.q,\
-  delete_all_non_partitioned.q,\
-  delete_all_partitioned.q,\
-  delete_tmp_table.q,\
-  delete_where_no_match.q,\
-  delete_where_non_partitioned.q,\
-  delete_where_partitioned.q,\
-  delete_whole_partition.q,\
-  disable_merge_for_bucketing.q,\
-  dynpart_sort_opt_vectorization.q,\
-  dynpart_sort_optimization.q,\
-  dynpart_sort_optimization2.q,\
-  distinct_66.q,\
-  empty_array.q,\
-  empty_join.q,\
-  enforce_order.q,\
-  filter_join_breaktask.q,\
-  filter_join_breaktask2.q,\
-  filter_union.q,\
-  groupby1.q,\
-  groupby2.q,\
-  groupby3.q,\
-  groupby_rollup_empty.q,\
-  having.q,\
-  identity_project_remove_skip.q,\
-  insert1.q,\
-  insert_orig_table.q,\
-  insert_update_delete.q,\
-  insert_values_dynamic_partitioned.q,\
-  insert_values_non_partitioned.q,\
-  insert_values_partitioned.q,\
-  insert_values_tmp_table.q,\
-  join0.q,\
-  join1.q,\
-  join_emit_interval.q,\
-  join46.q,\
-  join_nullsafe.q,\
-  keep_uniform.q,\
-  kill_query.q,\
-  leftsemijoin.q,\
-  limit_pushdown.q,\
-  load_dyn_part1.q,\
-  load_dyn_part2.q,\
-  load_dyn_part3.q,\
-  lvj_mapjoin.q,\
-  mapjoin2.q,\
-  mapjoin3.q,\
-  mapjoin_decimal.q,\
-  mapjoin_mapjoin.q,\
-  mapjoin46.q,\
-  mapjoin_decimal_vectorized.q,\
-  merge1.q,\
-  merge2.q,\
-  mergejoin.q,\
-  metadata_only_queries.q,\
-  metadata_only_queries_with_filters.q,\
-  metadataonly1.q,\
-  mrr.q,\
-  nonmr_fetch_threshold.q,\
-  optimize_nullscan.q,\
-  orc_analyze.q,\
-  orc_merge11.q,\
-  orc_merge5.q,\
-  orc_merge6.q,\
-  orc_merge7.q,\
-  orc_merge8.q,\
-  orc_merge9.q,\
-  orc_merge_incompat1.q,\
-  orc_merge_incompat2.q,\
-  orc_merge_incompat3.q,\
-  orc_merge_incompat_schema.q,\
-  orc_merge_incompat_writer_version.q,\
-  orc_ppd_schema_evol_1a.q,\
-  orc_ppd_schema_evol_1b.q,\
-  orc_ppd_schema_evol_2a.q,\
-  orc_ppd_schema_evol_2b.q,\
-  orc_schema_evol_quoted.q,\
-  parallel.q,\
-  partition_pruning.q,\
-  ptf.q,\
-  ptf_matchpath.q,\
-  ptf_streaming.q,\
-  sample1.q,\
-  selectDistinctStar.q,\
-  select_dummy_source.q,\
-  skewjoin.q,\
-  stats_noscan_1.q,\
-  stats_only_null.q,\
-  subquery_exists.q,\
-  subquery_in.q,\
-  temp_table.q,\
-  union2.q,\
-  union3.q,\
-  union4.q,\
-  union5.q,\
-  union6.q,\
-  union7.q,\
-  union8.q,\
-  union9.q,\
-  update_after_multiple_inserts.q,\
-  update_all_non_partitioned.q,\
-  update_all_partitioned.q,\
-  update_all_types.q,\
-  update_tmp_table.q,\
-  update_two_cols.q,\
-  update_where_no_match.q,\
-  update_where_non_partitioned.q,\
-  update_where_partitioned.q,\
-  vector_acid3.q,\
-  vector_aggregate_9.q,\
-  vector_aggregate_without_gby.q,\
-  vector_auto_smb_mapjoin_14.q,\
-  vector_between_columns.q,\
-  vector_between_in.q,\
-  vector_binary_join_groupby.q,\
-  vector_bround.q,\
-  vector_bucket.q,\
-  vector_case_when_1.q,\
-  vector_case_when_2.q,\
-  vector_cast_constant.q,\
-  vector_char_2.q,\
-  vector_char_4.q,\
-  vector_char_cast.q,\
-  vector_char_mapjoin1.q,\
-  vector_char_simple.q,\
-  vector_coalesce.q,\
-  vector_coalesce_2.q,\
-  vector_coalesce_3.q,\
-  vector_coalesce_4.q,\
-  vector_complex_all.q,\
-  vector_count.q,\
-  vector_count_distinct.q,\
-  vector_data_types.q,\
-  vector_date_1.q,\
-  vector_decimal64_add_decimal64column_diffscale.q,\
-  vector_decimal64_div_decimal64scalar.q,\
-  vector_decimal64_div_decimal64column.q,\
-  vector_decimal64_mul_decimal64scalar.q,\
-  vector_decimal64_mul_decimal64column.q,\
-  vector_decimal64_mul_intcolumn.q,\
-  vector_decimal_1.q,\
-  vector_decimal_10_0.q,\
-  vector_decimal_2.q,\
-  vector_decimal_3.q,\
-  vector_decimal_4.q,\
-  vector_decimal_5.q,\
-  vector_decimal_6.q,\
-  vector_decimal_aggregate.q,\
-  vector_decimal_cast.q,\
-  vector_decimal_expressions.q,\
-  vector_decimal_join.q,\
-  vector_decimal_mapjoin.q,\
-  vector_decimal_mapjoin2.q,\
-  vector_decimal_math_funcs.q,\
-  vector_decimal_precision.q,\
-  vector_decimal_round.q,\
-  vector_decimal_round_2.q,\
-  vector_decimal_trailing.q,\
-  vector_decimal_udf.q,\
-  vector_decimal_udf2.q,\
-  vector_distinct_2.q,\
-  vectorized_distinct_gby.q,\
-  vector_elt.q,\
-  vector_groupby4.q,\
-  vector_groupby6.q,\
-  vector_groupby_3.q,\
-  vector_groupby_grouping_sets_switchmode.q,\
-  vector_groupby_mapjoin.q,\
-  vector_groupby_reduce.q,\
-  vector_grouping_sets.q,\
-  vector_if_expr.q,\
-  vector_include_no_sel.q,\
-  vector_inner_join.q,\
-  vector_interval_1.q,\
-  vector_interval_2.q,\
-  vector_interval_arithmetic.q,\
-  vector_interval_mapjoin.q,\
-  vector_join30.q,\
-  vector_join_filters.q,\
-  vector_join_nulls.q,\
-  vector_left_outer_join.q,\
-  vector_left_outer_join2.q,\
-  vector_leftsemi_mapjoin.q,\
-  vector_map_order.q,\
-  vector_mr_diff_schema_alias.q,\
-  vector_multi_insert.q,\
-  vector_null_projection.q,\
-  vector_nullsafe_join.q,\
-  vector_nvl.q,\
-  vector_orderby_5.q,\
-  vector_outer_join0.q,\
-  vector_outer_join1.q,\
-  vector_outer_join2.q,\
-  vector_outer_join3.q,\
-  vector_outer_join4.q,\
-  vector_outer_join5.q,\
-  vector_outer_join6.q,\
-  vector_outer_join_constants.q,\
-  vector_partition_diff_num_cols.q,\
-  vector_partitioned_date_time.q,\
-  vector_reduce1.q,\
-  vector_reduce2.q,\
-  vector_reduce3.q,\
-  vector_reduce_groupby_decimal.q,\
-  vector_reduce_groupby_duplicate_cols.q,\
-  vector_string_concat.q,\
-  vector_struct_in.q,\
-  vector_udf_character_length.q,\
-  vector_udf_octet_length.q,\
-  vector_varchar_4.q,\
-  vector_varchar_mapjoin1.q,\
-  vector_varchar_simple.q,\
-  vector_when_case_null.q,\
-  vector_union_null.q,\
-  vectorization_0.q,\
-  vectorization_1.q,\
-  vectorization_10.q,\
-  vectorization_11.q,\
-  vectorization_12.q,\
-  vectorization_13.q,\
-  vectorization_14.q,\
-  vectorization_15.q,\
-  vectorization_16.q,\
-  vectorization_17.q,\
-  vectorization_2.q,\
-  vectorization_3.q,\
-  vectorization_4.q,\
-  vectorization_5.q,\
-  vectorization_6.q,\
-  vectorization_7.q,\
-  vectorization_8.q,\
-  vectorization_9.q,\
-  vectorization_decimal_date.q,\
-  vectorization_limit.q,\
-  vectorization_nested_udf.q,\
-  vectorization_not.q,\
-  vectorization_part.q,\
-  vectorization_part_project.q,\
-  vectorization_part_varchar.q,\
-  vectorization_pushdown.q,\
-  vectorization_short_regress.q,\
-  vectorized_bucketmapjoin1.q,\
-  vectorized_case.q,\
-  vectorized_casts.q,\
-  vectorized_context.q,\
-  vectorized_date_funcs.q,\
-  vectorized_decimal64_boundary.q,\
-  vectorized_dynamic_partition_pruning.q,\
-  vectorized_insert_into_bucketed_table.q,\
-  vectorized_mapjoin.q,\
-  vectorized_mapjoin3.q,\
-  vectorized_math_funcs.q,\
-  vectorized_nested_mapjoin.q,\
-  vectorized_parquet.q,\
-  vectorized_parquet_types.q,\
-  vectorized_ptf.q,\
-  vectorized_rcfile_columnar.q,\
-  vectorized_shufflejoin.q,\
-  vectorized_string_funcs.q,\
-  vectorized_timestamp.q,\
-  vectorized_timestamp_funcs.q,\
-  vectorized_timestamp_ints_casts.q
-
-minillap.query.files=acid_bucket_pruning.q,\
-  add_part_with_loc.q,\
-  alter_table_location2.q,\
-  alter_table_location3.q,\
-  bucket5.q,\
-  bucket6.q,\
-  dynamic_semijoin_user_level.q,\
-  except_distinct.q,\
-  explainuser_2.q,\
-  empty_dir_in_table.q,\
-  intersect_all.q,\
-  intersect_distinct.q,\
-  intersect_merge.q,\
-  llap_udf.q,\
-  llapdecider.q,\
-  mm_dp.q,\
   reduce_deduplicate.q,\
-  reduce_deduplicate_distinct.q, \
+  reduce_deduplicate_distinct.q,\
   remote_script.q,\
   file_with_header_footer.q,\
   skip_header_footer_aggr.q,\
@@ -489,1593 +171,220 @@ minillap.query.files=acid_bucket_pruning.q,\
   vector_custom_udf_configure.q,\
   vector_udf3.q
 
-minillaplocal.query.files=\
-  empty_files_external_table.q,\
-  bucket_num_reducers_acid.q,\
-  dec_str.q,\
-  dp_counter_non_mm.q,\
-  dp_counter_mm.q,\
-  acid_globallimit.q,\
-  acid_meta_columns_decode.q,\
-  acid_no_buckets.q, \
-  acid_vectorization_missing_cols.q,\
-  acid_vectorization_original.q,\
-  alter_merge_stats_orc.q,\
-  alter_partition_change_col.q,\
-  alter6.q,\
-  authorization_view_8.q,\
-  auto_join30.q,\
-  auto_join_filters.q,\
-  auto_join_nulls.q,\
-  auto_sortmerge_join_1.q,\
-  auto_sortmerge_join_10.q,\
-  auto_sortmerge_join_11.q,\
-  auto_sortmerge_join_12.q,\
-  auto_sortmerge_join_13.q,\
-  auto_sortmerge_join_14.q,\
-  auto_sortmerge_join_15.q,\
-  auto_sortmerge_join_16.q,\
-  auto_sortmerge_join_2.q,\
-  auto_sortmerge_join_3.q,\
-  auto_sortmerge_join_4.q,\
-  auto_sortmerge_join_5.q,\
-  auto_sortmerge_join_6.q,\
-  auto_sortmerge_join_7.q,\
-  auto_sortmerge_join_8.q,\
-  auto_sortmerge_join_9.q,\
-  avro_extschema_insert.q,\
-  avro_hybrid_mixed_date.q,\
-  avro_hybrid_mixed_timestamp.q,\
-  avro_legacy_mixed_date.q,\
-  avro_legacy_mixed_timestamp.q,\
-  avro_proleptic_mixed_date.q,\
-  avro_proleptic_mixed_timestamp.q,\
-  bucket4.q,\
-  bucket_groupby.q,\
-  bucket_many.q,\
-  bucket_map_join_tez1.q,\
-  bucket_map_join_tez2.q,\
-  bucket_map_join_tez_empty.q,\
-  bucket_num_reducers.q,\
-  bucket_num_reducers2.q,\
-  bucket_num_reducers_acid2.q,\
-  bucketizedhiveinputformat.q,\
-  bucketmapjoin6.q,\
-  bucketmapjoin7.q,\
-  bucketpruning1.q,\
-  reopt_dpp.q,\
-  reopt_semijoin.q,\
-  retry_failure.q,\
-  retry_failure_stat_changes.q,\
-  retry_failure_oom.q,\
-  retry_failure_reorder.q,\
-  runtime_stats_hs2.q,\
-  bucketsortoptimize_insert_2.q,\
-  change_allowincompatible_vectorization_false_date.q,\
-  change_allowincompatible_vectorization_false_date2.q,\
-  change_allowincompatible_vectorization_false_date3.q,\
-  check_constraint.q,\
-  cbo_gby.q,\
-  cbo_join.q,\
-  cbo_limit.q,\
-  cbo_no_stats.q,\
-  cbo_rp_gby.q,\
-  cbo_rp_join.q,\
-  cbo_rp_semijoin.q,\
-  cbo_rp_unionDistinct_2.q,\
-  cbo_rp_windowing_2.q,\
-  cbo_subq_not_in.q,\
-  column_name_is_table_alias.q,\
-  column_table_stats.q,\
-  column_table_stats_orc.q,\
-  colstats_date_min_max.q,\
-  compare_double_bigint_2.q,\
-  constprog_dpp.q,\
-  constant_prop_when.q,\
-  constant_prop_join_rs.q,\
-  constraints_alter.q,\
-  constraints_optimization.q,\
-  current_date_timestamp.q,\
-  correlationoptimizer1.q,\
-  correlationoptimizer2.q,\
-  correlationoptimizer4.q,\
-  correlationoptimizer6.q,\
-  csv_llap.q,\
-  default_constraint.q,\
-  disable_merge_for_bucketing.q,\
-  cross_prod_1.q,\
-  cross_prod_3.q,\
-  cross_prod_4.q,\
-  dpp.q,\
-  probedecode_mapjoin_stats.q,\
-  probedecode_mapjoin_simple.q,\
-  dynamic_partition_pruning.q,\
-  dynamic_partition_join_noncbo.q,\
-  dynamic_semijoin_reduction.q,\
-  dynamic_semijoin_reduction_2.q,\
-  dynamic_semijoin_reduction_3.q,\
-  dynamic_semijoin_reduction_4.q,\
-  dynamic_semijoin_reduction_on_aggcol.q,\
-  dynamic_semijoin_reduction_sw.q,\
-  dynpart_sort_opt_vectorization.q,\
-  dynpart_sort_optimization.q,\
-  dynpart_sort_optimization_acid.q,\
-  dynpart_sort_opt_bucketing.q,\
-  enforce_constraint_notnull.q,\
-  escape1.q,\
-  escape2.q,\
-  estimate_pkfk_fknulls.q,\
-  estimate_pkfk_nocond.q,\
-  estimate_pkfk_filtered_fk.q,\
-  estimate_pkfk_push.q,\
-  exchgpartition2lel.q,\
-  explainanalyze_2.q,\
-  explainuser_1.q,\
-  explainuser_4.q,\
-  external_jdbc_auth.q,\
-  external_jdbc_table.q,\
-  external_jdbc_table2.q,\
-  external_jdbc_table3.q,\
-  external_jdbc_table4.q,\
-  external_jdbc_table_partition.q,\
-  external_jdbc_table_perf.q,\
-  external_jdbc_table_typeconversion.q,\
-  fullouter_mapjoin_1_optimized.q,\
-  fold_varchar.q,\
-  get_splits_0.q,\
-  groupby2.q,\
-  groupby_groupingset_bug.q,\
-  groupby_rollup_empty2.q,\
-  hybridgrace_hashjoin_1.q,\
-  hybridgrace_hashjoin_2.q,\
-  is_distinct_from.q,\
-  infer_bucket_sort_bucketed_table.q,\
-  input16_cc.q,\
-  insert_after_drop_partition.q,\
-  insert_dir_distcp.q,\
-  insert_into_default_keyword.q,\
-  insert_into_with_schema.q,\
-  insert_only_empty_query.q, \
-  insert_overwrite.q,\
-  insert_values_orig_table.q,\
-  insert_values_orig_table_use_metadata.q,\
-  insert1_overwrite_partitions.q,\
-  jdbc_handler.q,\
-  join1.q,\
-  join_acid_non_acid.q,\
-  join_constraints_optimization.q,\
-  join_filters.q,\
-  join_max_hashtable.q,\
-  join_nulls.q,\
-  join_nullsafe.q,\
-  join_is_not_distinct_from.q,\
-  join_reordering_no_stats.q,\
-  join_reorder5.q,\
-  kryo.q,\
-  leftsemijoin_mr.q,\
-  limit_join_transpose.q,\
-  lineage2.q,\
-  lineage3.q,\
-  list_bucket_dml_10.q,\
-  llap_acid.q,\
-  llap_acid_fast.q,\
-  llap_acid2.q,\
-  llap_partitioned.q,\
-  llap_smb.q,\
-  llap_smb_ptf.q,\
-  llap_vector_nohybridgrace.q,\
-  llap_uncompressed.q,\
-  llap_decimal64_reader.q,\
-  llap_text.q,\
-  llap_io_etl.q,\
-  load_data_using_job.q,\
-  load_dyn_part5.q,\
-  lvj_mapjoin.q,\
-  materialized_view_cluster.q,\
-  materialized_view_count_distinct.q,\
-  materialized_view_create.q,\
-  materialized_view_create_rewrite_dummy.q,\
-  materialized_view_create_rewrite_multi_db.q,\
-  materialized_view_create_rewrite_rebuild_dummy.q,\
-  materialized_view_create_rewrite_time_window.q,\
-  materialized_view_create_rewrite_time_window_2.q,\
+mr.query.files=\
+  archive_excludeHadoop20.q,\
+  archive_multi.q,\
+  bucket_map_join_1.q,\
+  bucket_map_join_2.q,\
+  bucket_map_join_spark1.q,\
+  bucket_map_join_spark2.q,\
+  bucket_map_join_spark3.q,\
+  bucket_map_join_spark4.q,\
+  bucketcontext_1.q,\
+  bucketcontext_2.q,\
+  bucketcontext_3.q,\
+  bucketcontext_4.q,\
+  bucketcontext_5.q,\
+  bucketcontext_6.q,\
+  bucketcontext_7.q,\
+  bucketcontext_8.q,\
+  bucketmapjoin10.q,\
+  bucketmapjoin11.q,\
+  bucketmapjoin12.q,\
+  bucketmapjoin13.q,\
+  bucketmapjoin5.q,\
+  bucketmapjoin8.q,\
+  bucketmapjoin9.q,\
+  bucketmapjoin_negative.q,\
+  bucketmapjoin_negative2.q,\
+  bucketmapjoin_negative3.q,\
+  cbo_rp_auto_join1.q,\
+  explain_rearrange.q,\
+  f_is_null.q,\
+  hook_context_cs.q,\
+  infer_bucket_sort.q,\
+  input37.q,\
+  input39.q,\
+  input44.q,\
+  inputwherefalse.q,\
+  join_map_ppr.q,\
+  join_vc.q,\
+  list_bucket_dml_8.q,\
+  localtimezone.q,\
+  manyViewJoin.q,\
+  mapjoin1.q,\
+  mapjoin47.q,\
+  mapjoin_distinct.q,\
+  mapjoin_filter_on_outerjoin.q,\
+  mapjoin_hook.q,\
+  mapjoin_memcheck.q,\
+  mapjoin_subquery.q,\
+  mapjoin_subquery2.q,\
+  mapjoin_test_outer.q,\
+  masking_5.q,\
+  msck_repair_0.q,\
+  msck_repair_1.q,\
+  msck_repair_2.q,\
+  msck_repair_3.q,\
+  msck_repair_acid.q,\
+  msck_repair_batchsize.q,\
+  msck_repair_drop.q,\
+  nonmr_fetch.q,\
+  nonreserved_keywords_input37.q,\
+  nullformat.q,\
+  nullformatCTAS.q,\
+  parenthesis_star_by.q,\
+  partition_discovery.q,\
+  partition_vs_table_metadata.q,\
+  quotedid_basic_standard.q?,\
+  repair.q,\
+  row__id.q,\
+  sample_islocalmode_hook.q,\
+  sample_islocalmode_hook_use_metadata.q,\
+  serde_user_properties.q,\
+  skewjoinopt1.q,\
+  skewjoinopt10.q,\
+  skewjoinopt11.q,\
+  skewjoinopt12.q,\
+  skewjoinopt13.q,\
+  skewjoinopt14.q,\
+  skewjoinopt16.q,\
+  skewjoinopt17.q,\
+  skewjoinopt18.q,\
+  skewjoinopt19.q,\
+  skewjoinopt2.q,\
+  skewjoinopt20.q,\
+  skewjoinopt21.q,\
+  skewjoinopt3.q,\
+  skewjoinopt4.q,\
+  skewjoinopt5.q,\
+  skewjoinopt6.q,\
+  skewjoinopt7.q,\
+  skewjoinopt8.q,\
+  skewjoinopt9.q,\
+  smb_mapjoin9.q,\
+  smb_mapjoin_20.q,\
+  smb_mapjoin_21.q,\
+  smb_mapjoin_22.q,\
+  smb_mapjoin_25.q,\
+  smb_mapjoin_46.q,\
+  smb_mapjoin_47.q,\
+  sort_merge_join_desc_1.q,\
+  sort_merge_join_desc_2.q,\
+  sort_merge_join_desc_3.q,\
+  sort_merge_join_desc_4.q,\
+  sort_merge_join_desc_5.q,\
+  sort_merge_join_desc_6.q,\
+  sort_merge_join_desc_7.q,\
+  sort_merge_join_desc_8.q,\
+  stats_noscan_2.q,\
+  symlink_text_input_format.q,\
+  timestamptz_2.q,\
+  transform_acid.q,\
+  type_change_test_fraction_vectorized.q,\
+  type_change_test_int_vectorized.q,\
+  typechangetest.q,\
+  udaf_percentile_approx_23.q,\
+  udf_context_aware.q,\
+  udf_count.q,\
+  udf_using.q,\
+  uniquejoin.q,\
+  vector_udf_trunc.q,\
+  windowing_windowspec.q
+
+encrypted.query.files=\
+  encryption_join_unencrypted_tbl.q,\
+  encryption_insert_partition_static.q,\
+  encryption_insert_partition_dynamic.q,\
+  encryption_join_with_different_encryption_keys.q,\
+  encryption_select_read_only_encrypted_tbl.q,\
+  encryption_select_read_only_unencrypted_tbl.q,\
+  encryption_load_data_to_encrypted_tables.q,\
+  encryption_unencrypted_nonhdfs_external_tables.q,\
+  encryption_move_tbl.q,\
+  encryption_drop_table.q,\
+  encryption_insert_values.q,\
+  encryption_drop_view.q,\
+  encryption_drop_partition.q,\
+  encryption_ctas.q,\
+  encryption_auto_purge_tables.q,\
+  encryption_drop_table_in_encrypted_db.q
+
+# Queries ran by both MiniLlapLocal and Beeline
+beeline.query.files.shared=\
+  create_merge_compressed.q,\
+  mapjoin2.q,\
   materialized_view_create_rewrite.q,\
-  materialized_view_create_rewrite_2.q,\
-  materialized_view_create_rewrite_3.q,\
-  materialized_view_create_rewrite_4.q,\
-  materialized_view_create_rewrite_5.q,\
-  materialized_view_describe.q,\
-  materialized_view_distribute_sort.q,\
-  materialized_view_drop.q,\
-  materialized_view_partition_cluster.q,\
-  materialized_view_partitioned.q,\
-  materialized_view_partitioned_2.q,\
-  materialized_view_partitioned_3.q,\
-  materialized_view_rebuild.q,\
-  materialized_view_rewrite_empty.q,\
-  materialized_view_rewrite_1.q,\
-  materialized_view_rewrite_2.q,\
-  materialized_view_rewrite_3.q,\
-  materialized_view_rewrite_4.q,\
-  materialized_view_rewrite_5.q,\
-  materialized_view_rewrite_6.q,\
-  materialized_view_rewrite_7.q,\
-  materialized_view_rewrite_8.q,\
-  materialized_view_rewrite_9.q,\
-  materialized_view_rewrite_10.q,\
-  materialized_view_rewrite_in_between.q,\
-  materialized_view_rewrite_no_join_opt.q,\
-  materialized_view_rewrite_no_join_opt_2.q,\
-  materialized_view_rewrite_part_1.q,\
-  materialized_view_rewrite_part_2.q,\
-  materialized_view_rewrite_ssb.q,\
-  materialized_view_rewrite_ssb_2.q,\
-  materialized_view_rewrite_window.q,\
-  mapjoin_decimal.q,\
-  mapjoin_hint.q,\
-  mapjoin_emit_interval.q,\
-  mergejoin_3way.q,\
-  mm_bhif.q,\
-  mm_conversions.q,\
-  mm_exim.q,\
-  mm_loaddata.q,\
-  mm_loaddata_split_change.q,\
-  mrr.q,\
-  multigroupbydistinct.q,\
-  multiMapJoin1.q,\
-  multiMapJoin2.q,\
-  multi_in_clause.q,\
-  murmur_hash_migration.q,\
-  murmur_hash_migration2.q,\
-  non_native_window_udf.q,\
-  optimize_join_ptp.q,\
-  orc_analyze.q,\
-  orc_llap.q,\
-  orc_llap_nonvector.q,\
-  orc_ppd_date.q,\
-  tez_compile_counters.q,\
-  tez_input_counters.q,\
-  orc_ppd_decimal.q,\
-  orc_ppd_timestamp.q,\
-  order_null.q,\
-  parquet_hybrid_mixed_date.q,\
-  parquet_hybrid_mixed_timestamp.q,\
-  parquet_legacy_mixed_date.q,\
-  parquet_legacy_mixed_timestamp.q,\
-  parquet_proleptic_mixed_date.q,\
-  parquet_timestampt_to_bigint.q,\
-  partition_ctas.q,\
-  partition_multilevels.q,\
-  partition_shared_scan.q,\
-  partition_pruning.q,\
-  ptf.q,\
-  ptf_streaming.q,\
-  orc_hybrid_mixed_date.q,\
-  orc_hybrid_mixed_timestamp.q,\
-  orc_legacy_mixed_date.q,\
-  orc_legacy_mixed_timestamp.q,\
-  orc_proleptic_mixed_date.q,\
-  orc_proleptic_mixed_timestamp.q,\
-  runtime_stats_merge.q,\
-  quotedid_smb.q,\
-  reducesink_dedup.q,\
-  resourceplan.q,\
-  results_cache_1.q,\
-  results_cache_2.q,\
-  results_cache_capacity.q,\
-  results_cache_empty_result.q,\
-  results_cache_invalidation.q,\
-  results_cache_invalidation2.q,\
-  results_cache_lifetime.q,\
-  results_cache_quoted_identifiers.q,\
-  results_cache_temptable.q,\
-  results_cache_transactional.q,\
-  results_cache_truncate.q,\
-  results_cache_with_masking.q,\
-  sample10.q,\
-  sample10_mm.q,\
-  schema_evol_orc_acid_part_llap_io.q,\
-  schema_evol_orc_acid_part.q,\
-  schema_evol_orc_acid_part_update_llap_io.q,\
-  schema_evol_orc_acid_part_update.q,\
-  schema_evol_orc_acid_table_llap_io.q,\
-  schema_evol_orc_acid_table.q,\
-  schema_evol_orc_acid_table_update_llap_io.q,\
-  schema_evol_orc_acid_table_update.q,\
-  schema_evol_orc_acidvec_part_llap_io.q,\
-  schema_evol_orc_acidvec_part.q,\
-  schema_evol_orc_acidvec_part_update_llap_io.q,\
-  schema_evol_orc_acidvec_part_update.q,\
-  schema_evol_orc_acidvec_table_llap_io.q,\
-  schema_evol_orc_acidvec_table.q,\
-  schema_evol_orc_acidvec_table_update_llap_io.q,\
-  schema_evol_orc_acidvec_table_update.q,\
-  schema_evol_orc_nonvec_part_llap_io.q,\
-  schema_evol_orc_nonvec_part.q,\
-  schema_evol_orc_nonvec_part_all_complex_llap_io.q,\
-  schema_evol_orc_nonvec_part_all_complex.q,\
-  schema_evol_orc_nonvec_part_all_primitive_llap_io.q,\
-  schema_evol_orc_nonvec_part_all_primitive.q,\
-  schema_evol_orc_nonvec_table_llap_io.q,\
-  schema_evol_orc_nonvec_table.q,\
-  schema_evol_orc_vec_part_llap_io.q,\
-  schema_evol_orc_vec_part.q,\
-  schema_evol_orc_vec_part_all_complex_llap_io.q,\
-  schema_evol_orc_vec_part_all_complex.q,\
-  schema_evol_orc_vec_part_all_primitive_llap_io.q,\
-  schema_evol_orc_vec_part_all_primitive.q,\
-  schema_evol_orc_vec_table_llap_io.q,\
-  schema_evol_orc_vec_table.q,\
-  schema_evol_stats.q,\
-  schema_evol_text_nonvec_part_llap_io.q,\
-  schema_evol_text_nonvec_part.q,\
-  schema_evol_text_nonvec_part_all_complex_llap_io.q,\
-  schema_evol_text_nonvec_part_all_complex.q,\
-  schema_evol_text_nonvec_part_all_primitive_llap_io.q,\
-  schema_evol_text_nonvec_part_all_primitive.q,\
-  schema_evol_text_nonvec_table_llap_io.q,\
-  schema_evol_text_nonvec_table.q,\
-  schema_evol_text_vec_part_llap_io.q,\
-  schema_evol_text_vec_part.q,\
-  schema_evol_text_vec_part_all_complex_llap_io.q,\
-  schema_evol_text_vec_part_all_complex.q,\
-  schema_evol_text_vec_part_all_primitive_llap_io.q,\
-  schema_evol_text_vec_part_all_primitive.q,\
-  schema_evol_text_vec_table_llap_io.q,\
-  schema_evol_text_vec_table.q,\
-  schema_evol_text_vecrow_part_llap_io.q,\
-  schema_evol_text_vecrow_part.q,\
-  schema_evol_text_vecrow_part_all_complex_llap_io.q,\
-  schema_evol_text_vecrow_part_all_complex.q,\
-  schema_evol_text_vecrow_part_all_primitive_llap_io.q,\
-  schema_evol_text_vecrow_part_all_primitive.q,\
-  schema_evol_text_vecrow_table_llap_io.q,\
-  schema_evol_text_vecrow_table.q,\
-  schema_evol_undecorated.q,\
-  selectDistinctStar.q,\
-  semijoin.q,\
-  semijoin6.q,\
-  semijoin7.q,\
-  semijoin_hint.q,\
-  sharedwork.q,\
-  semijoin_reddedup.q,\
-  sharedworkext.q,\
-  sharedworkresidual.q,\
-  smb_cache.q,\
-  sort_acid.q,\
-  special_character_in_tabnames_1.q,\
-  special_character_in_tabnames_2.q,\
-  special_character_in_tabnames_quotes_1.q,\
-  special_character_in_tabnames_quotes_2.q,\
-  sqlmerge.q,\
-  sqlmerge_stats.q,\
-  stats_based_fetch_decision.q,\
-  stats_only_external.q,\
-  strict_managed_tables_sysdb.q,\
-  strict_managed_tables1.q,\
-  strict_managed_tables2.q,\
-  subquery_ANY.q,\
-  subquery_ALL.q,\
-  subquery_in_having.q,\
-  subquery_notin.q,\
-  subquery_nested_subquery.q, \
-  subquery_select.q, \
-  subquery_shared_alias.q, \
-  subquery_null_agg.q,\
-  rfc5424_parser.q,\
-  rfc5424_parser_exception.q,\
-  rfc5424_parser_file_pruning.q,\
-  sysdb.q,\
-  sysdb_schq.q,\
-  schq_materialized.q,\
-  schq_analyze.q,\
-  schq_ingest.q,\
-  sketches_hll.q,\
-  sketches_theta.q,\
-  sketches_rewrite_count_distinct.q,\
-  sketches_rewrite_percentile_disc.q,\
-  sketches_materialized_view_rollup.q,\
-  sketches_materialized_view_rollup2.q,\
-  sketches_materialized_view_percentile_disc.q,\
-  sketches_materialized_view_safety.q,\
-  table_access_keys_stats.q,\
-  temp_table_llap_partitioned.q,\
-  tez_bmj_schema_evolution.q,\
-  tez_dml.q,\
-  tez_dynpart_hashjoin_1.q,\
-  tez_dynpart_hashjoin_2.q,\
-  tez_dynpart_hashjoin_3.q,\
-  tez_fixed_bucket_pruning.q,\
-  tez_fsstat.q,\
-  tez_insert_overwrite_local_directory_1.q,\
-  tez_join.q,\
-  tez_join_hash.q,\
-  tez_join_result_complex.q,\
-  tez_join_tests.q,\
-  tez_joins_explain.q,\
-  tez_multi_union.q,\
-  tez_nway_join.q,\
-  tez_schema_evolution.q,\
-  tez_self_join.q,\
-  tez_smb_1.q,\
-  tez_smb_empty.q,\
-  tez_smb_main.q,\
-  tez_smb_reduce_side.q,\
-  tez_union.q,\
-  tez_union2.q,\
-  tez_union_decimal.q,\
-  tez_union_group_by.q,\
-  tez_union_multiinsert.q,\
-  tez_acid_union_multiinsert.q,\
-  tez_vector_dynpart_hashjoin_1.q,\
-  tez_vector_dynpart_hashjoin_2.q,\
-  timestamp_4.q,\
-  timestamptz_5.q,\
-  topnkey.q,\
-  topnkey_order_null.q,\
-  topnkey_grouping_sets.q,\
-  topnkey_grouping_sets_functions.q,\
-  topnkey_grouping_sets_order.q,\
-  topnkey_order_null.q,\
-  topnkey_windowing.q,\
-  topnkey_windowing_order.q,\
-  vector_topnkey.q,\
-  transitive_not_null.q,\
-  truncate_external_force.q,\
-  uber_reduce.q,\
-  udaf_collect_set_2.q,\
-  udaf_all_keyword.q,\
-  udf_coalesce.q,\
-  llap_notequalns.q,\
-  union_assertion_type.q,\
-  union_fast_stats.q,\
-  union_rowcounts.q,\
-  union_remove_26.q,\
-  union_top_level.q,\
-  update_access_time_non_current_db.q, \
-  vector_identity_reuse.q,\
-  vector_acid4.q,\
-  vector_and_or_scalar_col.q,\
-  vector_annotate_stats_select.q,\
-  vector_auto_smb_mapjoin_14.q,\
-  vector_case_when_conversion.q,\
-  vector_char_varchar_1.q,\
-  vector_complex_all.q,\
-  vector_complex_join.q,\
-  vector_create_struct_table.q,\
-  vector_decimal_2.q,\
-  vector_decimal_udf.q,\
-  vector_decimal64_case_when_nvl.q,\
-  vector_decimal64_case_when_nvl_cbo.q,\
-  vector_decimal64_multi_vertex.q,\
-  vector_deserialize_row.q,\
-  vector_full_outer_join.q,\
-  vector_fullouter_mapjoin_1_fast.q,\
-  vector_fullouter_mapjoin_1_optimized.q,\
-  vector_fullouter_mapjoin_1_optimized_passthru.q,\
-  vector_groupby_cube1.q,\
-  vector_groupby_grouping_id1.q,\
-  vector_groupby_grouping_id2.q,\
-  vector_groupby_grouping_id3.q,\
-  vector_groupby_grouping_sets1.q,\
-  vector_groupby_grouping_sets2.q,\
-  vector_groupby_grouping_sets3.q,\
-  vector_groupby_grouping_sets3_dec.q,\
-  vector_groupby_grouping_sets4.q,\
-  vector_groupby_grouping_sets5.q,\
-  vector_groupby_grouping_sets6.q,\
-  vector_groupby_grouping_sets_grouping.q,\
-  vector_groupby_grouping_sets_limit.q,\
-  vector_groupby_grouping_window.q,\
-  vector_groupby_rollup1.q,\
-  vector_groupby_sort_11.q,\
-  vector_groupby_sort_8.q,\
-  vector_if_expr_2.q,\
-  vector_join30.q,\
-  vector_join_filters.q,\
-  vector_left_outer_join3.q,\
-  vector_leftsemi_mapjoin.q,\
-  vector_like_2.q,\
-  vector_llap_io_data_conversion.q,\
-  vector_list_constant.q,\
-  vector_llap_text_1.q,\
-  vector_mapjoin_complex_values.q,\
-  vector_mapjoin_reduce.q,\
-  vector_null_map.q,\
-  vector_number_compare_projection.q,\
-  vector_orc_merge_incompat_schema.q,\
-  vector_offset_limit_reduce.q,\
-  vector_orc_nested_column_pruning.q,\
-  vector_orc_null_check.q,\
-  vector_order_null.q,\
-  vector_outer_reference_windowed.q,\
-  vector_parquet_nested_two_level_complex.q,\
-  vector_partitioned_date_time.q,\
-  vector_ptf_1.q,\
-  vector_ptf_part_simple.q,\
-  vector_retry_failure.q,\
-  vector_reuse_scratchcols.q,\
-  vector_string_decimal.q,\
-  vector_udf_adaptor_1.q,\
-  vector_udf_inline.q,\
-  vector_udf_string_to_boolean.q,\
-  vector_udf1.q,\
-  vector_udf2.q,\
-  vector_windowing.q,\
-  vector_windowing_expressions.q,\
-  vector_windowing_gby.q,\
-  vector_windowing_gby2.q,\
-  vector_windowing_multipartitioning.q,\
-  vector_windowing_navfn.q,\
-  vector_windowing_order_null.q,\
-  vector_windowing_range_multiorder.q,\
-  vector_windowing_rank.q,\
-  vector_windowing_streaming.q,\
-  vector_windowing_windowspec.q,\
-  vector_windowing_windowspec4.q,\
-  vectorization_div0.q,\
-  vectorization_input_format_excludes.q,\
-  vectorized_insert_into_bucketed_table.q,\
-  vectorization_short_regress.q,\
-  vectorized_dynamic_partition_pruning.q,\
-  vectorized_dynamic_semijoin_reduction.q,\
-  vectorized_dynamic_semijoin_reduction2.q,\
-  vectorized_ptf.q,\
-  windowing.q,\
-  windowing_gby.q,\
-  windowing_filter.q,\
-  unionDistinct_2.q,\
-  auto_smb_mapjoin_14.q,\
-  subquery_views.q,\
-  vector_nullsafe_join.q,\
-  smb_mapjoin_18.q,\
-  varchar_udf1.q,\
-  vectorized_parquet.q,\
-  bucketmapjoin2.q,\
-  orc_ppd_varchar.q,\
-  multi_insert.q,\
-  cbo_rp_limit.q,\
-  vector_interval_2.q,\
-  cbo_semijoin.q,\
-  parquet_predicate_pushdown.q,\
-  vector_outer_join5.q,\
-  smb_mapjoin_6.q,\
-  multi_column_in.q,\
-  orc_predicate_pushdown.q,\
-  columnStatsUpdateForStatsOptimizer_1.q,\
-  reduce_deduplicate_extended.q,\
-  limit_pushdown3.q,\
-  offset_limit.q,\
-  vector_join_nulls.q,\
-  correlationoptimizer3.q,\
-  vectorization_0.q,\
-  columnstats_part_coltype.q,\
-  drop_partition_with_stats.q,\
-  dynpart_sort_optimization2.q,\
-  multi_column_in_single.q,\
-  join32_lessSize.q,\
-  bucketmapjoin1.q,\
-  ppr_pushdown.q,\
-  smb_mapjoin_14.q,\
-  vector_between_in.q,\
-  offset_limit_ppd_optimizer.q,\
-  cluster.q,\
-  subquery_corr.q,\
-  subquery_in.q,\
-  subquery_multi.q,\
-  subquery_scalar.q,\
-  stats11.q,\
-  orc_create.q,\
-  orc_split_elimination.q,\
-  order_null.q,\
-  skewjoinopt15.q,\
-  authorization_2.q,\
-  cbo_subq_in.q,\
-  alter_merge_orc.q,\
-  bucketsortoptimize_insert_6.q,\
-  bucketmapjoin4.q,\
-  orc_merge7.q,\
-  column_access_stats.q,\
-  smb_mapjoin_5.q,\
-  vector_adaptor_usage_mode.q,\
-  optimize_nullscan.q,\
-  parquet_types.q,\
-  groupby_grouping_id2.q,\
-  constprog_semijoin.q,\
-  ppd_union_view.q,\
-  smb_mapjoin_19.q,\
-  cbo_rp_views.q,\
-  bucketsortoptimize_insert_7.q,\
-  smb_mapjoin_15.q,\
-  vectorized_nested_mapjoin.q,\
-  skiphf_aggr.q,\
-  multi_insert_lateral_view.q,\
-  smb_mapjoin_4.q,\
-  cbo_udf_udaf.q,\
-  bucketmapjoin3.q,\
-  metadataonly1.q,\
-  lateral_view.q,\
-  extrapolate_part_stats_partial_ndv.q,\
-  cbo_views.q,\
-  limit_pushdown.q,\
-  cbo_rp_udf_udaf.q,\
-  count.q,\
-  vector_inner_join.q,\
-  temp_table.q,\
-  vector_partition_diff_num_cols.q,\
-  vector_count_distinct.q,\
-  cbo_rp_udf_udaf_stats_opt.q,\
-  database.q,\
-  smb_mapjoin_17.q,\
-  groupby_resolution.q,\
-  windowing_windowspec2.q,\
-  unionDistinct_3.q,\
-  vectorized_join46.q,\
-  vectorized_multi_output_select.q,\
-  dynamic_semijoin_reduction_sw2.q,\
-  partialdhj.q,\
-  stats_date.q,\
-  dst.q,\
-  q93_with_constraints.q,\
-  approx_distinct.q,\
-  ctas_empty_source.q,\
-  acid_bloom_filter_orc_file_dump.q,\
-  acid_insert_overwrite.q,\
-  acid_join.q,\
-  acid_stats.q,\
-  acid_subquery.q,\
-  acid_table_directories_test.q,\
-  acid_vectorization.q,\
-  acid_vectorization_partition.q,\
-  acid_vectorization_project.q,\
-  add_jar_pfile.q,\
-  add_jar_with_file_removed.q,\
-  add_part_exist.q,\
+  select_dummy_source.q
+
+beeline.positive.include=\
+  colstats_all_nulls.q,\
+  drop_with_concurrency.q,\
+  escape_comments.q,\
+  explain_outputs.q,\
+  insert_overwrite_local_directory_1.q,\
+  smb_mapjoin_1.q,\
+  smb_mapjoin_10.q,\
+  smb_mapjoin_11.q,\
+  smb_mapjoin_12.q,\
+  smb_mapjoin_13.q,\
+  smb_mapjoin_16.q,\
+  smb_mapjoin_2.q,\
+  smb_mapjoin_3.q,\
+  smb_mapjoin_7.q,\
+  udf_unix_timestamp.q,\
+  desc_table_formatted.q
+
+minimr.query.negative.files=\
+  cluster_tasklog_retrieval.q,\
+  file_with_header_footer_negative.q,\
+  local_mapred_error_cache.q,\
+  mapreduce_stack_trace.q,\
+  mapreduce_stack_trace_turnoff.q,\
+  minimr_broken_pipe.q,\
+  table_nonprintable_negative.q,\
+  udf_local_resource.q,\
+  ct_noperm_loc.q,\
+  ctas_noperm_loc.q
+
+# tests are sorted use: perl -pe 's@\\\s*\n@ @g' testconfiguration.properties \
+# | awk -F= '/spark.query.files/{print $2}' | perl -pe 's@.q *, *@\n@g' \
+# | egrep -v '^ *$' |  sort -V | uniq | perl -pe 's@\n@.q, \\\n@g' | perl -pe 's@^@  @g'
+spark.query.files=\
   add_part_multiple.q,\
-  add_partition_no_whitelist.q,\
-  add_partition_with_whitelist.q,\
-  allow_change_col_type_par.q,\
-  alter1.q,\
-  alter2.q,\
-  alter3.q,\
-  alter4.q,\
-  alter5.q,\
-  alterColumnStats.q,\
-  alter_char1.q,\
-  alter_char2.q,\
-  alter_file_format.q,\
-  alter_merge.q,\
-  alter_merge_2.q,\
-  alter_merge_3.q,\
-  alter_merge_stats.q,\
-  alter_numbuckets_partitioned_table2_h23.q,\
-  alter_numbuckets_partitioned_table_h23.q,\
-  alter_partition_clusterby_sortby.q,\
-  alter_partition_format_loc.q,\
-  alter_partition_onto_nocurrent_db.q,\
-  alter_partition_update_status.q,\
-  alter_partition_with_whitelist.q,\
-  alter_rename_partition.q,\
-  alter_rename_partition_authorization.q,\
-  alter_rename_table.q,\
-  alter_skewed_table.q,\
-  alter_table_add_partition.q,\
-  alter_table_cascade.q,\
-  alter_table_column_stats.q,\
-  alter_table_location.q,\
-  alter_table_not_sorted.q,\
-  alter_table_partition_drop.q,\
-  alter_table_serde.q,\
-  alter_table_serde2.q,\
-  alter_table_stats_status.q,\
-  alter_table_update_status.q,\
-  alter_table_update_status_disable_bitvector.q,\
-  alter_varchar1.q,\
-  alter_varchar2.q,\
-  alter_view_as_select.q,\
-  alter_view_col_type.q,\
-  alter_view_rename.q,\
-  analyze_tbl_part.q,\
-  authorization_1.q,\
-  authorization_1_sql_std.q,\
-  authorization_3.q,\
-  authorization_4.q,\
-  authorization_5.q,\
-  authorization_6.q,\
-  authorization_7.q,\
-  authorization_8.q,\
-  authorization_admin_almighty1.q,\
-  authorization_admin_almighty2.q,\
-  authorization_alter_table_exchange_partition.q,\
-  authorization_cli_createtab.q,\
-  authorization_cli_createtab_noauthzapi.q,\
-  authorization_cli_nonsql.q,\
-  authorization_cli_stdconfigauth.q,\
-  authorization_create_func1.q,\
-  authorization_create_macro1.q,\
-  authorization_create_table_owner_privs.q,\
-  authorization_create_temp_table.q,\
-  authorization_default_create_table_owner_privs.q,\
-  authorization_delete.q,\
-  authorization_delete_own_table.q,\
-  authorization_grant_option_role.q,\
-  authorization_grant_public_role.q,\
-  authorization_grant_table_priv.q,\
-  authorization_insert.q,\
-  authorization_load.q,\
-  authorization_non_id.q,\
-  authorization_owner_actions.q,\
-  authorization_parts.q,\
-  authorization_reset.q,\
-  authorization_revoke_table_priv.q,\
-  authorization_role_grant1.q,\
-  authorization_role_grant2.q,\
-  authorization_set_show_current_role.q,\
-  authorization_show_grant.q,\
-  authorization_show_role_principals_v1.q,\
-  authorization_update.q,\
-  authorization_update_own_table.q,\
-  authorization_view_2.q,\
-  authorization_view_3.q,\
-  authorization_view_4.q,\
-  authorization_view_disable_cbo_2.q,\
-  authorization_view_disable_cbo_3.q,\
-  authorization_view_disable_cbo_4.q,\
-  authorization_wm.q,\
-  autoColumnStats_3.q,\
-  avro_add_column.q,\
-  avro_add_column2.q,\
-  avro_add_column3.q,\
-  avro_add_column_extschema.q,\
-  avro_alter_table_update_columns.q,\
-  avro_change_schema.q,\
-  avro_charvarchar.q,\
-  avro_comments.q,\
-  avro_compression_enabled.q,\
-  avro_compression_enabled_native.q,\
-  avro_decimal.q,\
-  avro_decimal_native.q,\
-  avro_decimal_old.q,\
-  avro_deserialize_map_null.q,\
-  avro_evolved_schemas.q,\
-  avro_historical_timestamp.q,\
-  avro_joins.q,\
-  avro_joins_native.q,\
-  avro_native.q,\
-  avro_nullable_fields.q,\
-  avro_nullable_union.q,\
-  avro_partitioned.q,\
-  avro_partitioned_native.q,\
-  avro_sanity_test.q,\
-  avro_schema_literal.q,\
-  avro_tableproperty_optimize.q,\
-  avro_type_evolution.q,\
-  avrocountemptytbl.q,\
-  ba_table1.q,\
-  ba_table2.q,\
-  ba_table3.q,\
-  ba_table_udfs.q,\
-  ba_table_union.q,\
-  basicstat_partval.q,\
-  binary_constant.q,\
-  binary_table_bincolserde.q,\
-  binary_table_colserde.q,\
-  bitvector.q,\
-  bool_literal.q,\
-  bucket7.q,\
-  bucket_if_with_path_filter.q,\
-  bucketizedhiveinputformat_auto.q,\
-  cast2.q,\
-  cast3.q,\
-  cast_qualified_types.q,\
-  cast_tinyint_to_double.q,\
-  cast_to_int.q,\
-  cbo_rp_gby_empty.q,\
-  cbo_rp_stats.q,\
-  cbo_rp_udf_percentile.q,\
-  cbo_rp_udf_percentile2.q,\
-  cbo_rp_union.q,\
-  cbo_rp_windowing.q,\
-  cbo_udf_max.q,\
-  char_1.q,\
-  char_2.q,\
-  char_cast.q,\
-  char_comparison.q,\
-  char_join1.q,\
-  char_nested_types.q,\
-  char_pad_convert.q,\
-  char_union1.q,\
-  char_varchar_udf.q,\
-  cli_print_escape_crlf.q,\
-  cmdwithcomments.q,\
-  collision.q,\
-  columnstats_infinity.q,\
-  combine1.q,\
-  combine3.q,\
-  comma_in_column_name.q,\
-  compile_processor.q,\
-  compustat_avro.q,\
-  compute_stats_binary.q,\
-  compute_stats_boolean.q,\
-  compute_stats_decimal.q,\
-  compute_stats_double.q,\
-  compute_stats_empty_table.q,\
-  compute_stats_long.q,\
-  compute_stats_string.q,\
-  concatenate_inherit_table_location.q,\
-  confirm_initial_tbl_stats.q,\
-  constant_prop_4.q,\
-  convert_enum_to_string.q,\
-  cp_mj_rc.q,\
-  create_1.q,\
-  create_alter_list_bucketing_table1.q,\
-  create_big_view.q,\
-  create_default_prop.q,\
-  create_escape.q,\
-  create_func1.q,\
-  create_genericudf.q,\
-  create_insert_outputformat.q,\
-  create_like.q,\
-  create_like2.q,\
-  create_like_tbl_props.q,\
-  create_like_view.q,\
-  create_nested_type.q,\
-  create_or_replace_view.q,\
-  create_skewed_table1.q,\
-  create_struct_table.q,\
-  create_table_like_stats.q,\
-  create_transactional_full_acid.q,\
-  create_transactional_insert_only.q,\
-  create_union_table.q,\
-  create_view_defaultformats.q,\
-  create_view_partitioned.q,\
-  create_view_translate.q,\
-  create_with_constraints.q,\
-  create_with_constraints2.q,\
-  crtseltbl_serdeprops.q,\
-  ct_case_insensitive.q,\
-  ctas_char.q,\
-  ctas_date.q,\
-  ctas_uses_table_location.q,\
-  ctas_varchar.q,\
-  cteViews.q,\
-  cte_7.q,\
-  current_catalog_and_schema.q,\
-  database_drop.q,\
-  date_1.q,\
-  date_3.q,\
-  date_4.q,\
-  date_5.q,\
-  date_comparison.q,\
-  date_int_operation_test.q,\
-  date_join1.q,\
-  date_timestamp_prec.q,\
-  date_udf.q,\
-  dbtxnmgr_abort.q,\
-  dbtxnmgr_compact1.q,\
-  dbtxnmgr_compact2.q,\
-  dbtxnmgr_compact3.q,\
-  dbtxnmgr_ddl1.q,\
-  dbtxnmgr_query1.q,\
-  dbtxnmgr_query2.q,\
-  dbtxnmgr_query3.q,\
-  dbtxnmgr_query4.q,\
-  dbtxnmgr_query5.q,\
-  dbtxnmgr_showlocks.q,\
-  decimal_1.q,\
-  decimal_10_0.q,\
-  decimal_1_1.q,\
-  decimal_2.q,\
-  decimal_3.q,\
-  decimal_4.q,\
-  decimal_5.q,\
-  decimal_6.q,\
-  decimal_join.q,\
-  decimal_serde.q,\
-  decimal_skewjoin.q,\
-  decimal_trailing.q,\
-  default_file_format.q,\
-  default_partition_name.q,\
-  delimiter.q,\
-  desc_function.q,\
-  desc_non_existent_tbl.q,\
-  desc_tbl_part_cols.q,\
-  describe_comment_indent.q,\
-  describe_comment_nonascii.q,\
-  describe_database_json.q,\
-  describe_formatted_view_partitioned.q,\
-  describe_formatted_view_partitioned_json.q,\
-  describe_syntax.q,\
-  describe_table.q,\
-  describe_table_json.q,\
-  describe_xpath.q,\
-  dfscmd.q,\
-  diff_part_input_formats.q,\
-  disable_file_format_check.q,\
-  disallow_incompatible_type_change_off.q,\
-  driver_conf_isolation.q,\
-  driverhook.q,\
-  drop_database_removes_partition_dirs.q,\
-  drop_deleted_partitions.q,\
-  drop_function.q,\
-  drop_multi_partitions.q,\
-  drop_partitions_filter.q,\
-  drop_partitions_filter2.q,\
-  drop_partitions_filter3.q,\
-  drop_partitions_filter4.q,\
-  drop_table.q,\
-  drop_table2.q,\
-  drop_table_purge.q,\
-  drop_table_removes_partition_dirs.q,\
-  drop_table_with_stats.q,\
-  drop_udf.q,\
-  drop_view.q,\
-  encoding_nonutf8.q,\
-  equal_ns.q,\
-  escape3.q,\
-  escape_crlf.q,\
-  exchange_partition.q,\
-  exchange_partition2.q,\
-  exchange_partition3.q,\
-  exim_00_nonpart_empty.q,\
-  exim_01_nonpart.q,\
-  exim_02_00_part_empty.q,\
-  exim_02_part.q,\
-  exim_03_nonpart_over_compat.q,\
-  exim_04_all_part.q,\
-  exim_04_evolved_parts.q,\
-  exim_05_some_part.q,\
-  exim_06_one_part.q,\
-  exim_07_all_part_over_nonoverlap.q,\
-  exim_08_nonpart_rename.q,\
-  exim_09_part_spec_nonoverlap.q,\
-  exim_10_external_managed.q,\
-  exim_11_managed_external.q,\
-  exim_12_external_location.q,\
-  exim_13_managed_location.q,\
-  exim_14_managed_location_over_existing.q,\
-  exim_15_external_part.q,\
-  exim_16_part_external.q,\
-  exim_17_part_managed.q,\
-  exim_18_part_external.q,\
-  exim_19_00_part_external_location.q,\
-  exim_19_part_external_location.q,\
-  exim_20_part_managed_location.q,\
-  exim_21_export_authsuccess.q,\
-  exim_22_import_exist_authsuccess.q,\
-  exim_23_import_part_authsuccess.q,\
-  exim_24_import_nonexist_authsuccess.q,\
-  exim_25_export_parentpath_has_inaccessible_children.q,\
-  exim_hidden_files.q,\
-  explain_ast.q,\
-  explain_dependency.q,\
-  explain_dependency2.q,\
-  explain_locks.q,\
-  explode_null.q,\
-  expr_cached.q,\
-  external_insert.q,\
-  fileformat_mix.q,\
-  fileformat_sequencefile.q,\
-  fileformat_text.q,\
-  float_equality.q,\
-  groupby7.q,\
-  groupby_constcolval.q,\
-  groupby_empty.q,\
-  groupby_grouping_id1.q,\
-  groupby_mutli_insert_common_distinct.q,\
-  groupby_neg_float.q,\
-  groupby_nullvalues.q,\
-  hook_order.q,\
-  hypothetical_set_aggregates.q,\
-  init_file.q,\
-  inoutdriver.q,\
-  input1.q,\
-  input10.q,\
-  input15.q,\
-  input16.q,\
-  input19.q,\
-  input2.q,\
-  input24.q,\
-  input28.q,\
-  input3.q,\
-  input40.q,\
-  input41.q,\
-  input43.q,\
-  input45.q,\
-  input46.q,\
-  input49.q,\
-  input4_cb_delim.q,\
-  input_dfs.q,\
-  inputddl1.q,\
-  inputddl2.q,\
-  inputddl3.q,\
-  inputddl4.q,\
-  inputddl5.q,\
-  inputddl6.q,\
-  inputddl7.q,\
-  inputddl8.q,\
-  insert2.q,\
-  insert_acid_dynamic_partition.q,\
-  insert_acid_not_bucketed.q,\
-  insert_compressed.q,\
-  insert_into_with_schema2.q,\
-  insert_non_utf8_encoding_table.q,\
-  insert_overwrite_directory.q,\
-  insert_overwrite_directory2.q,\
-  insert_values_acid_not_bucketed.q,\
-  insert_values_nonascii.q,\
-  insert_with_move_files_from_source_dir.q,\
-  insertexternal1.q,\
-  insertvalues_espchars.q,\
-  interval_1.q,\
-  interval_2.q,\
-  interval_comparison.q,\
-  interval_udf.q,\
-  join24.q,\
-  join_array.q,\
-  join_casesensitive.q,\
-  join_empty.q,\
-  join_literals.q,\
-  json_serde1.q,\
-  json_serde2.q,\
-  json_serde_qualified_types.q,\
-  json_serde_tsformat.q,\
-  keyword_2.q,\
-  keyword_3.q,\
-  lateral_view_multi_lateralviews.q,\
-  lb_fs_stats.q,\
-  leadlag.q,\
-  limit0.q,\
-  load_dyn_part15.q,\
-  load_dyn_part7.q,\
-  load_exist_part_authsuccess.q,\
-  load_file_with_space_in_the_name.q,\
-  load_fs.q,\
-  load_fs_overwrite.q,\
-  load_local_dir_test.q,\
-  load_non_hdfs_path.q,\
-  load_nonpart_authsuccess.q,\
-  load_orc.q,\
-  load_orc_part.q,\
-  load_overwrite.q,\
-  load_part_authsuccess.q,\
-  loadpart1.q,\
-  loadpart2.q,\
-  localtimezone2.q,\
-  lock1.q,\
-  lock2.q,\
-  lock3.q,\
-  lock4.q,\
-  mapjoin_addjar.q,\
-  masking_11.q,\
-  masking_14.q,\
-  masking_acid_no_masking.q,\
-  materialized_view_authorization_sqlstd.q,\
-  materialized_view_create_acid.q,\
-  metadata_empty_table.q,\
-  metadata_export_drop.q,\
-  mi.q,\
-  min_structvalue.q,\
-  misc_json.q,\
-  mm_default.q,\
-  mm_insert_overwrite_aborted.q,\
-  mm_iow_temp.q,\
-  mm_loc_ctas.q,\
-  multi_insert_partitioned.q,\
-  multi_insert_with_join.q,\
-  multi_sahooks.q,\
-  nested_complex.q,\
-  nested_complex_additional.q,\
-  nestedvirtual.q,\
-  nomore_ambiguous_table_col.q,\
-  nonReservedKeyWords.q,\
-  non_ascii_literal1.q,\
-  non_ascii_literal2.q,\
-  notable_alias3.q,\
-  nullMap.q,\
-  null_column.q,\
-  nullformatdir.q,\
-  nullinput.q,\
-  nullinput2.q,\
-  nullshandling.q,\
-  ops_comparison.q,\
-  orc_dictionary_threshold.q,\
-  orc_diff_part_cols.q,\
-  orc_diff_part_cols2.q,\
-  orc_empty_files.q,\
-  orc_empty_strings.q,\
-  orc_empty_table.q,\
-  orc_ends_with_nulls.q,\
-  orc_file_dump.q,\
-  orc_merge13.q,\
-  orc_min_max.q,\
-  orc_mr_pathalias.q,\
-  orc_null_check.q,\
-  orc_ppd_boolean.q,\
-  orc_ppd_char.q,\
-  orc_ppd_exception.q,\
-  orc_ppd_is_null.q,\
-  orc_ppd_same_table_multiple_aliases.q,\
-  orc_remove_cols.q,\
-  orc_schema_evolution.q,\
-  orc_timestamplocaltz_type.q,\
-  orc_wide_table.q,\
-  order2.q,\
-  order_within_subquery.q,\
-  overridden_confs.q,\
-  parenthese.q,\
-  parquet_analyze.q,\
-  parquet_array_map_emptynullvals.q,\
-  parquet_array_null_element.q,\
-  parquet_array_of_multi_field_struct.q,\
-  parquet_array_of_optional_elements.q,\
-  parquet_array_of_required_elements.q,\
-  parquet_array_of_single_field_struct.q,\
-  parquet_array_of_structs.q,\
-  parquet_array_of_unannotated_groups.q,\
-  parquet_array_of_unannotated_primitives.q,\
-  parquet_avro_array_of_primitives.q,\
-  parquet_avro_array_of_single_field_struct.q,\
-  parquet_columnar.q,\
-  parquet_ctas.q,\
-  parquet_decimal.q,\
-  parquet_decimal1.q,\
-  parquet_external_time.q,\
-  parquet_historical_timestamp.q,\
-  parquet_int64_timestamp.q,\
-  parquet_int_decimal.q,\
-  parquet_join2.q,\
-  parquet_map_null.q,\
-  parquet_map_of_arrays_of_ints.q,\
-  parquet_map_of_maps.q,\
-  parquet_mixed_case.q,\
-  parquet_mixed_partition_formats.q,\
-  parquet_nested_complex.q,\
-  parquet_partitioned.q,\
-  parquet_ppd.q,\
-  parquet_ppd_char2.q,\
-  parquet_ppd_multifiles.q,\
-  parquet_ppd_partition.q,\
-  parquet_predicate_pushdown_2.q,\
-  parquet_read_backward_compatible_files.q,\
-  parquet_serde.q,\
-  parquet_stats.q,\
-  parquet_table_with_subschema.q,\
-  parquet_thrift_array_of_single_field_struct.q,\
-  parquet_type_promotion.q,\
-  parquet_vectorization_nested_udf.q,\
-  parquet_vectorization_not.q,\
-  parquet_vectorization_part.q,\
-  parquet_vectorization_part_varchar.q,\
-  parquet_write_correct_definition_levels.q,\
-  partInit.q,\
-  part_inherit_tbl_props.q,\
-  part_inherit_tbl_props_empty.q,\
-  part_inherit_tbl_props_with_star.q,\
-  partition_boolean.q,\
-  partition_char.q,\
-  partition_coltype_literals.q,\
-  partition_date.q,\
-  partition_date2.q,\
-  partition_decode_name.q,\
-  partition_params_postgres.q,\
-  partition_schema1.q,\
-  partition_serde_format.q,\
-  partition_special_char.q,\
-  partition_timestamp.q,\
-  partition_type_check.q,\
-  partition_type_in_plan.q,\
-  partition_varchar1.q,\
-  partition_varchar2.q,\
-  partition_wise_fileformat.q,\
-  partition_wise_fileformat10.q,\
-  partition_wise_fileformat11.q,\
-  partition_wise_fileformat12.q,\
-  partition_wise_fileformat13.q,\
-  partition_wise_fileformat14.q,\
-  partition_wise_fileformat15.q,\
-  partition_wise_fileformat16.q,\
-  partition_wise_fileformat17.q,\
-  partition_wise_fileformat18.q,\
-  partition_wise_fileformat3.q,\
-  partition_wise_fileformat4.q,\
-  partition_wise_fileformat5.q,\
-  partition_wise_fileformat6.q,\
-  partition_wise_fileformat7.q,\
-  partition_wise_fileformat8.q,\
-  partition_wise_fileformat9.q,\
-  partitioned_table_stats.q,\
-  partitions_filter_default.q,\
-  partitions_json.q,\
-  plan_json.q,\
-  ppd_constant_where.q,\
-  ppd_field_garbage.q,\
-  ppd_like_filter.q,\
-  ppr_pushdown2.q,\
-  primitive_types.q,\
-  progress_1.q,\
-  ptf_decimal.q,\
-  ptf_general_queries.q,\
-  ptf_rcfile.q,\
-  ptf_register_tblfn.q,\
-  ptf_seqfile.q,\
-  query_lifetime_hook.q,\
-  query_properties.q,\
-  quotedid_alter.q,\
-  quotedid_stats.q,\
-  quotedid_tblproperty.q,\
-  rcfile_columnar.q,\
-  rcfile_default_format.q,\
-  rcfile_lazydecompress.q,\
-  rcfile_toleratecorruptions.q,\
-  rcfile_union.q,\
-  read_uint_parquet.q,\
-  read_uint_parquet_vectorized.q,\
-  real.q,\
-  recursive_dir.q,\
-  reduce_deduplicate_exclude_gby.q,\
-  rename_column.q,\
-  rename_external_partition_location.q,\
-  rename_partition_location.q,\
-  rename_table_location.q,\
-  rename_table_update_column_stats.q,\
-  repl_1_drop.q,\
-  repl_2_exim_basic.q,\
-  repl_3_exim_metadata.q,\
-  reset_conf.q,\
-  schema_evol_par_vec_table_dictionary_encoding.q,\
-  schema_evol_par_vec_table_non_dictionary_encoding.q,\
-  schemeAuthority3.q,\
-  selectindate.q,\
-  semicolon.q,\
-  serde_opencsv.q,\
-  serde_regex.q,\
-  serde_reported_schema.q,\
-  set_metaconf.q,\
-  set_tblproperties.q,\
-  show_columns.q,\
-  show_conf.q,\
-  show_create_database.q,\
-  show_create_table_alter.q,\
-  show_create_table_partitioned.q,\
-  show_create_table_serde.q,\
-  show_create_table_view.q,\
-  show_describe_func_quotes.q,\
-  show_functions.q,\
-  show_materialized_views.q,\
-  show_partitions.q,\
-  show_partitions2.q,\
-  show_roles.q,\
-  show_tables.q,\
-  show_tablestatus.q,\
-  show_tblproperties.q,\
-  show_views.q,\
-  showparts.q,\
-  singletsinsertorc.q,\
-  smb_join_partition_key.q,\
-  smb_mapjoin_8.q,\
-  smblimit.q,\
-  specialChar.q,\
-  split.q,\
-  stats14.q,\
-  stats15.q,\
-  stats16.q,\
-  stats18.q,\
-  stats3.q,\
-  stats6.q,\
-  stats_aggregator_error_1.q,\
-  stats_analyze_decimal_compare.q,\
-  stats_analyze_empty.q,\
-  stats_invalidation.q,\
-  stats_list_bucket.q,\
-  stats_missing_warning.q,\
-  stats_null_optimizer.q,\
-  stats_publisher_error_1.q,\
-  statsfs.q,\
-  statsoptimizer.q,\
-  storage_format_descriptor.q,\
-  struct_in_view.q,\
-  subquery_exists_explain_rewrite.q,\
-  subquery_in_explain_rewrite.q,\
-  sum_expr_with_order.q,\
-  table_set_owner.q,\
-  table_storage.q,\
-  tablename_with_select.q,\
-  temp_table_add_part_exist.q,\
-  temp_table_alter_partition_change_col.q,\
-  temp_table_alter_partition_clusterby_sortby.q,\
-  temp_table_alter_partition_onto_nocurrent_db.q,\
-  temp_table_alter_rename_partition.q,\
-  temp_table_avro_partitioned.q,\
-  temp_table_avro_partitioned_native.q,\
-  temp_table_default_partition_name.q,\
-  temp_table_drop_multi_partitions.q,\
-  temp_table_drop_partitions_filter.q,\
-  temp_table_drop_partitions_filter2.q,\
-  temp_table_drop_partitions_filter3.q,\
-  temp_table_exchange_partition.q,\
-  temp_table_exchange_partition2.q,\
-  temp_table_exchange_partition3.q,\
-  temp_table_exchgpartition2lel.q,\
-  temp_table_gb1.q,\
-  temp_table_insert_values_dynamic_partitioned.q,\
-  temp_table_insert_values_partitioned.q,\
-  temp_table_insert_with_move_files_from_source_dir.q,\
-  temp_table_loadpart1.q,\
-  temp_table_loadpart2.q,\
-  temp_table_multi_insert_partitioned.q,\
-  temp_table_names.q,\
-  temp_table_orc_diff_part_cols.q,\
-  temp_table_orc_diff_part_cols2.q,\
-  temp_table_parquet_mixed_partition_formats.q,\
-  temp_table_parquet_partitioned.q,\
-  temp_table_parquet_ppd_partition.q,\
-  temp_table_partInit.q,\
-  temp_table_partition_boolean.q,\
-  temp_table_partition_char.q,\
-  temp_table_partition_date.q,\
-  temp_table_partition_decode_name.q,\
-  temp_table_partition_schema1.q,\
-  temp_table_partition_special_char.q,\
-  temp_table_partition_timestamp.q,\
-  temp_table_partition_type_check.q,\
-  temp_table_partition_type_in_plan.q,\
-  temp_table_partition_wise_fileformat.q,\
-  temp_table_partitions_json.q,\
-  temp_table_precedence.q,\
-  temp_table_subquery1.q,\
-  temp_table_truncate.q,\
-  testSetQueryString.q,\
-  test_boolean_whereclause.q,\
-  testdataset.q,\
-  testdataset_2.q,\
-  timestamp_1.q,\
-  timestamp_2.q,\
-  timestamp_3.q,\
-  timestamp_comparison.q,\
-  timestamp_comparison2.q,\
-  timestamp_date_only.q,\
-  timestamp_dst.q,\
-  timestamp_formats.q,\
-  timestamp_lazy.q,\
-  timestamp_null.q,\
-  timestamp_udf.q,\
-  timestamptz_1.q,\
-  timestamptz_3.q,\
-  timestamptz_4.q,\
-  topn.q,\
-  touch.q,\
-  truncate_column.q,\
-  truncate_column_merge.q,\
-  truncate_table.q,\
-  tumbled_window_tests.q,\
-  tunable_ndv.q,\
-  type_change_test_fraction.q,\
-  type_change_test_int.q,\
-  type_conversions_1.q,\
-  udaf_collect_set.q,\
-  udaf_covar_pop.q,\
-  udaf_covar_samp.q,\
-  udaf_ngrams.q,\
-  udaf_percentile.q,\
-  udf_acos.q,\
-  udf_add.q,\
-  udf_array_contains.q,\
-  udf_asin.q,\
-  udf_atan.q,\
-  udf_avg.q,\
-  udf_bigint.q,\
-  udf_bin.q,\
-  udf_bitwise_and.q,\
-  udf_bitwise_not.q,\
-  udf_bitwise_or.q,\
-  udf_bitwise_xor.q,\
-  udf_boolean.q,\
-  udf_bround.q,\
-  udf_ceil.q,\
-  udf_ceiling.q,\
-  udf_chr.q,\
-  udf_classloader.q,\
-  udf_classloader_dynamic_dependency_resolution.q,\
-  udf_compare_java_string.q,\
-  udf_concat.q,\
-  udf_concat_insert2.q,\
-  udf_conv.q,\
-  udf_cos.q,\
-  udf_current_user.q,\
-  udf_date_add.q,\
-  udf_date_sub.q,\
-  udf_datediff.q,\
-  udf_day.q,\
-  udf_dayofmonth.q,\
-  udf_div.q,\
-  udf_divide.q,\
-  udf_double.q,\
-  udf_equal.q,\
-  udf_exp.q,\
-  udf_field.q,\
-  udf_float.q,\
-  udf_floor.q,\
-  udf_from_unixtime.q,\
-  udf_greaterthan.q,\
-  udf_greaterthanorequal.q,\
-  udf_hex.q,\
-  udf_in.q,\
-  udf_index.q,\
-  udf_initcap.q,\
-  udf_int.q,\
-  udf_isnotnull.q,\
-  udf_isnull.q,\
-  udf_isops.q,\
-  udf_json_read.q,\
-  udf_lcase.q,\
-  udf_lessthan.q,\
-  udf_lessthanorequal.q,\
-  udf_likeall.q,\
-  udf_likeany.q,\
-  udf_ln.q,\
-  udf_log.q,\
-  udf_log10.q,\
-  udf_log2.q,\
-  udf_logged_in_user.q,\
-  udf_logic_java_boolean.q,\
-  udf_ltrim.q,\
-  udf_map_keys.q,\
-  udf_map_values.q,\
-  udf_max.q,\
-  udf_mid.q,\
-  udf_min.q,\
-  udf_modulo.q,\
-  udf_month.q,\
-  udf_negative.q,\
-  udf_not.q,\
-  udf_notop.q,\
-  udf_or.q,\
-  udf_percentile.q,\
-  udf_pmod.q,\
-  udf_positive.q,\
-  udf_pow.q,\
-  udf_power.q,\
-  udf_rand.q,\
-  udf_regexp.q,\
-  udf_regexp_extract.q,\
-  udf_regexp_replace.q,\
-  udf_replace.q,\
-  udf_rlike.q,\
-  udf_round.q,\
-  udf_round_2.q,\
-  udf_round_2_auto_stats.q,\
-  udf_round_3.q,\
-  udf_rtrim.q,\
-  udf_sentences.q,\
-  udf_sin.q,\
-  udf_smallint.q,\
-  udf_sqrt.q,\
-  udf_std.q,\
-  udf_stddev.q,\
-  udf_stddev_pop.q,\
-  udf_stddev_samp.q,\
-  udf_string.q,\
-  udf_substr.q,\
-  udf_substring.q,\
-  udf_subtract.q,\
-  udf_sum.q,\
-  udf_tan.q,\
-  udf_testlength.q,\
-  udf_testlength2.q,\
-  udf_tinyint.q,\
-  udf_to_boolean.q,\
-  udf_to_byte.q,\
-  udf_to_date.q,\
-  udf_to_double.q,\
-  udf_to_float.q,\
-  udf_to_long.q,\
-  udf_to_short.q,\
-  udf_to_string.q,\
-  udf_translate.q,\
-  udf_trim.q,\
-  udf_ucase.q,\
-  udf_unhex.q,\
-  udf_upper.q,\
-  udf_var_pop.q,\
-  udf_var_samp.q,\
-  udf_variance.q,\
-  udf_version.q,\
-  udf_weekofyear.q,\
-  udf_xpath.q,\
-  udf_xpath_boolean.q,\
-  udf_xpath_double.q,\
-  udf_xpath_float.q,\
-  udf_xpath_int.q,\
-  udf_xpath_long.q,\
-  udf_xpath_short.q,\
-  udf_xpath_string.q,\
-  udf_year.q,\
-  udtf_nofetchtask.q,\
-  udtf_posexplode.q,\
-  udtf_replicate_rows.q,\
-  unicode_notation.q,\
-  union36.q,\
-  union38.q,\
-  union_date.q,\
-  union_date_trim.q,\
-  union_null.q,\
-  unionall_join_nullconstant.q,\
-  unionall_lateralview1.q,\
-  unset_table_view_property.q,\
-  updateAccessTime.q,\
-  update_after_multiple_inserts_special_characters.q,\
-  varchar_1.q,\
-  varchar_2.q,\
-  varchar_cast.q,\
-  varchar_comparison.q,\
-  varchar_join1.q,\
-  varchar_nested_types.q,\
-  varchar_union1.q,\
-  vector_join.q,\
-  vector_orc_string_reader_empty_dict.q,\
-  vectorization_escape_crlf.q,\
-  view.q,\
-  view_authorization_sqlstd.q,\
-  view_cast.q,\
-  view_inputs.q,\
-  virtual_column.q,\
-  windowing_adjust_rowcontainer_sz.q,\
-  windowing_columnPruning.q,\
-  windowing_decimal.q,\
-  windowing_distinct.q,\
-  windowing_duplicate.q,\
-  windowing_ntile.q,\
-  windowing_order_null.q,\
-  windowing_rank.q,\
-  windowing_udaf2.q,\
-  windowing_windowspec4.q,\
-  zero_rows_single_insert.q,\
-  acid_mapjoin.q,\
-  acid_nullscan.q,\
-  acid_stats2.q,\
-  acid_stats3.q,\
-  acid_stats4.q,\
-  acid_stats5.q,\
-  acid_table_stats.q,\
-  acid_view_delete.q,\
-  alias_casted_column.q,\
-  allcolref_in_udf.q,\
-  alterColumnStatsPart.q,\
-  alter_change_db_location.q,\
-  alter_db_owner.q,\
-  alter_partition_coltype.q,\
-  ambiguitycheck.q,\
-  ambiguous_col.q,\
-  analyze_table_null_partition.q,\
-  analyze_tbl_date.q,\
-  annotate_stats_deep_filters.q,\
-  annotate_stats_filter.q,\
-  annotate_stats_groupby.q,\
-  annotate_stats_groupby2.q,\
+  alter_merge_orc.q,\
+  alter_merge_stats_orc.q,\
   annotate_stats_join.q,\
-  annotate_stats_join_pkfk.q,\
-  annotate_stats_limit.q,\
-  annotate_stats_part.q,\
-  annotate_stats_select.q,\
-  annotate_stats_table.q,\
-  annotate_stats_udtf.q,\
-  annotate_stats_union.q,\
-  ansi_sql_arithmetic.q,\
-  array_map_access_nonconstant.q,\
-  array_size_estimation.q,\
-  authorization_9.q,\
-  authorization_explain.q,\
-  authorization_owner_actions_db.q,\
-  authorization_view_1.q,\
-  authorization_view_disable_cbo_1.q,\
-  autoColumnStats_11.q,\
-  autoColumnStats_4.q,\
-  autoColumnStats_5.q,\
-  autoColumnStats_5a.q,\
-  autoColumnStats_7.q,\
-  autoColumnStats_8.q,\
-  autoColumnStats_9.q,\
+  parquet_vectorization_0.q ,\
+  parquet_vectorization_10.q ,\
+  parquet_vectorization_11.q ,\
+  parquet_vectorization_12.q ,\
+  parquet_vectorization_13.q ,\
+  parquet_vectorization_14.q ,\
+  parquet_vectorization_15.q ,\
+  parquet_vectorization_16.q ,\
+  parquet_vectorization_17.q ,\
+  parquet_vectorization_1.q ,\
+  parquet_vectorization_2.q ,\
+  parquet_vectorization_3.q ,\
+  parquet_vectorization_4.q ,\
+  parquet_vectorization_5.q ,\
+  parquet_vectorization_6.q ,\
+  parquet_vectorization_7.q ,\
+  parquet_vectorization_8.q ,\
+  parquet_vectorization_9.q ,\
+  parquet_vectorization_decimal_date.q ,\
+  parquet_vectorization_div0.q ,\
+  parquet_vectorization_limit.q ,\
+  parquet_vectorization_nested_udf.q ,\
+  parquet_vectorization_not.q ,\
+  parquet_vectorization_offset_limit.q ,\
+  parquet_vectorization_part_project.q ,\
+  parquet_vectorization_part.q ,\
+  parquet_vectorization_part_varchar.q ,\
+  parquet_vectorization_pushdown.q ,\
+  auto_join0.q,\
+  auto_join1.q,\
   auto_join10.q,\
   auto_join11.q,\
   auto_join12.q,\
@@ -2087,180 +396,129 @@ minillaplocal.query.files=\
   auto_join18.q,\
   auto_join18_multi_distinct.q,\
   auto_join19.q,\
-  auto_join19_inclause.q,\
   auto_join2.q,\
   auto_join20.q,\
+  auto_join21.q,\
   auto_join22.q,\
   auto_join23.q,\
   auto_join24.q,\
-  auto_join25.q,\
   auto_join26.q,\
   auto_join27.q,\
   auto_join28.q,\
+  auto_join29.q,\
   auto_join3.q,\
+  auto_join30.q,\
   auto_join31.q,\
   auto_join32.q,\
-  auto_join33.q,\
   auto_join4.q,\
   auto_join5.q,\
   auto_join6.q,\
   auto_join7.q,\
   auto_join8.q,\
   auto_join9.q,\
+  auto_join_filters.q,\
+  auto_join_nulls.q,\
   auto_join_reordering_values.q,\
   auto_join_stats.q,\
   auto_join_stats2.q,\
   auto_join_without_localtask.q,\
-  avro_date.q,\
-  avro_schema_evolution_native.q,\
-  avro_timestamp.q,\
-  avrotblsjoin.q,\
-  binarysortable_1.q,\
-  bool_unknown.q,\
-  bucket1.q,\
-  bucketsortoptimize_insert_1.q,\
-  bucketsortoptimize_insert_3.q,\
+  auto_smb_mapjoin_14.q,\
+  auto_sortmerge_join_1.q,\
+  auto_sortmerge_join_12.q,\
+  auto_sortmerge_join_13.q,\
+  auto_sortmerge_join_14.q,\
+  auto_sortmerge_join_15.q,\
+  auto_sortmerge_join_16.q,\
+  auto_sortmerge_join_2.q,\
+  auto_sortmerge_join_3.q,\
+  auto_sortmerge_join_4.q,\
+  auto_sortmerge_join_5.q,\
+  auto_sortmerge_join_6.q,\
+  auto_sortmerge_join_7.q,\
+  auto_sortmerge_join_8.q,\
+  auto_sortmerge_join_9.q,\
+  avro_compression_enabled_native.q,\
+  avro_decimal_native.q,\
+  avro_joins.q,\
+  avro_joins_native.q,\
+  bucket2.q,\
+  bucket3.q,\
+  bucket4.q,\
+  bucket7.q,\
+  bucket_map_join_1.q,\
+  bucket_map_join_2.q,\
+  bucket_map_join_spark1.q,\
+  bucket_map_join_spark2.q,\
+  bucket_map_join_spark3.q,\
+  bucket_map_join_spark4.q,\
+  bucket_map_join_tez1.q,\
+  bucket_map_join_tez2.q,\
+  bucketmapjoin1.q,\
+  bucketmapjoin10.q,\
+  bucketmapjoin11.q,\
+  bucketmapjoin12.q,\
+  bucketmapjoin13.q,\
+  bucketmapjoin2.q,\
+  bucketmapjoin3.q,\
+  bucketmapjoin4.q,\
+  bucketmapjoin5.q,\
+  bucketmapjoin7.q,\
+  bucketmapjoin8.q,\
+  bucketmapjoin9.q,\
+  bucketmapjoin_negative.q,\
+  bucketmapjoin_negative2.q,\
+  bucketmapjoin_negative3.q,\
+  bucketsortoptimize_insert_2.q,\
   bucketsortoptimize_insert_4.q,\
-  bucketsortoptimize_insert_5.q,\
+  bucketsortoptimize_insert_6.q,\
+  bucketsortoptimize_insert_7.q,\
   bucketsortoptimize_insert_8.q,\
-  case_sensitivity.q,\
-  cast1.q,\
-  cast_datetime_with_sql_2016_format.q,\
-  cast_on_constant.q,\
-  cbo_SortUnionTransposeRule.q,\
-  cbo_const.q,\
-  cbo_input26.q,\
-  cbo_ppd_non_deterministic.q,\
-  cbo_rp_annotate_stats_groupby.q,\
-  cbo_rp_auto_join0.q,\
-  cbo_rp_auto_join17.q,\
-  cbo_rp_cross_product_check_2.q,\
-  cbo_rp_gby2_map_multi_distinct.q,\
-  cbo_rp_groupby3_noskew_multi_distinct.q,\
-  cbo_rp_join0.q,\
-  cbo_rp_join1.q,\
-  cbo_rp_outer_join_ppr.q,\
-  cbo_rp_simple_select.q,\
-  cbo_rp_udaf_percentile_approx_23.q,\
-  cbo_stats_estimation.q,\
-  cbo_union_view.q,\
-  char_serde.q,\
-  char_udf1.q,\
-  clusterctas.q,\
-  columnStatsUpdateForStatsOptimizer_2.q,\
-  column_pruner_multiple_children.q,\
-  column_pruning_partitioned_view.q,\
-  columnarserde_create_shortcut.q,\
-  columnstats_partlvl.q,\
-  columnstats_partlvl_dp.q,\
-  columnstats_quoting.q,\
-  columnstats_tbllvl.q,\
-  combine2.q,\
-  comments.q,\
-  complex_alias.q,\
-  compute_stats_date.q,\
-  concat_op.q,\
-  constGby.q,\
-  constantPropWhen.q,\
-  constantPropagateForSubQuery.q,\
-  constant_prop.q,\
-  constant_prop_1.q,\
-  constant_prop_2.q,\
-  constant_prop_3.q,\
-  constant_prop_timestamp_date_cast.q,\
-  constantfolding.q,\
-  constprog1.q,\
-  constprog2.q,\
-  constprog3.q,\
-  constprog_dp.q,\
-  constprog_partitioner.q,\
-  constprog_type.q,\
-  constprog_when_case.q,\
-  correlated_join_keys.q,\
-  correlationoptimizer10.q,\
-  correlationoptimizer11.q,\
-  correlationoptimizer12.q,\
-  correlationoptimizer13.q,\
-  correlationoptimizer14.q,\
-  correlationoptimizer15.q,\
-  correlationoptimizer5.q,\
-  correlationoptimizer7.q,\
-  correlationoptimizer8.q,\
-  correlationoptimizer9.q,\
-  cp_sel.q,\
-  create_view_disable_cbo.q,\
-  cross_join_merge.q,\
-  ctas_colname.q,\
-  ctas_uses_database_location.q,\
-  cte_6.q,\
-  cte_join.q,\
-  database_location.q,\
-  database_properties.q,\
-  date_2.q,\
-  date_serde.q,\
-  db_ddl_explain.q,\
-  decimal_join2.q,\
-  decimal_precision.q,\
-  decimal_precision2.q,\
-  decimal_stats.q,\
-  decimal_udf.q,\
-  decimal_udf2.q,\
-  describe_database.q,\
-  display_colstats_tbllvl.q,\
-  distinct_groupby.q,\
-  distinct_stats.q,\
-  distinct_windowing.q,\
-  distinct_windowing_no_cbo.q,\
-  dynamic_partition_insert.q,\
-  dynamic_partition_skip_default.q,\
-  dynpart_merge.q,\
-  dynpart_sort_optimization_acid2.q,\
+  cbo_gby.q,\
+  cbo_gby_empty.q,\
+  cbo_limit.q,\
+  cbo_semijoin.q,\
+  cbo_simple_select.q,\
+  cbo_stats.q,\
+  cbo_subq_in.q,\
+  cbo_subq_not_in.q,\
+  cbo_udf_udaf.q,\
+  cbo_union.q,\
+  column_access_stats.q,\
+  count.q,\
+  create_merge_compressed.q,\
+  cross_join.q,\
+  cross_product_check_1.q,\
+  cross_product_check_2.q,\
+  ctas.q,\
+  custom_input_output_format.q,\
+  date_join1.q,\
+  date_udf.q,\
+  decimal_1_1.q,\
+  decimal_join.q,\
+  disable_merge_for_bucketing.q,\
+  dynpart_sort_optimization.q,\
+  enforce_order.q,\
   escape_clusterby1.q,\
   escape_distributeby1.q,\
   escape_orderby1.q,\
   escape_sortby1.q,\
-  except_all.q,\
-  exec_parallel_column_stats.q,\
-  explain_ddl.q,\
-  explain_logical.q,\
   explaindenpendencydiffengs.q,\
-  extract.q,\
-  extrapolate_part_stats_date.q,\
-  extrapolate_part_stats_full.q,\
-  extrapolate_part_stats_partial.q,\
-  fetch_aggregation.q,\
-  filter_aggr.q,\
-  filter_cond_pushdown.q,\
-  filter_cond_pushdown2.q,\
-  filter_cond_pushdown_HIVE_15647.q,\
-  filter_in_or_dup.q,\
-  filter_numeric.q,\
-  flatten_and_or.q,\
-  floor_time.q,\
-  fm-sketch.q,\
-  fold_case.q,\
-  fold_eq_with_case_when.q,\
-  fold_to_null.q,\
-  fold_when.q,\
-  folder_predicate.q,\
-  foldts.q,\
-  fp_literal_arithmetic.q,\
-  gby_star.q,\
+  filter_join_breaktask.q,\
+  filter_join_breaktask2.q,\
+  groupby1.q,\
   groupby10.q,\
   groupby11.q,\
-  groupby12.q,\
-  groupby13.q,\
-  groupby1_limit.q,\
   groupby1_map.q,\
   groupby1_map_nomap.q,\
   groupby1_map_skew.q,\
   groupby1_noskew.q,\
-  groupby2_limit.q,\
+  groupby2.q,\
   groupby2_map.q,\
   groupby2_map_multi_distinct.q,\
   groupby2_map_skew.q,\
   groupby2_noskew.q,\
   groupby2_noskew_multi_distinct.q,\
+  groupby3.q,\
   groupby3_map.q,\
   groupby3_map_multi_distinct.q,\
   groupby3_map_skew.q,\
@@ -2278,6 +536,7 @@ minillaplocal.query.files=\
   groupby6_map.q,\
   groupby6_map_skew.q,\
   groupby6_noskew.q,\
+  groupby7.q,\
   groupby7_map.q,\
   groupby7_map_multi_single_reducer.q,\
   groupby7_map_skew.q,\
@@ -2288,127 +547,43 @@ minillaplocal.query.files=\
   groupby8_map_skew.q,\
   groupby8_noskew.q,\
   groupby9.q,\
+  groupby_bigdata.q,\
   groupby_complex_types.q,\
   groupby_complex_types_multi_single_reducer.q,\
   groupby_cube1.q,\
-  groupby_cube_multi_gby.q,\
-  groupby_distinct_samekey.q,\
-  groupby_duplicate_key.q,\
-  groupby_grouping_id3.q,\
-  groupby_grouping_sets1.q,\
-  groupby_grouping_sets2.q,\
-  groupby_grouping_sets3.q,\
-  groupby_grouping_sets4.q,\
-  groupby_grouping_sets5.q,\
-  groupby_grouping_sets6.q,\
-  groupby_grouping_sets_grouping.q,\
-  groupby_grouping_sets_limit.q,\
-  groupby_grouping_sets_view.q,\
-  groupby_grouping_window.q,\
-  groupby_join_pushdown.q,\
+  groupby_grouping_id2.q,\
   groupby_map_ppr.q,\
   groupby_map_ppr_multi_distinct.q,\
   groupby_multi_insert_common_distinct.q,\
   groupby_multi_single_reducer.q,\
   groupby_multi_single_reducer2.q,\
   groupby_multi_single_reducer3.q,\
-  groupby_multialias.q,\
-  groupby_nocolumnalign.q,\
   groupby_position.q,\
-  groupby_ppd.q,\
   groupby_ppr.q,\
   groupby_ppr_multi_distinct.q,\
+  groupby_resolution.q,\
   groupby_rollup1.q,\
-  groupby_sort_10.q,\
-  groupby_sort_11.q,\
   groupby_sort_1_23.q,\
-  groupby_sort_2.q,\
-  groupby_sort_3.q,\
-  groupby_sort_4.q,\
-  groupby_sort_5.q,\
-  groupby_sort_6.q,\
-  groupby_sort_7.q,\
-  groupby_sort_8.q,\
-  groupby_sort_9.q,\
+  groupby_sort_skew_1.q,\
   groupby_sort_skew_1_23.q,\
-  groupby_sort_test_1.q,\
-  groupingset_high_columns.q,\
-  hashjoin.q,\
-  having2.q,\
-  hll.q,\
-  implicit_cast1.q,\
-  implicit_cast_during_insert.q,\
-  implicit_decimal.q,\
-  in_typecheck_char.q,\
-  in_typecheck_mixed.q,\
-  in_typecheck_pointlook.q,\
-  in_typecheck_varchar.q,\
-  infer_bucket_sort_convert_join.q,\
-  infer_bucket_sort_dyn_part.q,\
-  infer_bucket_sort_grouping_operators.q,\
-  infer_bucket_sort_list_bucket.q,\
-  infer_bucket_sort_map_operators.q,\
-  infer_bucket_sort_merge.q,\
-  infer_bucket_sort_multi_insert.q,\
-  infer_bucket_sort_num_buckets.q,\
-  infer_bucket_sort_reducers_power_two.q,\
-  infer_const_type.q,\
-  infer_join_preds.q,\
+  qroupby_limit_extrastep.q,\
+  having.q,\
+  identity_project_remove_skip.q,\
+  index_auto_self_join.q,\
   innerjoin.q,\
-  innerjoin1.q,\
-  input.q,\
-  input0.q,\
-  input11.q,\
-  input11_limit.q,\
   input12.q,\
   input13.q,\
+  input14.q,\
+  input17.q,\
+  input18.q,\
   input1_limit.q,\
-  input21.q,\
-  input22.q,\
-  input23.q,\
-  input25.q,\
-  input26.q,\
-  input2_limit.q,\
-  input30.q,\
-  input32.q,\
-  input3_limit.q,\
-  input4.q,\
-  input42.q,\
-  input4_limit.q,\
-  input6.q,\
-  input7.q,\
-  input8.q,\
-  input9.q,\
-  input_columnarserde.q,\
-  input_dynamicserde.q,\
-  input_lazyserde.q,\
-  input_lazyserde2.q,\
-  input_limit.q,\
-  input_part0.q,\
-  input_part1.q,\
-  input_part10.q,\
   input_part2.q,\
-  input_part3.q,\
-  input_part4.q,\
-  input_part5.q,\
-  input_part6.q,\
-  input_part7.q,\
-  input_part8.q,\
-  input_part9.q,\
-  input_testsequencefile.q,\
-  input_testxpath.q,\
-  input_testxpath2.q,\
-  input_testxpath3.q,\
-  input_testxpath4.q,\
-  insert0.q,\
-  insert2_overwrite_partitions.q,\
-  insert_nonacid_from_acid.q,\
-  insertoverwrite_bucket.q,\
-  intersect_all_rj.q,\
-  interval_3.q,\
-  interval_alt.q,\
-  interval_arithmetic.q,\
-  ivyDownload.q,\
+  insert1.q,\
+  insert_into1.q,\
+  insert_into2.q,\
+  insert_into3.q,\
+  join0.q,\
+  join1.q,\
   join10.q,\
   join11.q,\
   join12.q,\
@@ -2425,6 +600,7 @@ minillaplocal.query.files=\
   join21.q,\
   join22.q,\
   join23.q,\
+  join24.q,\
   join25.q,\
   join26.q,\
   join27.q,\
@@ -2434,6 +610,7 @@ minillaplocal.query.files=\
   join30.q,\
   join31.q,\
   join32.q,\
+  join32_lessSize.q,\
   join33.q,\
   join34.q,\
   join35.q,\
@@ -2444,11 +621,6 @@ minillaplocal.query.files=\
   join4.q,\
   join40.q,\
   join41.q,\
-  join42.q,\
-  join43.q,\
-  join44.q,\
-  join45.q,\
-  join47.q,\
   join5.q,\
   join6.q,\
   join7.q,\
@@ -2456,7 +628,8 @@ minillaplocal.query.files=\
   join9.q,\
   join_1to1.q,\
   join_alt_syntax.q,\
-  join_by_range_rule_not_null.q,\
+  join_array.q,\
+  join_casesensitive.q,\
   join_cond_pushdown_1.q,\
   join_cond_pushdown_2.q,\
   join_cond_pushdown_3.q,\
@@ -2465,14 +638,14 @@ minillaplocal.query.files=\
   join_cond_pushdown_unqual2.q,\
   join_cond_pushdown_unqual3.q,\
   join_cond_pushdown_unqual4.q,\
-  join_cond_pushdown_unqual5.q,\
+  join_empty.q,\
   join_filters_overlap.q,\
-  join_grp_diff_keys.q,\
   join_hive_626.q,\
+  join_literals.q,\
+  join_map_ppr.q,\
   join_merge_multi_expressions.q,\
   join_merging.q,\
-  join_on_varchar.q,\
-  join_parse.q,\
+  join_nullsafe.q,\
   join_rc.q,\
   join_reorder.q,\
   join_reorder2.q,\
@@ -2480,190 +653,73 @@ minillaplocal.query.files=\
   join_reorder4.q,\
   join_star.q,\
   join_thrift.q,\
+  join_vc.q,\
   join_view.q,\
-  keyword_1.q,\
-  lateral_view_cp.q,\
   lateral_view_explode2.q,\
-  lateral_view_noalias.q,\
-  lateral_view_onview.q,\
-  lateral_view_onview2.q,\
-  lateral_view_outer.q,\
-  lateral_view_ppd.q,\
-  leadlag_queries.q,\
+  lateral_view_multi_lateralviews.q,\
+  leftsemijoin.q,\
+  leftsemijoin_mr.q,\
+  limit_pushdown.q,\
   limit_pushdown2.q,\
-  limit_pushdown_negative.q,\
-  lineage1.q,\
-  list_bucket_dml_1.q,\
-  list_bucket_dml_11.q,\
-  list_bucket_dml_12.q,\
-  list_bucket_dml_13.q,\
-  list_bucket_dml_14.q,\
   list_bucket_dml_2.q,\
-  list_bucket_dml_3.q,\
-  list_bucket_dml_4.q,\
-  list_bucket_dml_5.q,\
-  list_bucket_dml_6.q,\
-  list_bucket_dml_7.q,\
-  list_bucket_dml_9.q,\
-  list_bucket_query_multiskew_1.q,\
-  list_bucket_query_multiskew_2.q,\
-  list_bucket_query_multiskew_3.q,\
-  list_bucket_query_oneskew_1.q,\
-  list_bucket_query_oneskew_2.q,\
-  list_bucket_query_oneskew_3.q,\
-  literal_decimal.q,\
-  literal_double.q,\
-  literal_ints.q,\
-  literal_string.q,\
-  llap_reader.q,\
+  load_dyn_part1.q,\
   load_dyn_part10.q,\
   load_dyn_part11.q,\
   load_dyn_part12.q,\
   load_dyn_part13.q,\
   load_dyn_part14.q,\
+  load_dyn_part15.q,\
+  load_dyn_part2.q,\
+  load_dyn_part3.q,\
   load_dyn_part4.q,\
+  load_dyn_part5.q,\
   load_dyn_part6.q,\
+  load_dyn_part7.q,\
   load_dyn_part8.q,\
   load_dyn_part9.q,\
-  load_static_ptn_into_bucketed_table.q,\
   louter_join_ppr.q,\
-  macro.q,\
-  mapreduce5.q,\
-  mapreduce6.q,\
-  masking_1.q,\
-  masking_10.q,\
-  masking_12.q,\
-  masking_13.q,\
-  masking_1_newdb.q,\
-  masking_2.q,\
-  masking_3.q,\
-  masking_4.q,\
-  masking_6.q,\
-  masking_7.q,\
-  masking_8.q,\
-  masking_9.q,\
-  masking_disablecbo_1.q,\
-  masking_disablecbo_2.q,\
-  masking_disablecbo_3.q,\
-  masking_disablecbo_4.q,\
-  masking_mv.q,\
-  masking_reserved.q,\
-  merge3.q,\
-  merge4.q,\
-  merge_dynamic_partition.q,\
-  merge_dynamic_partition2.q,\
-  merge_dynamic_partition3.q,\
-  merge_dynamic_partition4.q,\
-  merge_dynamic_partition5.q,\
-  merge_empty.q,\
-  merge_join_1.q,\
+  mapjoin1.q,\
+  mapjoin_addjar.q,\
+  mapjoin_decimal.q,\
+  mapjoin_distinct.q,\
+  mapjoin_filter_on_outerjoin.q,\
+  mapjoin_mapjoin.q,\
+  mapjoin_memcheck.q,\
+  mapjoin_subquery.q,\
+  mapjoin_subquery2.q,\
+  mapjoin_test_outer.q,\
+  mapreduce1.q,\
+  mapreduce2.q,\
+  merge1.q,\
+  merge2.q,\
   mergejoins.q,\
   mergejoins_mixed.q,\
-  metadataOnlyOptimizer.q,\
-  mm_buckets.q,\
-  multi_insert_distinct.q,\
+  metadata_only_queries.q,\
+  metadata_only_queries_with_filters.q,\
+  multi_insert.q,\
   multi_insert_gby.q,\
   multi_insert_gby2.q,\
   multi_insert_gby3.q,\
-  multi_insert_gby4.q,\
+  multi_insert_lateral_view.q,\
   multi_insert_mixed.q,\
   multi_insert_move_tasks_share_dependencies.q,\
-  multi_insert_union_src.q,\
-  multi_insert_with_join2.q,\
+  multi_insert_with_join.q,\
   multi_join_union.q,\
+  multi_join_union_src.q,\
   multigroupby_singlemr.q,\
-  named_column_join.q,\
-  nested_column_pruning.q,\
-  no_hooks.q,\
-  noalias_subq1.q,\
-  nonblock_op_deduplicate.q,\
-  notable_alias1.q,\
-  notable_alias2.q,\
-  null_cast.q,\
-  nullability_transitive_inference.q,\
   nullgroup.q,\
   nullgroup2.q,\
-  nullgroup3.q,\
   nullgroup4.q,\
   nullgroup4_multi_distinct.q,\
-  nullgroup5.q,\
-  num_op_type_conv.q,\
-  offset_limit_global_optimizer.q,\
-  optimize_filter_literal.q,\
-  optional_outer.q,\
-  orc_avro_partition_uniontype.q,\
-  orc_int_type_promotion.q,\
-  orc_nested_column_pruning.q,\
-  orc_ppd_str_conversion.q,\
-  orc_schema_evolution_float.q,\
+  optimize_nullscan.q,\
   order.q,\
-  order3.q,\
-  order_by_expr_1.q,\
-  order_by_expr_2.q,\
-  order_by_pos.q,\
+  order2.q,\
   outer_join_ppr.q,\
-  outer_reference_windowed.q,\
+  parallel.q,\
   parallel_join0.q,\
   parallel_join1.q,\
-  parallel_orderby.q,\
-  parquet_create.q,\
-  parquet_int64_timestamp_int96_compatibility.q,\
   parquet_join.q,\
-  parquet_mixed_partition_formats2.q,\
-  parquet_no_row_serde.q,\
-  parquet_ppd_boolean.q,\
-  parquet_ppd_char.q,\
-  parquet_ppd_date.q,\
-  parquet_ppd_decimal.q,\
-  parquet_ppd_timestamp.q,\
-  parquet_ppd_varchar.q,\
-  parquet_schema_evolution.q,\
-  parquet_thrift_array_of_primitives.q,\
-  parquet_types_non_dictionary_encoding_vectorization.q,\
-  parquet_vectorization_0.q,\
-  parquet_vectorization_1.q,\
-  parquet_vectorization_10.q,\
-  parquet_vectorization_11.q,\
-  parquet_vectorization_12.q,\
-  parquet_vectorization_13.q,\
-  parquet_vectorization_14.q,\
-  parquet_vectorization_15.q,\
-  parquet_vectorization_16.q,\
-  parquet_vectorization_17.q,\
-  parquet_vectorization_2.q,\
-  parquet_vectorization_3.q,\
-  parquet_vectorization_4.q,\
-  parquet_vectorization_5.q,\
-  parquet_vectorization_6.q,\
-  parquet_vectorization_7.q,\
-  parquet_vectorization_8.q,\
-  parquet_vectorization_9.q,\
-  parquet_vectorization_decimal_date.q,\
-  parquet_vectorization_div0.q,\
-  parquet_vectorization_limit.q,\
-  parquet_vectorization_offset_limit.q,\
-  parquet_vectorization_part_project.q,\
-  parquet_vectorization_pushdown.q,\
-  partial_column_stats.q,\
-  partition_boolexpr.q,\
-  partition_condition_remover.q,\
-  partition_timestamp2.q,\
-  partition_wise_fileformat2.q,\
   pcr.q,\
-  pcs.q,\
-  pointlookup.q,\
-  pointlookup2.q,\
-  pointlookup3.q,\
-  pointlookup4.q,\
-  pointlookup5.q,\
-  position_alias_test_1.q,\
-  ppd1.q,\
-  ppd2.q,\
-  ppd_clusterby.q,\
-  ppd_constant_expr.q,\
-  ppd_deterministic_expr.q,\
-  ppd_gby.q,\
-  ppd_gby2.q,\
   ppd_gby_join.q,\
   ppd_join.q,\
   ppd_join2.q,\
@@ -2677,263 +733,137 @@ minillaplocal.query.files=\
   ppd_outer_join3.q,\
   ppd_outer_join4.q,\
   ppd_outer_join5.q,\
-  ppd_random.q,\
-  ppd_repeated_alias.q,\
-  ppd_udf_case.q,\
-  ppd_udf_col.q,\
-  ppd_udtf.q,\
-  ppd_union.q,\
-  ppd_vc.q,\
-  ppd_windowing1.q,\
-  ppd_windowing2.q,\
-  ppr_allchildsarenull.q,\
-  ppr_pushdown3.q,\
-  print_header.q,\
-  ptfgroupbyjoin.q,\
-  push_or.q,\
-  query_result_fileformat.q,\
-  quote1.q,\
-  quote2.q,\
-  quotedid_basic.q,\
-  quotedid_partition.q,\
-  quotedid_skew.q,\
-  rand_partitionpruner1.q,\
-  rand_partitionpruner2.q,\
-  rand_partitionpruner3.q,\
-  rcfile_null_value.q,\
-  reduceSinkDeDuplication_pRS_key_empty.q,\
+  ppd_transform.q,\
+  ptf.q,\
+  ptf_decimal.q,\
+  ptf_general_queries.q,\
+  ptf_matchpath.q,\
+  ptf_rcfile.q,\
+  ptf_register_tblfn.q,\
+  ptf_seqfile.q,\
+  ptf_streaming.q,\
+  rcfile_bigdata.q,\
   reduce_deduplicate_exclude_join.q,\
-  reduce_deduplicate_extended2.q,\
-  regex_col.q,\
-  reloadJar.q,\
-  remove_exprs_stats.q,\
   router_join_ppr.q,\
   runtime_skewjoin_mapjoin_spark.q,\
+  sample1.q,\
+  sample10.q,\
+  sample2.q,\
   sample3.q,\
+  sample4.q,\
   sample5.q,\
   sample6.q,\
   sample7.q,\
   sample8.q,\
   sample9.q,\
-  select_as_omitted.q,\
-  select_column_pruning.q,\
-  select_same_col.q,\
-  select_unquote_and.q,\
-  select_unquote_not.q,\
-  select_unquote_or.q,\
-  semijoin2.q,\
-  semijoin3.q,\
-  semijoin4.q,\
-  semijoin5.q,\
-  serde_multi_delimit.q,\
-  set_processor_namespaces.q,\
-  set_variable_sub.q,\
-  setop_no_distinct.q,\
-  setop_subq.q,\
-  show_create_table_db_table.q,\
-  show_create_table_delimited.q,\
-  show_create_table_temp_table.q,\
-  skewjoin_mapjoin1.q,\
-  skewjoin_mapjoin10.q,\
-  skewjoin_mapjoin11.q,\
-  skewjoin_mapjoin2.q,\
-  skewjoin_mapjoin3.q,\
-  skewjoin_mapjoin4.q,\
-  skewjoin_mapjoin5.q,\
-  skewjoin_mapjoin6.q,\
-  skewjoin_mapjoin7.q,\
-  skewjoin_mapjoin8.q,\
-  skewjoin_mapjoin9.q,\
+  script_env_var1.q,\
+  script_env_var2.q,\
+  script_pipe.q,\
+  scriptfile1.q,\
+  semijoin.q,\
+  skewjoin.q,\
   skewjoin_noskew.q,\
-  skewjoin_onesideskew.q,\
   skewjoin_union_remove_1.q,\
   skewjoin_union_remove_2.q,\
+  skewjoinopt1.q,\
+  skewjoinopt10.q,\
+  skewjoinopt11.q,\
+  skewjoinopt12.q,\
+  skewjoinopt13.q,\
+  skewjoinopt14.q,\
+  skewjoinopt15.q,\
+  skewjoinopt16.q,\
+  skewjoinopt17.q,\
+  skewjoinopt18.q,\
+  skewjoinopt19.q,\
+  skewjoinopt2.q,\
+  skewjoinopt20.q,\
+  skewjoinopt3.q,\
+  skewjoinopt4.q,\
+  skewjoinopt5.q,\
+  skewjoinopt6.q,\
+  skewjoinopt7.q,\
+  skewjoinopt8.q,\
+  skewjoinopt9.q,\
+  smb_mapjoin_1.q,\
+  smb_mapjoin_10.q,\
+  smb_mapjoin_11.q,\
+  smb_mapjoin_12.q,\
+  smb_mapjoin_13.q,\
+  smb_mapjoin_14.q,\
+  smb_mapjoin_15.q,\
+  smb_mapjoin_16.q,\
+  smb_mapjoin_17.q,\
+  smb_mapjoin_18.q,\
+  smb_mapjoin_19.q,\
+  smb_mapjoin_2.q,\
+  smb_mapjoin_20.q,\
+  smb_mapjoin_21.q,\
+  smb_mapjoin_22.q,\
+  smb_mapjoin_25.q,\
+  smb_mapjoin_3.q,\
+  smb_mapjoin_4.q,\
+  smb_mapjoin_5.q,\
+  smb_mapjoin_6.q,\
+  smb_mapjoin_7.q,\
+  smb_mapjoin_8.q,\
+  smb_mapjoin_9.q,\
   sort.q,\
-  source.q,\
-  special_character_in_tabnames_2.q,\
-  stat_estimate_drill.q,\
-  stat_estimate_related_col.q,\
   stats0.q,\
   stats1.q,\
   stats10.q,\
   stats12.q,\
   stats13.q,\
+  stats14.q,\
+  stats15.q,\
+  stats16.q,\
+  stats18.q,\
   stats2.q,\
-  stats4.q,\
+  stats3.q,\
   stats5.q,\
+  stats6.q,\
   stats7.q,\
   stats8.q,\
   stats9.q,\
-  stats_empty_dyn_part.q,\
-  stats_empty_partition.q,\
-  stats_empty_partition2.q,\
-  stats_nonpart.q,\
-  stats_part.q,\
-  stats_part2.q,\
-  stats_partial_size.q,\
-  stats_ppr_all.q,\
-  stats_sizebug.q,\
-  structin.q,\
-  subq.q,\
-  subq2.q,\
-  subq_where_serialization.q,\
-  subquery_alias.q,\
-  subquery_exists_having.q,\
+  stats_noscan_1.q,\
+  stats_noscan_2.q,\
+  stats_only_null.q,\
+  stats_partscan_1_23.q,\
+  statsfs.q,\
+  subquery_exists.q,\
+  subquery_in.q,\
+  subquery_multi.q,\
   subquery_multiinsert.q,\
-  subquery_notexists.q,\
-  subquery_notexists_having.q,\
-  subquery_notin_having.q,\
-  subquery_unqual_corr_expr.q,\
-  subquery_unqualcolumnrefs.q,\
-  tablevalues.q,\
-  temp_table_add_part_multiple.q,\
-  temp_table_alter_partition_coltype.q,\
-  temp_table_display_colstats_tbllvl.q,\
-  temp_table_insert1_overwrite_partitions.q,\
-  temp_table_insert2_overwrite_partitions.q,\
+  subquery_nested_subquery.q,\
+  subquery_notin.q,\
+  subquery_null_agg.q,\
+  subquery_scalar.q,\
+  subquery_select.q,\
+  subquery_shared_alias.q,\
+  subquery_views.q,\
+  table_access_keys_stats.q,\
+  temp_table.q,\
+  temp_table_gb1.q,\
   temp_table_join1.q,\
-  temp_table_load_dyn_part1.q,\
-  temp_table_merge_dynamic_partition.q,\
-  temp_table_merge_dynamic_partition2.q,\
-  temp_table_merge_dynamic_partition3.q,\
-  temp_table_merge_dynamic_partition4.q,\
-  temp_table_merge_dynamic_partition5.q,\
-  temp_table_options1.q,\
-  temp_table_parquet_mixed_partition_formats2.q,\
-  temp_table_partition_boolexpr.q,\
-  temp_table_partition_condition_remover.q,\
-  temp_table_partition_ctas.q,\
-  temp_table_partition_multilevels.q,\
-  temp_table_partition_pruning.q,\
-  temp_table_windowing_expressions.q,\
-  test_teradatabinaryfile.q,\
-  timestamp.q,\
-  timestamp_comparison3.q,\
-  timestamp_ints_casts.q,\
-  timestamp_literal.q,\
-  timestamptz.q,\
-  truncate_column_buckets.q,\
-  truncate_column_list_bucket.q,\
-  type_cast_1.q,\
-  type_widening.q,\
-  udaf_binarysetfunctions.q,\
-  udaf_binarysetfunctions_no_cbo.q,\
-  udaf_number_format.q,\
-  udaf_percentile_cont.q,\
-  udaf_percentile_disc.q,\
-  udf1.q,\
-  udf2.q,\
-  udf3.q,\
-  udf4.q,\
-  udf5.q,\
-  udf6.q,\
-  udf7.q,\
-  udf8.q,\
-  udf9.q,\
-  udf_10_trims.q,\
-  udf_E.q,\
-  udf_PI.q,\
-  udf_abs.q,\
-  udf_add_months.q,\
-  udf_aes_decrypt.q,\
-  udf_aes_encrypt.q,\
-  udf_array.q,\
-  udf_ascii.q,\
-  udf_between.q,\
-  udf_bitwise_shiftleft.q,\
-  udf_bitwise_shiftright.q,\
-  udf_bitwise_shiftrightunsigned.q,\
-  udf_case.q,\
-  udf_case_column_pruning.q,\
-  udf_case_thrift.q,\
-  udf_cbrt.q,\
-  udf_character_length.q,\
-  udf_concat_insert1.q,\
-  udf_concat_ws.q,\
-  udf_crc32.q,\
-  udf_current_database.q,\
-  udf_date_format.q,\
-  udf_datetime_legacy_hybrid_calendar.q,\
-  udf_decode.q,\
-  udf_degrees.q,\
-  udf_elt.q,\
+  tez_join_tests.q,\
+  tez_joins_explain.q,\
+  timestamp_1.q,\
+  timestamp_2.q,\
+  timestamp_3.q,\
+  timestamp_comparison.q,\
+  timestamp_lazy.q,\
+  timestamp_null.q,\
+  timestamp_udf.q,\
+  transform1.q,\
+  transform2.q,\
+  transform_ppr1.q,\
+  transform_ppr2.q,\
+  udaf_collect_set.q,\
   udf_example_add.q,\
-  udf_explode.q,\
-  udf_factorial.q,\
-  udf_find_in_set.q,\
-  udf_folder_constants.q,\
-  udf_format_number.q,\
-  udf_from_utc_timestamp.q,\
-  udf_get_json_object.q,\
-  udf_greatest.q,\
-  udf_hash.q,\
-  udf_hour.q,\
-  udf_if.q,\
   udf_in_file.q,\
-  udf_inline.q,\
-  udf_instr.q,\
-  udf_isnull_isnotnull.q,\
-  udf_isops_simplify.q,\
-  udf_java_method.q,\
-  udf_last_day.q,\
-  udf_least.q,\
-  udf_length.q,\
-  udf_levenshtein.q,\
-  udf_like.q,\
-  udf_locate.q,\
-  udf_lower.q,\
-  udf_lpad.q,\
-  udf_map.q,\
-  udf_mask.q,\
-  udf_mask_first_n.q,\
-  udf_mask_hash.q,\
-  udf_mask_last_n.q,\
-  udf_mask_show_first_n.q,\
-  udf_mask_show_last_n.q,\
-  udf_md5.q,\
-  udf_minute.q,\
-  udf_months_between.q,\
-  udf_named_struct.q,\
-  udf_next_day.q,\
-  udf_notequal.q,\
-  udf_nullif.q,\
-  udf_nvl.q,\
-  udf_octet_length.q,\
-  udf_parse_url.q,\
-  udf_position.q,\
-  udf_quarter.q,\
-  udf_radians.q,\
-  udf_reflect.q,\
-  udf_reflect2.q,\
-  udf_repeat.q,\
-  udf_reverse.q,\
-  udf_rpad.q,\
-  udf_second.q,\
-  udf_sha1.q,\
-  udf_sha2.q,\
-  udf_sign.q,\
-  udf_size.q,\
-  udf_sort_array.q,\
-  udf_sort_array_by.q,\
-  udf_soundex.q,\
-  udf_space.q,\
-  udf_split.q,\
-  udf_struct.q,\
-  udf_substring_index.q,\
-  udf_to_unix_timestamp.q,\
-  udf_to_utc_timestamp.q,\
-  udf_trunc.q,\
-  udf_trunc_number.q,\
-  udf_union.q,\
-  udf_when.q,\
-  udf_width_bucket.q,\
-  udtf_explode.q,\
-  udtf_get_sql_schema.q,\
-  udtf_json_tuple.q,\
-  udtf_parse_url_tuple.q,\
-  udtf_stack.q,\
-  unicode_comments.q,\
-  unicode_data.q,\
+  udf_max.q,\
+  udf_min.q,\
+  udf_percentile.q,\
   union.q,\
   union10.q,\
   union11.q,\
@@ -2945,26 +875,33 @@ minillaplocal.query.files=\
   union17.q,\
   union18.q,\
   union19.q,\
+  union2.q,\
   union20.q,\
   union21.q,\
   union22.q,\
+  union23.q,\
   union24.q,\
   union25.q,\
   union26.q,\
   union27.q,\
   union28.q,\
   union29.q,\
+  union3.q,\
   union30.q,\
   union31.q,\
   union32.q,\
   union33.q,\
   union34.q,\
-  union35.q,\
-  union37.q,\
+  union4.q,\
+  union5.q,\
+  union6.q,\
+  union7.q,\
+  union8.q,\
+  union9.q,\
+  union_date.q,\
+  union_date_trim.q,\
   union_lateralview.q,\
-  union_offcbo.q,\
-  union_paren.q,\
-  union_pos_alias.q,\
+  union_null.q,\
   union_ppr.q,\
   union_remove_1.q,\
   union_remove_10.q,\
@@ -2992,737 +929,73 @@ minillaplocal.query.files=\
   union_remove_7.q,\
   union_remove_8.q,\
   union_remove_9.q,\
-  union_remove_plan.q,\
+  union_script.q,\
+  union_top_level.q,\
   union_view.q,\
-  unionall_lateralview.q,\
-  unionall_unbalancedppd.q,\
-  updateBasicStats.q,\
-  varchar_serde.q,\
-  vector_const.q,\
-  vector_decimal_col_scalar_division.q,\
-  vector_decimal_partition.q,\
-  vector_delete_orig_table.q,\
-  vector_empty_where.q,\
-  vector_gather_stats.q,\
-  vector_non_constant_in_expr.q,\
-  vector_outer_join_no_keys.q,\
-  vector_tablesample_rows.q,\
-  vector_windowing_row_number.q,\
-  vectorization_multi_value.q,\
-  vectorization_numeric_overflows.q,\
-  vectorization_offset_limit.q,\
-  vectorization_parquet_ppd_decimal.q,\
+  uniquejoin.q,\
+  varchar_join1.q,\
+  vector_between_in.q,\
+  vector_cast_constant.q,\
+  vector_char_4.q,\
+  vector_count_distinct.q,\
+  vector_data_types.q,\
+  vector_decimal_aggregate.q,\
+  vector_decimal_mapjoin.q,\
+  vector_distinct_2.q,\
+  vector_elt.q,\
+  vector_groupby_3.q,\
+  vector_left_outer_join.q,\
+  vector_mapjoin_reduce.q,\
+  vector_orderby_5.q,\
+  vector_string_concat.q,\
+  vector_varchar_4.q,\
+  vectorization_0.q,\
+  vectorization_1.q,\
+  vectorization_10.q,\
+  vectorization_11.q,\
+  vectorization_12.q,\
+  vectorization_13.q,\
+  vectorization_14.q,\
+  vectorization_15.q,\
+  vectorization_16.q,\
+  vectorization_17.q,\
+  vectorization_2.q,\
+  vectorization_3.q,\
+  vectorization_4.q,\
+  vectorization_5.q,\
+  vectorization_6.q,\
+  vectorization_9.q,\
+  vectorization_decimal_date.q,\
+  vectorization_div0.q,\
+  vectorization_input_format_excludes.q,\
+  vectorization_nested_udf.q,\
+  vectorization_not.q,\
+  vectorization_part.q,\
+  vectorization_part_project.q,\
   vectorization_parquet_projection.q,\
-  vectorization_sum_if_when.q,\
-  vectorized_join46_mr.q,\
-  vectorized_mapjoin2.q,\
-  view_alias.q,\
-  view_cbo.q,\
-  windowing_expressions.q,\
-  windowing_gby2.q,\
-  windowing_multipartitioning.q,\
-  windowing_navfn.q,\
-  windowing_range_multiorder.q,\
-  windowing_streaming.q,\
-  windowing_udaf.q,\
-  windowing_windowspec3.q,\
-  show_json_format.q
-
-encrypted.query.files=encryption_join_unencrypted_tbl.q,\
-  encryption_insert_partition_static.q,\
-  encryption_insert_partition_dynamic.q,\
-  encryption_join_with_different_encryption_keys.q,\
-  encryption_select_read_only_encrypted_tbl.q,\
-  encryption_select_read_only_unencrypted_tbl.q,\
-  encryption_load_data_to_encrypted_tables.q, \
-  encryption_unencrypted_nonhdfs_external_tables.q, \
-  encryption_move_tbl.q, \
-  encryption_drop_table.q, \
-  encryption_insert_values.q, \
-  encryption_drop_view.q, \
-  encryption_drop_partition.q, \
-  encryption_ctas.q, \
-  encryption_auto_purge_tables.q, \
-  encryption_drop_table_in_encrypted_db.q
-
-beeline.positive.include=create_merge_compressed.q,\
-  colstats_all_nulls.q,\
-  drop_with_concurrency.q,\
-  escape_comments.q,\
-  explain_outputs.q,\
-  insert_overwrite_local_directory_1.q,\
-  mapjoin2.q,\
-  materialized_view_create_rewrite.q,\
-  smb_mapjoin_1.q,\
-  smb_mapjoin_10.q,\
-  smb_mapjoin_11.q,\
-  smb_mapjoin_12.q,\
-  smb_mapjoin_13.q,\
-  smb_mapjoin_16.q,\
-  smb_mapjoin_2.q,\
-  smb_mapjoin_3.q,\
-  smb_mapjoin_7.q,\
-  select_dummy_source.q,\
-  udf_unix_timestamp.q, \
-  desc_table_formatted.q
-
-minimr.query.negative.files=cluster_tasklog_retrieval.q,\
-  file_with_header_footer_negative.q,\
-  local_mapred_error_cache.q,\
-  mapreduce_stack_trace.q,\
-  mapreduce_stack_trace_turnoff.q,\
-  minimr_broken_pipe.q,\
-  table_nonprintable_negative.q,\
-  udf_local_resource.q,\
-  ct_noperm_loc.q,\
-  ctas_noperm_loc.q
-
-# tests are sorted use: perl -pe 's@\\\s*\n@ @g' testconfiguration.properties \
-# | awk -F= '/spark.query.files/{print $2}' | perl -pe 's@.q *, *@\n@g' \
-# | egrep -v '^ *$' |  sort -V | uniq | perl -pe 's@\n@.q, \\\n@g' | perl -pe 's@^@  @g'
-spark.query.files=add_part_multiple.q, \
-  alter_merge_orc.q, \
-  alter_merge_stats_orc.q, \
-  annotate_stats_join.q, \
-  parquet_vectorization_0.q ,\
-  parquet_vectorization_10.q ,\
-  parquet_vectorization_11.q ,\
-  parquet_vectorization_12.q ,\
-  parquet_vectorization_13.q ,\
-  parquet_vectorization_14.q ,\
-  parquet_vectorization_15.q ,\
-  parquet_vectorization_16.q ,\
-  parquet_vectorization_17.q ,\
-  parquet_vectorization_1.q ,\
-  parquet_vectorization_2.q ,\
-  parquet_vectorization_3.q ,\
-  parquet_vectorization_4.q ,\
-  parquet_vectorization_5.q ,\
-  parquet_vectorization_6.q ,\
-  parquet_vectorization_7.q ,\
-  parquet_vectorization_8.q ,\
-  parquet_vectorization_9.q ,\
-  parquet_vectorization_decimal_date.q ,\
-  parquet_vectorization_div0.q ,\
-  parquet_vectorization_limit.q ,\
-  parquet_vectorization_nested_udf.q ,\
-  parquet_vectorization_not.q ,\
-  parquet_vectorization_offset_limit.q ,\
-  parquet_vectorization_part_project.q ,\
-  parquet_vectorization_part.q ,\
-  parquet_vectorization_part_varchar.q ,\
-  parquet_vectorization_pushdown.q ,\
-  auto_join0.q, \
-  auto_join1.q, \
-  auto_join10.q, \
-  auto_join11.q, \
-  auto_join12.q, \
-  auto_join13.q, \
-  auto_join14.q, \
-  auto_join15.q, \
-  auto_join16.q, \
-  auto_join17.q, \
-  auto_join18.q, \
-  auto_join18_multi_distinct.q, \
-  auto_join19.q, \
-  auto_join2.q, \
-  auto_join20.q, \
-  auto_join21.q, \
-  auto_join22.q, \
-  auto_join23.q, \
-  auto_join24.q, \
-  auto_join26.q, \
-  auto_join27.q, \
-  auto_join28.q, \
-  auto_join29.q, \
-  auto_join3.q, \
-  auto_join30.q, \
-  auto_join31.q, \
-  auto_join32.q, \
-  auto_join4.q, \
-  auto_join5.q, \
-  auto_join6.q, \
-  auto_join7.q, \
-  auto_join8.q, \
-  auto_join9.q, \
-  auto_join_filters.q, \
-  auto_join_nulls.q, \
-  auto_join_reordering_values.q, \
-  auto_join_stats.q, \
-  auto_join_stats2.q, \
-  auto_join_without_localtask.q, \
-  auto_smb_mapjoin_14.q, \
-  auto_sortmerge_join_1.q, \
-  auto_sortmerge_join_12.q, \
-  auto_sortmerge_join_13.q, \
-  auto_sortmerge_join_14.q, \
-  auto_sortmerge_join_15.q, \
-  auto_sortmerge_join_16.q, \
-  auto_sortmerge_join_2.q, \
-  auto_sortmerge_join_3.q, \
-  auto_sortmerge_join_4.q, \
-  auto_sortmerge_join_5.q, \
-  auto_sortmerge_join_6.q, \
-  auto_sortmerge_join_7.q, \
-  auto_sortmerge_join_8.q, \
-  auto_sortmerge_join_9.q, \
-  avro_compression_enabled_native.q, \
-  avro_decimal_native.q, \
-  avro_joins.q, \
-  avro_joins_native.q, \
-  bucket2.q, \
-  bucket3.q, \
-  bucket4.q, \
-  bucket7.q, \
-  bucket_map_join_1.q, \
-  bucket_map_join_2.q, \
-  bucket_map_join_spark1.q, \
-  bucket_map_join_spark2.q, \
-  bucket_map_join_spark3.q, \
-  bucket_map_join_spark4.q, \
-  bucket_map_join_tez1.q, \
-  bucket_map_join_tez2.q, \
-  bucketmapjoin1.q, \
-  bucketmapjoin10.q, \
-  bucketmapjoin11.q, \
-  bucketmapjoin12.q, \
-  bucketmapjoin13.q, \
-  bucketmapjoin2.q, \
-  bucketmapjoin3.q, \
-  bucketmapjoin4.q, \
-  bucketmapjoin5.q, \
-  bucketmapjoin7.q, \
-  bucketmapjoin8.q, \
-  bucketmapjoin9.q, \
-  bucketmapjoin_negative.q, \
-  bucketmapjoin_negative2.q, \
-  bucketmapjoin_negative3.q, \
-  bucketsortoptimize_insert_2.q, \
-  bucketsortoptimize_insert_4.q, \
-  bucketsortoptimize_insert_6.q, \
-  bucketsortoptimize_insert_7.q, \
-  bucketsortoptimize_insert_8.q, \
-  cbo_gby.q, \
-  cbo_gby_empty.q, \
-  cbo_limit.q, \
-  cbo_semijoin.q, \
-  cbo_simple_select.q, \
-  cbo_stats.q, \
-  cbo_subq_in.q, \
-  cbo_subq_not_in.q, \
-  cbo_udf_udaf.q, \
-  cbo_union.q, \
-  column_access_stats.q, \
-  count.q, \
-  create_merge_compressed.q, \
-  cross_join.q, \
-  cross_product_check_1.q, \
-  cross_product_check_2.q, \
-  ctas.q, \
-  custom_input_output_format.q, \
-  date_join1.q, \
-  date_udf.q, \
-  decimal_1_1.q, \
-  decimal_join.q, \
-  disable_merge_for_bucketing.q, \
-  dynpart_sort_optimization.q, \
-  enforce_order.q, \
-  escape_clusterby1.q, \
-  escape_distributeby1.q, \
-  escape_orderby1.q, \
-  escape_sortby1.q, \
-  explaindenpendencydiffengs.q, \
-  filter_join_breaktask.q, \
-  filter_join_breaktask2.q, \
-  groupby1.q, \
-  groupby10.q, \
-  groupby11.q, \
-  groupby1_map.q, \
-  groupby1_map_nomap.q, \
-  groupby1_map_skew.q, \
-  groupby1_noskew.q, \
-  groupby2.q, \
-  groupby2_map.q, \
-  groupby2_map_multi_distinct.q, \
-  groupby2_map_skew.q, \
-  groupby2_noskew.q, \
-  groupby2_noskew_multi_distinct.q, \
-  groupby3.q, \
-  groupby3_map.q, \
-  groupby3_map_multi_distinct.q, \
-  groupby3_map_skew.q, \
-  groupby3_noskew.q, \
-  groupby3_noskew_multi_distinct.q, \
-  groupby4.q, \
-  groupby4_map.q, \
-  groupby4_map_skew.q, \
-  groupby4_noskew.q, \
-  groupby5.q, \
-  groupby5_map.q, \
-  groupby5_map_skew.q, \
-  groupby5_noskew.q, \
-  groupby6.q, \
-  groupby6_map.q, \
-  groupby6_map_skew.q, \
-  groupby6_noskew.q, \
-  groupby7.q, \
-  groupby7_map.q, \
-  groupby7_map_multi_single_reducer.q, \
-  groupby7_map_skew.q, \
-  groupby7_noskew.q, \
-  groupby7_noskew_multi_single_reducer.q, \
-  groupby8.q, \
-  groupby8_map.q, \
-  groupby8_map_skew.q, \
-  groupby8_noskew.q, \
-  groupby9.q, \
-  groupby_bigdata.q, \
-  groupby_complex_types.q, \
-  groupby_complex_types_multi_single_reducer.q, \
-  groupby_cube1.q, \
-  groupby_grouping_id2.q, \
-  groupby_map_ppr.q, \
-  groupby_map_ppr_multi_distinct.q, \
-  groupby_multi_insert_common_distinct.q, \
-  groupby_multi_single_reducer.q, \
-  groupby_multi_single_reducer2.q, \
-  groupby_multi_single_reducer3.q, \
-  groupby_position.q, \
-  groupby_ppr.q, \
-  groupby_ppr_multi_distinct.q, \
-  groupby_resolution.q, \
-  groupby_rollup1.q, \
-  groupby_sort_1_23.q, \
-  groupby_sort_skew_1.q, \
-  groupby_sort_skew_1_23.q, \
-  qroupby_limit_extrastep.q, \
-  having.q, \
-  identity_project_remove_skip.q, \
-  index_auto_self_join.q, \
-  innerjoin.q, \
-  input12.q, \
-  input13.q, \
-  input14.q, \
-  input17.q, \
-  input18.q, \
-  input1_limit.q, \
-  input_part2.q, \
-  insert1.q, \
-  insert_into1.q, \
-  insert_into2.q, \
-  insert_into3.q, \
-  join0.q, \
-  join1.q, \
-  join10.q, \
-  join11.q, \
-  join12.q, \
-  join13.q, \
-  join14.q, \
-  join15.q, \
-  join16.q, \
-  join17.q, \
-  join18.q, \
-  join18_multi_distinct.q, \
-  join19.q, \
-  join2.q, \
-  join20.q, \
-  join21.q, \
-  join22.q, \
-  join23.q, \
-  join24.q, \
-  join25.q, \
-  join26.q, \
-  join27.q, \
-  join28.q, \
-  join29.q, \
-  join3.q, \
-  join30.q, \
-  join31.q, \
-  join32.q, \
-  join32_lessSize.q, \
-  join33.q, \
-  join34.q, \
-  join35.q, \
-  join36.q, \
-  join37.q, \
-  join38.q, \
-  join39.q, \
-  join4.q, \
-  join40.q, \
-  join41.q, \
-  join5.q, \
-  join6.q, \
-  join7.q, \
-  join8.q, \
-  join9.q, \
-  join_1to1.q, \
-  join_alt_syntax.q, \
-  join_array.q, \
-  join_casesensitive.q, \
-  join_cond_pushdown_1.q, \
-  join_cond_pushdown_2.q, \
-  join_cond_pushdown_3.q, \
-  join_cond_pushdown_4.q, \
-  join_cond_pushdown_unqual1.q, \
-  join_cond_pushdown_unqual2.q, \
-  join_cond_pushdown_unqual3.q, \
-  join_cond_pushdown_unqual4.q, \
-  join_empty.q, \
-  join_filters_overlap.q, \
-  join_hive_626.q, \
-  join_literals.q, \
-  join_map_ppr.q, \
-  join_merge_multi_expressions.q, \
-  join_merging.q, \
-  join_nullsafe.q, \
-  join_rc.q, \
-  join_reorder.q, \
-  join_reorder2.q, \
-  join_reorder3.q, \
-  join_reorder4.q, \
-  join_star.q, \
-  join_thrift.q, \
-  join_vc.q, \
-  join_view.q, \
-  lateral_view_explode2.q, \
-  lateral_view_multi_lateralviews.q, \
-  leftsemijoin.q, \
-  leftsemijoin_mr.q, \
-  limit_pushdown.q, \
-  limit_pushdown2.q, \
-  list_bucket_dml_2.q, \
-  load_dyn_part1.q, \
-  load_dyn_part10.q, \
-  load_dyn_part11.q, \
-  load_dyn_part12.q, \
-  load_dyn_part13.q, \
-  load_dyn_part14.q, \
-  load_dyn_part15.q, \
-  load_dyn_part2.q, \
-  load_dyn_part3.q, \
-  load_dyn_part4.q, \
-  load_dyn_part5.q, \
-  load_dyn_part6.q, \
-  load_dyn_part7.q, \
-  load_dyn_part8.q, \
-  load_dyn_part9.q, \
-  louter_join_ppr.q, \
-  mapjoin1.q, \
-  mapjoin_addjar.q, \
-  mapjoin_decimal.q, \
-  mapjoin_distinct.q, \
-  mapjoin_filter_on_outerjoin.q, \
-  mapjoin_mapjoin.q, \
-  mapjoin_memcheck.q, \
-  mapjoin_subquery.q, \
-  mapjoin_subquery2.q, \
-  mapjoin_test_outer.q, \
-  mapreduce1.q, \
-  mapreduce2.q, \
-  merge1.q, \
-  merge2.q, \
-  mergejoins.q, \
-  mergejoins_mixed.q, \
-  metadata_only_queries.q, \
-  metadata_only_queries_with_filters.q, \
-  multi_insert.q, \
-  multi_insert_gby.q, \
-  multi_insert_gby2.q, \
-  multi_insert_gby3.q, \
-  multi_insert_lateral_view.q, \
-  multi_insert_mixed.q, \
-  multi_insert_move_tasks_share_dependencies.q, \
-  multi_insert_with_join.q, \
-  multi_join_union.q, \
-  multi_join_union_src.q, \
-  multigroupby_singlemr.q, \
-  nullgroup.q, \
-  nullgroup2.q, \
-  nullgroup4.q, \
-  nullgroup4_multi_distinct.q, \
-  optimize_nullscan.q, \
-  order.q, \
-  order2.q, \
-  outer_join_ppr.q, \
-  parallel.q, \
-  parallel_join0.q, \
-  parallel_join1.q, \
-  parquet_join.q, \
-  pcr.q, \
-  ppd_gby_join.q, \
-  ppd_join.q, \
-  ppd_join2.q, \
-  ppd_join3.q, \
-  ppd_join4.q, \
-  ppd_join5.q, \
-  ppd_join_filter.q, \
-  ppd_multi_insert.q, \
-  ppd_outer_join1.q, \
-  ppd_outer_join2.q, \
-  ppd_outer_join3.q, \
-  ppd_outer_join4.q, \
-  ppd_outer_join5.q, \
-  ppd_transform.q, \
-  ptf.q, \
-  ptf_decimal.q, \
-  ptf_general_queries.q, \
-  ptf_matchpath.q, \
-  ptf_rcfile.q, \
-  ptf_register_tblfn.q, \
-  ptf_seqfile.q, \
-  ptf_streaming.q, \
-  rcfile_bigdata.q, \
-  reduce_deduplicate_exclude_join.q, \
-  router_join_ppr.q, \
-  runtime_skewjoin_mapjoin_spark.q, \
-  sample1.q, \
-  sample10.q, \
-  sample2.q, \
-  sample3.q, \
-  sample4.q, \
-  sample5.q, \
-  sample6.q, \
-  sample7.q, \
-  sample8.q, \
-  sample9.q, \
-  script_env_var1.q, \
-  script_env_var2.q, \
-  script_pipe.q, \
-  scriptfile1.q, \
-  semijoin.q, \
-  skewjoin.q, \
-  skewjoin_noskew.q, \
-  skewjoin_union_remove_1.q, \
-  skewjoin_union_remove_2.q, \
-  skewjoinopt1.q, \
-  skewjoinopt10.q, \
-  skewjoinopt11.q, \
-  skewjoinopt12.q, \
-  skewjoinopt13.q, \
-  skewjoinopt14.q, \
-  skewjoinopt15.q, \
-  skewjoinopt16.q, \
-  skewjoinopt17.q, \
-  skewjoinopt18.q, \
-  skewjoinopt19.q, \
-  skewjoinopt2.q, \
-  skewjoinopt20.q, \
-  skewjoinopt3.q, \
-  skewjoinopt4.q, \
-  skewjoinopt5.q, \
-  skewjoinopt6.q, \
-  skewjoinopt7.q, \
-  skewjoinopt8.q, \
-  skewjoinopt9.q, \
-  smb_mapjoin_1.q, \
-  smb_mapjoin_10.q, \
-  smb_mapjoin_11.q, \
-  smb_mapjoin_12.q, \
-  smb_mapjoin_13.q, \
-  smb_mapjoin_14.q, \
-  smb_mapjoin_15.q, \
-  smb_mapjoin_16.q, \
-  smb_mapjoin_17.q, \
-  smb_mapjoin_18.q, \
-  smb_mapjoin_19.q, \
-  smb_mapjoin_2.q, \
-  smb_mapjoin_20.q, \
-  smb_mapjoin_21.q, \
-  smb_mapjoin_22.q, \
-  smb_mapjoin_25.q, \
-  smb_mapjoin_3.q, \
-  smb_mapjoin_4.q, \
-  smb_mapjoin_5.q, \
-  smb_mapjoin_6.q, \
-  smb_mapjoin_7.q, \
-  smb_mapjoin_8.q, \
-  smb_mapjoin_9.q, \
-  sort.q, \
-  stats0.q, \
-  stats1.q, \
-  stats10.q, \
-  stats12.q, \
-  stats13.q, \
-  stats14.q, \
-  stats15.q, \
-  stats16.q, \
-  stats18.q, \
-  stats2.q, \
-  stats3.q, \
-  stats5.q, \
-  stats6.q, \
-  stats7.q, \
-  stats8.q, \
-  stats9.q, \
-  stats_noscan_1.q, \
-  stats_noscan_2.q, \
-  stats_only_null.q, \
-  stats_partscan_1_23.q, \
-  statsfs.q, \
-  subquery_exists.q, \
-  subquery_in.q, \
-  subquery_multi.q,\
-  subquery_multiinsert.q, \
-  subquery_nested_subquery.q, \
-  subquery_notin.q,\
-  subquery_null_agg.q,\
-  subquery_scalar.q,\
-  subquery_select.q, \
-  subquery_shared_alias.q, \
-  subquery_views.q,\
-  table_access_keys_stats.q, \
-  temp_table.q, \
-  temp_table_gb1.q, \
-  temp_table_join1.q, \
-  tez_join_tests.q, \
-  tez_joins_explain.q, \
-  timestamp_1.q, \
-  timestamp_2.q, \
-  timestamp_3.q, \
-  timestamp_comparison.q, \
-  timestamp_lazy.q, \
-  timestamp_null.q, \
-  timestamp_udf.q, \
-  transform1.q, \
-  transform2.q, \
-  transform_ppr1.q, \
-  transform_ppr2.q, \
-  udaf_collect_set.q, \
-  udf_example_add.q, \
-  udf_in_file.q, \
-  udf_max.q, \
-  udf_min.q, \
-  udf_percentile.q, \
-  union.q, \
-  union10.q, \
-  union11.q, \
-  union12.q, \
-  union13.q, \
-  union14.q, \
-  union15.q, \
-  union16.q, \
-  union17.q, \
-  union18.q, \
-  union19.q, \
-  union2.q, \
-  union20.q, \
-  union21.q, \
-  union22.q, \
-  union23.q, \
-  union24.q, \
-  union25.q, \
-  union26.q, \
-  union27.q, \
-  union28.q, \
-  union29.q, \
-  union3.q, \
-  union30.q, \
-  union31.q, \
-  union32.q, \
-  union33.q, \
-  union34.q, \
-  union4.q, \
-  union5.q, \
-  union6.q, \
-  union7.q, \
-  union8.q, \
-  union9.q, \
-  union_date.q, \
-  union_date_trim.q, \
-  union_lateralview.q, \
-  union_null.q, \
-  union_ppr.q, \
-  union_remove_1.q, \
-  union_remove_10.q, \
-  union_remove_11.q, \
-  union_remove_12.q, \
-  union_remove_13.q, \
-  union_remove_14.q, \
-  union_remove_15.q, \
-  union_remove_16.q, \
-  union_remove_17.q, \
-  union_remove_18.q, \
-  union_remove_19.q, \
-  union_remove_2.q, \
-  union_remove_20.q, \
-  union_remove_21.q, \
-  union_remove_22.q, \
-  union_remove_23.q, \
-  union_remove_24.q, \
-  union_remove_25.q, \
-  union_remove_3.q, \
-  union_remove_4.q, \
-  union_remove_5.q, \
-  union_remove_6.q, \
-  union_remove_6_subq.q, \
-  union_remove_7.q, \
-  union_remove_8.q, \
-  union_remove_9.q, \
-  union_script.q, \
-  union_top_level.q, \
-  union_view.q, \
-  uniquejoin.q, \
-  varchar_join1.q, \
-  vector_between_in.q, \
-  vector_cast_constant.q, \
-  vector_char_4.q, \
-  vector_count_distinct.q, \
-  vector_data_types.q, \
-  vector_decimal_aggregate.q, \
-  vector_decimal_mapjoin.q, \
-  vector_distinct_2.q, \
-  vector_elt.q, \
-  vector_groupby_3.q, \
-  vector_left_outer_join.q, \
-  vector_mapjoin_reduce.q, \
-  vector_orderby_5.q, \
-  vector_string_concat.q, \
-  vector_varchar_4.q, \
-  vectorization_0.q, \
-  vectorization_1.q, \
-  vectorization_10.q, \
-  vectorization_11.q, \
-  vectorization_12.q, \
-  vectorization_13.q, \
-  vectorization_14.q, \
-  vectorization_15.q, \
-  vectorization_16.q, \
-  vectorization_17.q, \
-  vectorization_2.q, \
-  vectorization_3.q, \
-  vectorization_4.q, \
-  vectorization_5.q, \
-  vectorization_6.q, \
-  vectorization_9.q, \
-  vectorization_decimal_date.q, \
-  vectorization_div0.q, \
-  vectorization_input_format_excludes.q, \
-  vectorization_nested_udf.q, \
-  vectorization_not.q, \
-  vectorization_part.q, \
-  vectorization_part_project.q, \
-  vectorization_parquet_projection.q, \
-  vectorization_pushdown.q, \
-  vectorization_short_regress.q, \
-  vectorized_case.q, \
-  vectorized_mapjoin.q, \
-  vectorized_math_funcs.q, \
-  vectorized_nested_mapjoin.q, \
-  vectorized_ptf.q, \
-  vectorized_rcfile_columnar.q, \
-  vectorized_shufflejoin.q, \
-  vectorized_string_funcs.q, \
-  vectorized_timestamp_funcs.q, \
+  vectorization_pushdown.q,\
+  vectorization_short_regress.q,\
+  vectorized_case.q,\
+  vectorized_mapjoin.q,\
+  vectorized_math_funcs.q,\
+  vectorized_nested_mapjoin.q,\
+  vectorized_ptf.q,\
+  vectorized_rcfile_columnar.q,\
+  vectorized_shufflejoin.q,\
+  vectorized_string_funcs.q,\
+  vectorized_timestamp_funcs.q,\
   windowing.q
 
 # Unlike "spark.query.files" above, these tests only run
 # under Spark engine and only use TestSparkCliDriver.
-spark.only.query.files=spark_union_merge.q,\
+spark.only.query.files=\
+  spark_union_merge.q,\
   spark_combine_equivalent_work_2.q
 
 # Unlike "miniSparkOnYarn.query.files" below, these tests only run
 # under Spark engine and only use TestMiniSparkOnYarnCliDriver.
-miniSparkOnYarn.only.query.files=spark_combine_equivalent_work.q,\
+miniSparkOnYarn.only.query.files=\
+  spark_combine_equivalent_work.q,\
   spark_dynamic_partition_pruning.q,\
   spark_dynamic_partition_pruning_2.q,\
   spark_dynamic_partition_pruning_3.q,\
@@ -3733,7 +1006,7 @@ miniSparkOnYarn.only.query.files=spark_combine_equivalent_work.q,\
   spark_dynamic_partition_pruning_mapjoin_only.q,\
   spark_constprog_dpp.q,\
   spark_dynamic_partition_pruning_recursive_mapjoin.q,\
-  dynamic_rdd_cache.q, \
+  dynamic_rdd_cache.q,\
   spark_multi_insert_parallel_orderby.q,\
   spark_explainuser_1.q,\
   spark_vectorized_dynamic_partition_pruning.q,\
@@ -3743,7 +1016,8 @@ miniSparkOnYarn.only.query.files=spark_combine_equivalent_work.q,\
   spark_opt_shuffle_serde.q,\
   spark_in_process_launcher.q
 
-miniSparkOnYarn.query.files=auto_sortmerge_join_16.q,\
+miniSparkOnYarn.query.files=\
+  auto_sortmerge_join_16.q,\
   bucket4.q,\
   bucket5.q,\
   bucket6.q,\
@@ -3801,24 +1075,29 @@ miniSparkOnYarn.query.files=auto_sortmerge_join_16.q,\
   vector_outer_join4.q,\
   vector_outer_join5.q
 
-localSpark.only.query.files=spark_local_queries.q
+localSpark.only.query.files=\
+  spark_local_queries.q
 
-spark.query.negative.files=groupby2_map_skew_multi_distinct.q,\
+spark.query.negative.files=\
+  groupby2_map_skew_multi_distinct.q,\
   groupby2_multi_distinct.q,\
   groupby3_map_skew_multi_distinct.q,\
   groupby3_multi_distinct.q,\
   groupby_grouping_sets7.q
 
-spark.only.query.negative.files=spark_job_max_tasks.q,\
+spark.only.query.negative.files=\
+  spark_job_max_tasks.q,\
   spark_stage_max_tasks.q,\
   spark_task_failure.q,\
   spark_submit_negative_executor_cores.q,\
   spark_submit_negative_executor_memory.q
 
-tez.perf.disabled.query.files=mv_query44.q,\
+tez.perf.disabled.query.files=\
+  mv_query44.q,\
   mv_query67.q
 
-spark.perf.disabled.query.files=query1b.q,\
+spark.perf.disabled.query.files=\
+  query1b.q,\
   query14.q,\
   query64.q,\
   cbo_query1.q,\
@@ -3922,7 +1201,8 @@ spark.perf.disabled.query.files=query1b.q,\
   mv_query44.q,\
   mv_query67.q
 
-druid.query.files=druidmini_test1.q,\
+druid.query.files=\
+  druidmini_test1.q,\
   druidmini_test_ts.q,\
   druidmini_joins.q,\
   druidmini_test_insert.q,\
@@ -3936,22 +1216,24 @@ druid.query.files=druidmini_test1.q,\
   druidmini_expressions.q,\
   druidmini_extractTime.q,\
   druidmini_test_alter.q,\
-  druidmini_floorTime.q, \
-  druidmini_masking.q, \
+  druidmini_floorTime.q,\
+  druidmini_masking.q,\
   druidmini_semijoin_reduction_all_types.q
 
-druid.kafka.query.files=druidkafkamini_basic.q, \
-  druidkafkamini_avro.q, \
-  druidkafkamini_csv.q, \
+druid.kafka.query.files=\
+  druidkafkamini_basic.q,\
+  druidkafkamini_avro.q,\
+  druidkafkamini_csv.q,\
   druidkafkamini_delimited.q
 
-hive.kafka.query.files=kafka_storage_handler.q
-
-druid.llap.local.query.files=druidmini_noop.q
+hive.kafka.query.files=\
+  kafka_storage_handler.q
 
-# tests to be run by TestErasureCodingHDFSCliDriver and TestCliDriver
-erasurecoding.shared.query.files=erasure_commands.q
+druid.llap.local.query.files=\
+  druidmini_noop.q
 
 # tests to be run only by TestErasureCodingHDFSCliDriver
-erasurecoding.only.query.files=erasure_simple.q,\
+erasurecoding.only.query.files=\
+  erasure_commands.q,\
+  erasure_simple.q,\
   erasure_explain.q
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index d7f519f..a0cc398 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -46,23 +46,7 @@ public class CliConfigs {
       try {
         setQueryDir("ql/src/test/queries/clientpositive");
 
-        excludesFrom(testConfigProps, "minillap.query.files");
-        excludesFrom(testConfigProps, "minillap.shared.query.files");
-        excludesFrom(testConfigProps, "minillaplocal.query.files");
-        excludesFrom(testConfigProps, "minillaplocal.shared.query.files");
-        excludesFrom(testConfigProps, "minimr.query.files");
-        excludesFrom(testConfigProps, "minitez.query.files");
-        excludesFrom(testConfigProps, "minitez.query.files.shared");
-        excludesFrom(testConfigProps, "encrypted.query.files");
-        excludesFrom(testConfigProps, "spark.only.query.files");
-        excludesFrom(testConfigProps, "miniSparkOnYarn.only.query.files");
-        excludesFrom(testConfigProps, "localSpark.only.query.files");
-        excludesFrom(testConfigProps, "druid.query.files");
-        excludesFrom(testConfigProps, "druid.kafka.query.files");
-        excludesFrom(testConfigProps, "hive.kafka.query.files");
-        excludesFrom(testConfigProps, "erasurecoding.only.query.files");
-        excludesFrom(testConfigProps, "erasurecoding.shared.query.files");
-        excludesFrom(testConfigProps, "beeline.positive.include");
+        includesFrom(testConfigProps, "mr.query.files");
 
         setResultsDir("ql/src/test/results/clientpositive");
         setLogDir("itests/qtest/target/qfile-results/clientpositive");
@@ -128,8 +112,6 @@ public class CliConfigs {
 
         includesFrom(testConfigProps, "minitez.query.files");
         includesFrom(testConfigProps, "minitez.query.files.shared");
-        excludesFrom(testConfigProps, "minillap.query.files");
-        excludesFrom(testConfigProps, "minillap.shared.query.files");
 
         setResultsDir("ql/src/test/results/clientpositive/tez");
         setLogDir("itests/qtest/target/qfile-results/clientpositive");
@@ -152,7 +134,6 @@ public class CliConfigs {
         setQueryDir("ql/src/test/queries/clientpositive");
 
         includesFrom(testConfigProps, "minillap.query.files");
-        includesFrom(testConfigProps, "minillap.shared.query.files");
 
         setResultsDir("ql/src/test/results/clientpositive/llap");
         setLogDir("itests/qtest/target/qfile-results/clientpositive");
@@ -231,8 +212,19 @@ public class CliConfigs {
       try {
         setQueryDir("ql/src/test/queries/clientpositive");
 
-        includesFrom(testConfigProps, "minillaplocal.query.files");
-        includesFrom(testConfigProps, "minillaplocal.shared.query.files");
+        excludesFrom(testConfigProps, "mr.query.files");
+        excludesFrom(testConfigProps, "minimr.query.files");
+        excludesFrom(testConfigProps, "minillap.query.files");
+        excludesFrom(testConfigProps, "minitez.query.files");
+        excludesFrom(testConfigProps, "encrypted.query.files");
+        excludesFrom(testConfigProps, "druid.query.files");
+        excludesFrom(testConfigProps, "druid.kafka.query.files");
+        excludesFrom(testConfigProps, "hive.kafka.query.files");
+        excludesFrom(testConfigProps, "erasurecoding.only.query.files");
+        excludesFrom(testConfigProps, "beeline.positive.include");
+        excludesFrom(testConfigProps, "spark.only.query.files");
+        excludesFrom(testConfigProps, "localSpark.only.query.files");
+        excludesFrom(testConfigProps, "miniSparkOnYarn.only.query.files");
 
         setResultsDir("ql/src/test/results/clientpositive/llap");
         setLogDir("itests/qtest/target/qfile-results/clientpositive");
@@ -506,6 +498,7 @@ public class CliConfigs {
         setQueryDir("ql/src/test/queries/clientpositive");
 
         includesFrom(testConfigProps, "beeline.positive.include");
+        includesFrom(testConfigProps, "beeline.query.files.shared");
 
         setResultsDir("ql/src/test/results/clientpositive/beeline");
         setLogDir("itests/qtest/target/qfile-results/beelinepositive");
@@ -681,7 +674,6 @@ public class CliConfigs {
       try {
         setQueryDir("ql/src/test/queries/clientpositive");
 
-        includesFrom(testConfigProps, "erasurecoding.shared.query.files");
         includesFrom(testConfigProps, "erasurecoding.only.query.files");
 
         setResultsDir("ql/src/test/results/clientpositive/erasurecoding");
diff --git a/ql/src/test/results/clientpositive/llap/quotedid_basic_standard.q.out b/ql/src/test/results/clientpositive/llap/quotedid_basic_standard.q.out
new file mode 100644
index 0000000..8c381d7
--- /dev/null
+++ b/ql/src/test/results/clientpositive/llap/quotedid_basic_standard.q.out
@@ -0,0 +1,557 @@
+PREHOOK: query: select 3 as "a", 10 as "~!@#$%^&*()_q<>"
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+POSTHOOK: query: select 3 as "a", 10 as "~!@#$%^&*()_q<>"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+#### A masked pattern was here ####
+3	10
+PREHOOK: query: create table t1("x+1" string, "y&y" string, "~!@#$%^&*()_q<>" string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
+POSTHOOK: query: create table t1("x+1" string, "y&y" string, "~!@#$%^&*()_q<>" string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@t1
+PREHOOK: query: describe t1
+PREHOOK: type: DESCTABLE
+PREHOOK: Input: default@t1
+POSTHOOK: query: describe t1
+POSTHOOK: type: DESCTABLE
+POSTHOOK: Input: default@t1
+x+1                 	string              	                    
+y&y                 	string              	                    
+~!@#$%^&*()_q<>     	string              	                    
+PREHOOK: query: select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+PREHOOK: query: select "x+1", `y&y`, `~!@#$%^&*()_q<>` from t1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: select "x+1", `y&y`, `~!@#$%^&*()_q<>` from t1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        TableScan
+          alias: t1
+          Select Operator
+            expressions: x+1 (type: string), y&y (type: string), ~!@#$%^&*()_q<> (type: string)
+            outputColumnNames: _col0, _col1, _col2
+            ListSink
+
+PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        TableScan
+          alias: t1
+          filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
+          Filter Operator
+            predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
+            Select Operator
+              expressions: x+1 (type: string), y&y (type: string), '1' (type: string)
+              outputColumnNames: _col0, _col1, _col2
+              ListSink
+
+PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: t1
+                  filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
+                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: x+1 (type: string), y&y (type: string)
+                      outputColumnNames: x+1, y&y
+                      Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                      Group By Operator
+                        keys: x+1 (type: string), y&y (type: string)
+                        minReductionHashAggr: 0.99
+                        mode: hash
+                        outputColumnNames: _col0, _col1
+                        Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          key expressions: _col0 (type: string), _col1 (type: string)
+                          null sort order: zz
+                          sort order: ++
+                          Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
+                          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+            Execution mode: vectorized, llap
+            LLAP IO: no inputs
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Group By Operator
+                keys: KEY._col0 (type: string), KEY._col1 (type: string)
+                mode: mergepartial
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                Select Operator
+                  expressions: _col0 (type: string), _col1 (type: string), '1' (type: string)
+                  outputColumnNames: _col0, _col1, _col2
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                    table:
+                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
+from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
+from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: t1
+                  filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
+                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: x+1 (type: string), y&y (type: string)
+                      outputColumnNames: x+1, y&y
+                      Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                      Group By Operator
+                        keys: x+1 (type: string), y&y (type: string)
+                        minReductionHashAggr: 0.99
+                        mode: hash
+                        outputColumnNames: _col0, _col1
+                        Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          key expressions: _col0 (type: string), _col1 (type: string)
+                          null sort order: zz
+                          sort order: ++
+                          Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
+                          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+            Execution mode: vectorized, llap
+            LLAP IO: no inputs
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Group By Operator
+                keys: KEY._col0 (type: string), KEY._col1 (type: string)
+                mode: mergepartial
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                Reduce Output Operator
+                  key expressions: '1' (type: string), _col1 (type: string)
+                  null sort order: az
+                  sort order: ++
+                  Map-reduce partition columns: '1' (type: string)
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  value expressions: _col0 (type: string)
+        Reducer 3 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: string), KEY.reducesinkkey1 (type: string)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                PTF Operator
+                  Function definitions:
+                      Input definition
+                        input alias: ptf_0
+                        output shape: _col0: string, _col1: string
+                        type: WINDOWING
+                      Windowing table definition
+                        input alias: ptf_1
+                        name: windowingtablefunction
+                        order by: _col1 ASC NULLS LAST
+                        partition by: '1'
+                        raw input shape:
+                        window functions:
+                            window function definition
+                              alias: rank_window_0
+                              arguments: _col1
+                              name: rank
+                              window function: GenericUDAFRankEvaluator
+                              window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
+                              isPivotResult: true
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: _col0 (type: string), _col1 (type: string), '1' (type: string), rank_window_0 (type: int)
+                    outputColumnNames: _col0, _col1, _col2, _col3
+                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                    File Output Operator
+                      compressed: false
+                      Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                      table:
+                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: explain select "X+1", "Y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
+from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&Y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t1
+#### A masked pattern was here ####
+POSTHOOK: query: explain select "X+1", "Y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
+from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&Y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t1
+#### A masked pattern was here ####
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Reducer 2 <- Map 1 (SIMPLE_EDGE)
+        Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: t1
+                  filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
+                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                    Select Operator
+                      expressions: x+1 (type: string), y&y (type: string)
+                      outputColumnNames: x+1, y&y
+                      Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                      Group By Operator
+                        keys: x+1 (type: string), y&y (type: string)
+                        minReductionHashAggr: 0.99
+                        mode: hash
+                        outputColumnNames: _col0, _col1
+                        Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                        Reduce Output Operator
+                          key expressions: _col0 (type: string), _col1 (type: string)
+                          null sort order: zz
+                          sort order: ++
+                          Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
+                          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+            Execution mode: vectorized, llap
+            LLAP IO: no inputs
+        Reducer 2 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Group By Operator
+                keys: KEY._col0 (type: string), KEY._col1 (type: string)
+                mode: mergepartial
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                Reduce Output Operator
+                  key expressions: '1' (type: string), _col1 (type: string)
+                  null sort order: az
+                  sort order: ++
+                  Map-reduce partition columns: '1' (type: string)
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  value expressions: _col0 (type: string)
+        Reducer 3 
+            Execution mode: vectorized, llap
+            Reduce Operator Tree:
+              Select Operator
+                expressions: VALUE._col0 (type: string), KEY.reducesinkkey1 (type: string)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                PTF Operator
+                  Function definitions:
+                      Input definition
+                        input alias: ptf_0
+                        output shape: _col0: string, _col1: string
+                        type: WINDOWING
+                      Windowing table definition
+                        input alias: ptf_1
+                        name: windowingtablefunction
+                        order by: _col1 ASC NULLS LAST
+                        partition by: '1'
+                        raw input shape:
+                        window functions:
+                            window function definition
+                              alias: rank_window_0
+                              arguments: _col1
+                              name: rank
+                              window function: GenericUDAFRankEvaluator
+                              window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
+                              isPivotResult: true
+                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: _col0 (type: string), _col1 (type: string), '1' (type: string), rank_window_0 (type: int)
+                    outputColumnNames: _col0, _col1, _col2, _col3
+                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                    File Output Operator
+                      compressed: false
+                      Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
+                      table:
+                          input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                          output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                          serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: create table `t4```("x+1""" string, "y&y" string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@t4`
+POSTHOOK: query: create table `t4```("x+1""" string, "y&y" string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@t4`
+PREHOOK: query: describe `t4```
+PREHOOK: type: DESCTABLE
+PREHOOK: Input: default@t4`
+POSTHOOK: query: describe `t4```
+POSTHOOK: type: DESCTABLE
+POSTHOOK: Input: default@t4`
+x+1"                	string              	                    
+y&y                 	string              	                    
+PREHOOK: query: insert into table `t4``` select * from src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@t4`
+POSTHOOK: query: insert into table `t4``` select * from src
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@t4`
+POSTHOOK: Lineage: t4`.x+1" SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: t4`.y&y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
+from `t4``` where "x+1""" = '10' group by "x+1""", "y&y" having "x+1""" = '10'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t4`
+#### A masked pattern was here ####
+POSTHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
+from `t4``` where "x+1""" = '10' group by "x+1""", "y&y" having "x+1""" = '10'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t4`
+#### A masked pattern was here ####
+10	val_10	1
+PREHOOK: query: create view v1 as
+select "x+1""", "y&y"
+from `t4``` where "x+1""" < '200'
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@t4`
+PREHOOK: Output: database:default
+PREHOOK: Output: default@v1
+POSTHOOK: query: create view v1 as
+select "x+1""", "y&y"
+from `t4``` where "x+1""" < '200'
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@t4`
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@v1
+POSTHOOK: Lineage: v1.x+1" SIMPLE [(t4`)t4`.FieldSchema(name:x+1", type:string, comment:null), ]
+POSTHOOK: Lineage: v1.y&y SIMPLE [(t4`)t4`.FieldSchema(name:y&y, type:string, comment:null), ]
+PREHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
+from v1
+group by "x+1""", "y&y"
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t4`
+PREHOOK: Input: default@v1
+#### A masked pattern was here ####
+POSTHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
+from v1
+group by "x+1""", "y&y"
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t4`
+POSTHOOK: Input: default@v1
+#### A masked pattern was here ####
+0	val_0	1
+10	val_10	1
+100	val_100	1
+103	val_103	1
+104	val_104	1
+105	val_105	1
+11	val_11	1
+111	val_111	1
+113	val_113	1
+114	val_114	1
+116	val_116	1
+118	val_118	1
+119	val_119	1
+12	val_12	1
+120	val_120	1
+125	val_125	1
+126	val_126	1
+128	val_128	1
+129	val_129	1
+131	val_131	1
+133	val_133	1
+134	val_134	1
+136	val_136	1
+137	val_137	1
+138	val_138	1
+143	val_143	1
+145	val_145	1
+146	val_146	1
+149	val_149	1
+15	val_15	1
+150	val_150	1
+152	val_152	1
+153	val_153	1
+155	val_155	1
+156	val_156	1
+157	val_157	1
+158	val_158	1
+160	val_160	1
+162	val_162	1
+163	val_163	1
+164	val_164	1
+165	val_165	1
+166	val_166	1
+167	val_167	1
+168	val_168	1
+169	val_169	1
+17	val_17	1
+170	val_170	1
+172	val_172	1
+174	val_174	1
+175	val_175	1
+176	val_176	1
+177	val_177	1
+178	val_178	1
+179	val_179	1
+18	val_18	1
+180	val_180	1
+181	val_181	1
+183	val_183	1
+186	val_186	1
+187	val_187	1
+189	val_189	1
+19	val_19	1
+190	val_190	1
+191	val_191	1
+192	val_192	1
+193	val_193	1
+194	val_194	1
+195	val_195	1
+196	val_196	1
+197	val_197	1
+199	val_199	1
+2	val_2	1
+20	val_20	1
+PREHOOK: query: create table lv_table(c1 string) partitioned by(c2 string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@lv_table
+POSTHOOK: query: create table lv_table(c1 string) partitioned by(c2 string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@lv_table
+PREHOOK: query: create view "lv~!@#$%^&*()_q<>" partitioned on (c2) as select c1, c2 from lv_table
+PREHOOK: type: CREATEVIEW
+PREHOOK: Input: default@lv_table
+PREHOOK: Output: database:default
+PREHOOK: Output: default@lv~!@#$%^&*()_q<>
+POSTHOOK: query: create view "lv~!@#$%^&*()_q<>" partitioned on (c2) as select c1, c2 from lv_table
+POSTHOOK: type: CREATEVIEW
+POSTHOOK: Input: default@lv_table
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@lv~!@#$%^&*()_q<>
+POSTHOOK: Lineage: lv~!@#$%^&*()_q<>.c1 SIMPLE [(lv_table)lv_table.FieldSchema(name:c1, type:string, comment:null), ]
+PREHOOK: query: alter view "lv~!@#$%^&*()_q<>" add partition (c2='a')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Input: default@lv_table
+PREHOOK: Input: default@lv~!@#$%^&*()_q<>
+PREHOOK: Output: default@lv~!@#$%^&*()_q<>
+POSTHOOK: query: alter view "lv~!@#$%^&*()_q<>" add partition (c2='a')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Input: default@lv_table
+POSTHOOK: Input: default@lv~!@#$%^&*()_q<>
+POSTHOOK: Output: default@lv~!@#$%^&*()_q<>
+POSTHOOK: Output: default@lv~!@#$%^&*()_q<>@c2=a
diff --git a/ql/src/test/results/clientpositive/quotedid_basic_standard.q.out b/ql/src/test/results/clientpositive/quotedid_basic_standard.q.out
deleted file mode 100644
index 2374dc8..0000000
--- a/ql/src/test/results/clientpositive/quotedid_basic_standard.q.out
+++ /dev/null
@@ -1,568 +0,0 @@
-PREHOOK: query: select 3 as "a", 10 as "~!@#$%^&*()_q<>"
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
-POSTHOOK: query: select 3 as "a", 10 as "~!@#$%^&*()_q<>"
-POSTHOOK: type: QUERY
-POSTHOOK: Input: _dummy_database@_dummy_table
-#### A masked pattern was here ####
-3	10
-PREHOOK: query: create table t1("x+1" string, "y&y" string, "~!@#$%^&*()_q<>" string)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@t1
-POSTHOOK: query: create table t1("x+1" string, "y&y" string, "~!@#$%^&*()_q<>" string)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@t1
-PREHOOK: query: describe t1
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@t1
-POSTHOOK: query: describe t1
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@t1
-x+1                 	string              	                    
-y&y                 	string              	                    
-~!@#$%^&*()_q<>     	string              	                    
-PREHOOK: query: select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-PREHOOK: query: select "x+1", `y&y`, `~!@#$%^&*()_q<>` from t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: select "x+1", `y&y`, `~!@#$%^&*()_q<>` from t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-STAGE DEPENDENCIES:
-  Stage-0 is a root stage
-
-STAGE PLANS:
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        TableScan
-          alias: t1
-          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-          Select Operator
-            expressions: x+1 (type: string), y&y (type: string), ~!@#$%^&*()_q<> (type: string)
-            outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            ListSink
-
-PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: t1
-            filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: x+1 (type: string), y&y (type: string), '1' (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                  table:
-                      input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-      Execution mode: vectorized
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>" from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: t1
-            filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: x+1 (type: string), y&y (type: string)
-                outputColumnNames: x+1, y&y
-                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                Group By Operator
-                  keys: x+1 (type: string), y&y (type: string)
-                  minReductionHashAggr: 0.99
-                  mode: hash
-                  outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string), _col1 (type: string)
-                    null sort order: zz
-                    sort order: ++
-                    Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
-                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-      Execution mode: vectorized
-      Reduce Operator Tree:
-        Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: string)
-          mode: mergepartial
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-          Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), '1' (type: string)
-            outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            File Output Operator
-              compressed: false
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
-from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: explain select "x+1", "y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
-from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: t1
-            filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: x+1 (type: string), y&y (type: string)
-                outputColumnNames: x+1, y&y
-                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                Group By Operator
-                  keys: x+1 (type: string), y&y (type: string)
-                  minReductionHashAggr: 0.99
-                  mode: hash
-                  outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string), _col1 (type: string)
-                    null sort order: zz
-                    sort order: ++
-                    Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
-                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-      Execution mode: vectorized
-      Reduce Operator Tree:
-        Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: string)
-          mode: mergepartial
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
-  Stage: Stage-2
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: '1' (type: string), _col1 (type: string)
-              null sort order: az
-              sort order: ++
-              Map-reduce partition columns: '1' (type: string)
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string)
-      Execution mode: vectorized
-      Reduce Operator Tree:
-        Select Operator
-          expressions: VALUE._col0 (type: string), KEY.reducesinkkey1 (type: string)
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-          PTF Operator
-            Function definitions:
-                Input definition
-                  input alias: ptf_0
-                  output shape: _col0: string, _col1: string
-                  type: WINDOWING
-                Windowing table definition
-                  input alias: ptf_1
-                  name: windowingtablefunction
-                  order by: _col1 ASC NULLS LAST
-                  partition by: '1'
-                  raw input shape:
-                  window functions:
-                      window function definition
-                        alias: rank_window_0
-                        arguments: _col1
-                        name: rank
-                        window function: GenericUDAFRankEvaluator
-                        window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
-                        isPivotResult: true
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            Select Operator
-              expressions: _col0 (type: string), _col1 (type: string), '1' (type: string), rank_window_0 (type: int)
-              outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator
-                compressed: false
-                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: explain select "X+1", "Y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
-from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&Y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t1
-#### A masked pattern was here ####
-POSTHOOK: query: explain select "X+1", "Y&y", "~!@#$%^&*()_q<>", rank() over(partition by "~!@#$%^&*()_q<>" order by  "y&y")
-from t1 where "~!@#$%^&*()_q<>" = '1' group by "x+1", "y&Y", "~!@#$%^&*()_q<>" having "~!@#$%^&*()_q<>" = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t1
-#### A masked pattern was here ####
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: t1
-            filterExpr: (~!@#$%^&*()_q<> = '1') (type: boolean)
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: (~!@#$%^&*()_q<> = '1') (type: boolean)
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              Select Operator
-                expressions: x+1 (type: string), y&y (type: string)
-                outputColumnNames: x+1, y&y
-                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                Group By Operator
-                  keys: x+1 (type: string), y&y (type: string)
-                  minReductionHashAggr: 0.99
-                  mode: hash
-                  outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                  Reduce Output Operator
-                    key expressions: _col0 (type: string), _col1 (type: string)
-                    null sort order: zz
-                    sort order: ++
-                    Map-reduce partition columns: _col0 (type: string), _col1 (type: string)
-                    Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-      Execution mode: vectorized
-      Reduce Operator Tree:
-        Group By Operator
-          keys: KEY._col0 (type: string), KEY._col1 (type: string)
-          mode: mergepartial
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
-  Stage: Stage-2
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            Reduce Output Operator
-              key expressions: '1' (type: string), _col1 (type: string)
-              null sort order: az
-              sort order: ++
-              Map-reduce partition columns: '1' (type: string)
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              value expressions: _col0 (type: string)
-      Execution mode: vectorized
-      Reduce Operator Tree:
-        Select Operator
-          expressions: VALUE._col0 (type: string), KEY.reducesinkkey1 (type: string)
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-          PTF Operator
-            Function definitions:
-                Input definition
-                  input alias: ptf_0
-                  output shape: _col0: string, _col1: string
-                  type: WINDOWING
-                Windowing table definition
-                  input alias: ptf_1
-                  name: windowingtablefunction
-                  order by: _col1 ASC NULLS LAST
-                  partition by: '1'
-                  raw input shape:
-                  window functions:
-                      window function definition
-                        alias: rank_window_0
-                        arguments: _col1
-                        name: rank
-                        window function: GenericUDAFRankEvaluator
-                        window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
-                        isPivotResult: true
-            Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-            Select Operator
-              expressions: _col0 (type: string), _col1 (type: string), '1' (type: string), rank_window_0 (type: int)
-              outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-              File Output Operator
-                compressed: false
-                Statistics: Num rows: 1 Data size: 552 Basic stats: COMPLETE Column stats: NONE
-                table:
-                    input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                    output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: create table `t4```("x+1""" string, "y&y" string)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@t4`
-POSTHOOK: query: create table `t4```("x+1""" string, "y&y" string)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@t4`
-PREHOOK: query: describe `t4```
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@t4`
-POSTHOOK: query: describe `t4```
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@t4`
-x+1"                	string              	                    
-y&y                 	string              	                    
-PREHOOK: query: insert into table `t4``` select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@t4`
-POSTHOOK: query: insert into table `t4``` select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@t4`
-POSTHOOK: Lineage: t4`.x+1" SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: t4`.y&y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
-from `t4``` where "x+1""" = '10' group by "x+1""", "y&y" having "x+1""" = '10'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t4`
-#### A masked pattern was here ####
-POSTHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
-from `t4``` where "x+1""" = '10' group by "x+1""", "y&y" having "x+1""" = '10'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t4`
-#### A masked pattern was here ####
-10	val_10	1
-PREHOOK: query: create view v1 as
-select "x+1""", "y&y"
-from `t4``` where "x+1""" < '200'
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@t4`
-PREHOOK: Output: database:default
-PREHOOK: Output: default@v1
-POSTHOOK: query: create view v1 as
-select "x+1""", "y&y"
-from `t4``` where "x+1""" < '200'
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@t4`
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@v1
-POSTHOOK: Lineage: v1.x+1" SIMPLE [(t4`)t4`.FieldSchema(name:x+1", type:string, comment:null), ]
-POSTHOOK: Lineage: v1.y&y SIMPLE [(t4`)t4`.FieldSchema(name:y&y, type:string, comment:null), ]
-PREHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
-from v1
-group by "x+1""", "y&y"
-PREHOOK: type: QUERY
-PREHOOK: Input: default@t4`
-PREHOOK: Input: default@v1
-#### A masked pattern was here ####
-POSTHOOK: query: select "x+1""", "y&y", rank() over(partition by "x+1""" order by  "y&y")
-from v1
-group by "x+1""", "y&y"
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@t4`
-POSTHOOK: Input: default@v1
-#### A masked pattern was here ####
-0	val_0	1
-10	val_10	1
-100	val_100	1
-103	val_103	1
-104	val_104	1
-105	val_105	1
-11	val_11	1
-111	val_111	1
-113	val_113	1
-114	val_114	1
-116	val_116	1
-118	val_118	1
-119	val_119	1
-12	val_12	1
-120	val_120	1
-125	val_125	1
-126	val_126	1
-128	val_128	1
-129	val_129	1
-131	val_131	1
-133	val_133	1
-134	val_134	1
-136	val_136	1
-137	val_137	1
-138	val_138	1
-143	val_143	1
-145	val_145	1
-146	val_146	1
-149	val_149	1
-15	val_15	1
-150	val_150	1
-152	val_152	1
-153	val_153	1
-155	val_155	1
-156	val_156	1
-157	val_157	1
-158	val_158	1
-160	val_160	1
-162	val_162	1
-163	val_163	1
-164	val_164	1
-165	val_165	1
-166	val_166	1
-167	val_167	1
-168	val_168	1
-169	val_169	1
-17	val_17	1
-170	val_170	1
-172	val_172	1
-174	val_174	1
-175	val_175	1
-176	val_176	1
-177	val_177	1
-178	val_178	1
-179	val_179	1
-18	val_18	1
-180	val_180	1
-181	val_181	1
-183	val_183	1
-186	val_186	1
-187	val_187	1
-189	val_189	1
-19	val_19	1
-190	val_190	1
-191	val_191	1
-192	val_192	1
-193	val_193	1
-194	val_194	1
-195	val_195	1
-196	val_196	1
-197	val_197	1
-199	val_199	1
-2	val_2	1
-20	val_20	1
-PREHOOK: query: create table lv_table(c1 string) partitioned by(c2 string)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@lv_table
-POSTHOOK: query: create table lv_table(c1 string) partitioned by(c2 string)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@lv_table
-PREHOOK: query: create view "lv~!@#$%^&*()_q<>" partitioned on (c2) as select c1, c2 from lv_table
-PREHOOK: type: CREATEVIEW
-PREHOOK: Input: default@lv_table
-PREHOOK: Output: database:default
-PREHOOK: Output: default@lv~!@#$%^&*()_q<>
-POSTHOOK: query: create view "lv~!@#$%^&*()_q<>" partitioned on (c2) as select c1, c2 from lv_table
-POSTHOOK: type: CREATEVIEW
-POSTHOOK: Input: default@lv_table
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@lv~!@#$%^&*()_q<>
-POSTHOOK: Lineage: lv~!@#$%^&*()_q<>.c1 SIMPLE [(lv_table)lv_table.FieldSchema(name:c1, type:string, comment:null), ]
-PREHOOK: query: alter view "lv~!@#$%^&*()_q<>" add partition (c2='a')
-PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Input: default@lv_table
-PREHOOK: Input: default@lv~!@#$%^&*()_q<>
-PREHOOK: Output: default@lv~!@#$%^&*()_q<>
-POSTHOOK: query: alter view "lv~!@#$%^&*()_q<>" add partition (c2='a')
-POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Input: default@lv_table
-POSTHOOK: Input: default@lv~!@#$%^&*()_q<>
-POSTHOOK: Output: default@lv~!@#$%^&*()_q<>
-POSTHOOK: Output: default@lv~!@#$%^&*()_q<>@c2=a