You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/05/21 20:25:28 UTC

[51/51] [abbrv] [partial] hive git commit: HIVE-19617: Rename test tables to avoid collisions during execution in batches (Jesus Camacho Rodriguez, reviewed by Gunther Hagleitner)

HIVE-19617: Rename test tables to avoid collisions during execution in batches (Jesus Camacho Rodriguez, reviewed by Gunther Hagleitner)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/38d3b8e1
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/38d3b8e1
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/38d3b8e1

Branch: refs/heads/master
Commit: 38d3b8e199ce32eed13aa245417dc4ac6ae0d7f5
Parents: c6a5d6f
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Mon May 21 13:17:23 2018 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Mon May 21 13:23:58 2018 -0700

----------------------------------------------------------------------
 .../test/queries/clientpositive/acid_nullscan.q |   10 +-
 .../acid_vectorization_original.q               |   12 +-
 .../acid_vectorization_original_tez.q           |   52 +-
 .../clientpositive/acid_vectorization_project.q |   10 +-
 .../queries/clientpositive/add_part_multiple.q  |   16 +-
 .../clientpositive/allow_change_col_type_par.q  |    4 +-
 ql/src/test/queries/clientpositive/alter5.q     |   26 +-
 .../queries/clientpositive/alterColumnStats.q   |   18 +-
 .../clientpositive/alter_change_db_location.q   |    4 +-
 .../queries/clientpositive/alter_file_format.q  |   30 +-
 .../test/queries/clientpositive/alter_merge.q   |   50 +-
 .../test/queries/clientpositive/alter_merge_2.q |   24 +-
 .../queries/clientpositive/alter_merge_orc.q    |   26 +-
 .../alter_numbuckets_partitioned_table2_h23.q   |   72 +-
 .../alter_numbuckets_partitioned_table_h23.q    |   46 +-
 .../alter_partition_with_whitelist.q            |    8 +-
 .../alter_rename_partition_authorization.q      |   28 +-
 .../queries/clientpositive/alter_table_serde.q  |   38 +-
 .../queries/clientpositive/alter_table_serde2.q |   16 +-
 .../clientpositive/alter_table_stats_status.q   |   32 +-
 .../clientpositive/alter_table_update_status.q  |  150 +-
 .../queries/clientpositive/alter_view_rename.q  |    6 +-
 .../analyze_table_null_partition.q              |   22 +-
 .../queries/clientpositive/analyze_tbl_date.q   |   12 +-
 .../queries/clientpositive/analyze_tbl_part.q   |   16 +-
 .../annotate_stats_deep_filters.q               |   14 +-
 .../clientpositive/annotate_stats_groupby.q     |   60 +-
 .../clientpositive/annotate_stats_join.q        |   52 +-
 .../clientpositive/annotate_stats_join_pkfk.q   |   46 +-
 .../clientpositive/annotate_stats_limit.q       |   20 +-
 .../clientpositive/annotate_stats_part.q        |   52 +-
 .../clientpositive/annotate_stats_table.q       |    4 +-
 .../clientpositive/annotate_stats_union.q       |   40 +-
 .../clientpositive/archive_excludeHadoop20.q    |   44 +-
 .../clientpositive/array_size_estimation.q      |   12 +-
 .../queries/clientpositive/authorization_1.q    |   80 +-
 .../queries/clientpositive/authorization_3.q    |   24 +-
 .../queries/clientpositive/authorization_4.q    |   10 +-
 .../queries/clientpositive/authorization_6.q    |   60 +-
 .../queries/clientpositive/authorization_9.q    |   20 +-
 .../authorization_admin_almighty1.q             |   10 +-
 .../authorization_cli_createtab_noauthzapi.q    |    4 +-
 .../clientpositive/authorization_cli_nonsql.q   |    4 +-
 .../authorization_cli_stdconfigauth.q           |    4 +-
 .../authorization_grant_option_role.q           |   10 +-
 .../clientpositive/authorization_non_id.q       |   10 +-
 .../authorization_owner_actions.q               |   14 +-
 .../clientpositive/authorization_parts.q        |   10 +-
 .../clientpositive/authorization_show_grant.q   |   24 +-
 .../clientpositive/authorization_update.q       |    4 +-
 .../authorization_update_own_table.q            |    4 +-
 .../clientpositive/authorization_view_1.q       |   56 +-
 .../clientpositive/authorization_view_2.q       |   10 +-
 .../clientpositive/authorization_view_3.q       |   12 +-
 .../clientpositive/authorization_view_4.q       |   12 +-
 .../authorization_view_disable_cbo_1.q          |   60 +-
 .../authorization_view_disable_cbo_2.q          |   10 +-
 .../authorization_view_disable_cbo_3.q          |   10 +-
 .../authorization_view_disable_cbo_4.q          |   12 +-
 .../queries/clientpositive/autoColumnStats_1.q  |  198 +-
 .../queries/clientpositive/autoColumnStats_10.q |   52 +-
 .../queries/clientpositive/autoColumnStats_2.q  |  120 +-
 .../queries/clientpositive/autoColumnStats_3.q  |   34 +-
 .../queries/clientpositive/autoColumnStats_5.q  |   32 +-
 .../queries/clientpositive/autoColumnStats_7.q  |   10 +-
 .../queries/clientpositive/autoColumnStats_9.q  |   12 +-
 ql/src/test/queries/clientpositive/auto_join1.q |    8 +-
 .../test/queries/clientpositive/auto_join14.q   |    8 +-
 .../clientpositive/auto_join14_hadoop20.q       |    8 +-
 .../test/queries/clientpositive/auto_join17.q   |    8 +-
 .../test/queries/clientpositive/auto_join19.q   |    8 +-
 .../clientpositive/auto_join19_inclause.q       |    8 +-
 .../test/queries/clientpositive/auto_join24.q   |    8 +-
 .../test/queries/clientpositive/auto_join25.q   |   18 +-
 ql/src/test/queries/clientpositive/auto_join3.q |    8 +-
 ql/src/test/queries/clientpositive/auto_join4.q |    8 +-
 ql/src/test/queries/clientpositive/auto_join5.q |    8 +-
 ql/src/test/queries/clientpositive/auto_join6.q |    8 +-
 ql/src/test/queries/clientpositive/auto_join7.q |    8 +-
 ql/src/test/queries/clientpositive/auto_join8.q |    8 +-
 ql/src/test/queries/clientpositive/auto_join9.q |    8 +-
 .../queries/clientpositive/auto_join_filters.q  |  146 +-
 .../queries/clientpositive/auto_join_nulls.q    |   48 +-
 .../queries/clientpositive/auto_join_stats.q    |   22 +-
 .../clientpositive/auto_smb_mapjoin_14.q        |   32 +-
 .../clientpositive/auto_sortmerge_join_1.q      |   36 +-
 .../clientpositive/auto_sortmerge_join_10.q     |   28 +-
 .../clientpositive/auto_sortmerge_join_11.q     |   40 +-
 .../clientpositive/auto_sortmerge_join_12.q     |   28 +-
 .../clientpositive/auto_sortmerge_join_13.q     |   60 +-
 .../clientpositive/auto_sortmerge_join_14.q     |   22 +-
 .../clientpositive/auto_sortmerge_join_15.q     |   12 +-
 .../clientpositive/auto_sortmerge_join_16.q     |   62 +-
 .../clientpositive/auto_sortmerge_join_2.q      |   28 +-
 .../clientpositive/auto_sortmerge_join_3.q      |   32 +-
 .../clientpositive/auto_sortmerge_join_4.q      |   36 +-
 .../clientpositive/auto_sortmerge_join_5.q      |   28 +-
 .../clientpositive/auto_sortmerge_join_6.q      |   52 +-
 .../clientpositive/auto_sortmerge_join_7.q      |   40 +-
 .../clientpositive/auto_sortmerge_join_8.q      |   40 +-
 .../clientpositive/auto_sortmerge_join_9.q      |  192 +-
 .../queries/clientpositive/avro_add_column.q    |   12 +-
 .../queries/clientpositive/avro_add_column3.q   |   14 +-
 .../avro_alter_table_update_columns.q           |   44 +-
 .../clientpositive/avro_compression_enabled.q   |    4 +-
 .../avro_compression_enabled_native.q           |    4 +-
 .../test/queries/clientpositive/avro_decimal.q  |   36 +-
 ql/src/test/queries/clientpositive/avro_joins.q |   16 +-
 .../queries/clientpositive/avro_joins_native.q  |    8 +-
 .../test/queries/clientpositive/avro_native.q   |    8 +-
 .../queries/clientpositive/avro_partitioned.q   |   30 +-
 .../queries/clientpositive/avro_sanity_test.q   |   10 +-
 .../avro_schema_evolution_native.q              |   38 +-
 .../avro_tableproperty_optimize.q               |   16 +-
 .../queries/clientpositive/avrocountemptytbl.q  |   14 +-
 .../test/queries/clientpositive/avrotblsjoin.q  |    8 +-
 ql/src/test/queries/clientpositive/ba_table1.q  |   12 +-
 ql/src/test/queries/clientpositive/ba_table2.q  |   14 +-
 ql/src/test/queries/clientpositive/ba_table3.q  |   10 +-
 .../test/queries/clientpositive/ba_table_udfs.q |    8 +-
 .../clientpositive/binary_output_format.q       |    8 +-
 .../clientpositive/binary_table_bincolserde.q   |   14 +-
 .../clientpositive/binary_table_colserde.q      |   14 +-
 .../queries/clientpositive/binarysortable_1.q   |    8 +-
 .../clientpositive/bucket_if_with_path_filter.q |    6 +-
 .../queries/clientpositive/bucket_map_join_1.q  |   16 +-
 .../clientpositive/bucket_map_join_spark1.q     |   54 +-
 .../clientpositive/bucket_map_join_spark2.q     |   50 +-
 .../clientpositive/bucket_map_join_spark3.q     |   50 +-
 .../clientpositive/bucket_map_join_spark4.q     |   16 +-
 .../clientpositive/bucket_map_join_tez1.q       |  180 +-
 .../clientpositive/bucket_map_join_tez2.q       |   84 +-
 .../clientpositive/bucket_map_join_tez_empty.q  |   12 +-
 .../clientpositive/bucket_num_reducers2.q       |    8 +-
 .../queries/clientpositive/bucketcontext_1.q    |   32 +-
 .../queries/clientpositive/bucketcontext_2.q    |   28 +-
 .../queries/clientpositive/bucketcontext_3.q    |   28 +-
 .../queries/clientpositive/bucketcontext_5.q    |   24 +-
 .../queries/clientpositive/bucketcontext_6.q    |   28 +-
 .../queries/clientpositive/bucketcontext_7.q    |   36 +-
 .../queries/clientpositive/bucketcontext_8.q    |   36 +-
 .../clientpositive/bucketizedhiveinputformat.q  |   28 +-
 .../bucketizedhiveinputformat_auto.q            |   30 +-
 .../queries/clientpositive/bucketmapjoin1.q     |   88 +-
 .../queries/clientpositive/bucketmapjoin10.q    |   34 +-
 .../queries/clientpositive/bucketmapjoin11.q    |   40 +-
 .../queries/clientpositive/bucketmapjoin12.q    |   12 +-
 .../queries/clientpositive/bucketmapjoin13.q    |   46 +-
 .../queries/clientpositive/bucketmapjoin2.q     |  104 +-
 .../queries/clientpositive/bucketmapjoin3.q     |   80 +-
 .../queries/clientpositive/bucketmapjoin4.q     |   80 +-
 .../queries/clientpositive/bucketmapjoin5.q     |   38 +-
 .../queries/clientpositive/bucketmapjoin7.q     |   16 +-
 .../queries/clientpositive/bucketmapjoin8.q     |   24 +-
 .../queries/clientpositive/bucketmapjoin9.q     |   34 +-
 .../clientpositive/bucketmapjoin_negative.q     |   20 +-
 .../clientpositive/bucketmapjoin_negative2.q    |   22 +-
 .../clientpositive/bucketmapjoin_negative3.q    |   36 +-
 .../bucketsortoptimize_insert_1.q               |   46 +-
 .../bucketsortoptimize_insert_2.q               |   98 +-
 .../bucketsortoptimize_insert_3.q               |   36 +-
 .../bucketsortoptimize_insert_4.q               |   40 +-
 .../bucketsortoptimize_insert_5.q               |   38 +-
 .../bucketsortoptimize_insert_6.q               |   68 +-
 .../bucketsortoptimize_insert_7.q               |   54 +-
 .../bucketsortoptimize_insert_8.q               |   34 +-
 .../queries/clientpositive/case_sensitivity.q   |    8 +-
 ql/src/test/queries/clientpositive/cast1.q      |    8 +-
 .../queries/clientpositive/cast_on_constant.q   |   14 +-
 .../clientpositive/cast_tinyint_to_double.q     |   10 +-
 .../clientpositive/cbo_SortUnionTransposeRule.q |   42 +-
 ql/src/test/queries/clientpositive/cbo_const.q  |    6 +-
 .../cbo_rp_annotate_stats_groupby.q             |   60 +-
 .../queries/clientpositive/cbo_rp_auto_join1.q  |  108 +-
 .../queries/clientpositive/cbo_rp_auto_join17.q |    8 +-
 .../cbo_rp_cross_product_check_2.q              |   18 +-
 .../cbo_rp_gby2_map_multi_distinct.q            |   14 +-
 .../cbo_rp_groupby3_noskew_multi_distinct.q     |    8 +-
 .../test/queries/clientpositive/cbo_rp_insert.q |   16 +-
 .../test/queries/clientpositive/cbo_rp_join1.q  |   20 +-
 .../queries/clientpositive/cbo_rp_lineage2.q    |  174 +-
 .../queries/clientpositive/cbo_rp_subq_exists.q |    4 +-
 .../cbo_rp_udaf_percentile_approx_23.q          |  142 +-
 .../clientpositive/cbo_rp_unionDistinct_2.q     |   98 +-
 .../test/queries/clientpositive/cbo_rp_views.q  |   36 +-
 .../queries/clientpositive/cbo_rp_windowing_2.q |   28 +-
 .../queries/clientpositive/cbo_subq_exists.q    |    4 +-
 ql/src/test/queries/clientpositive/cbo_views.q  |   36 +-
 ql/src/test/queries/clientpositive/char_2.q     |   12 +-
 ql/src/test/queries/clientpositive/char_join1.q |   10 +-
 .../queries/clientpositive/char_pad_convert.q   |   20 +-
 .../queries/clientpositive/check_constraint.q   |   96 +-
 .../queries/clientpositive/colstats_all_nulls.q |    8 +-
 .../columnStatsUpdateForStatsOptimizer_1.q      |   70 +-
 .../clientpositive/column_access_stats.q        |  114 +-
 .../column_pruner_multiple_children.q           |   18 +-
 .../clientpositive/column_table_stats_orc.q     |   54 +-
 .../clientpositive/columnstats_infinity.q       |   28 +-
 .../clientpositive/columnstats_partlvl_dp.q     |   80 +-
 ql/src/test/queries/clientpositive/combine2.q   |   14 +-
 .../clientpositive/comma_in_column_name.q       |   14 +-
 ql/src/test/queries/clientpositive/constGby.q   |   30 +-
 .../queries/clientpositive/constantPropWhen.q   |   38 +-
 .../queries/clientpositive/constant_prop_1.q    |    4 +-
 .../queries/clientpositive/constantfolding.q    |   28 +-
 .../test/queries/clientpositive/constprog_dp.q  |    6 +-
 .../queries/clientpositive/constprog_semijoin.q |   44 +-
 .../queries/clientpositive/constprog_type.q     |    8 +-
 .../clientpositive/correlated_join_keys.q       |   16 +-
 .../clientpositive/correlationoptimizer11.q     |   30 +-
 .../clientpositive/correlationoptimizer4.q      |   56 +-
 .../clientpositive/correlationoptimizer5.q      |   40 +-
 .../clientpositive/correlationoptimizer9.q      |   36 +-
 ql/src/test/queries/clientpositive/count.q      |   54 +-
 ql/src/test/queries/clientpositive/create_1.q   |   20 +-
 .../test/queries/clientpositive/create_escape.q |   10 +-
 .../queries/clientpositive/create_genericudf.q  |    6 +-
 .../test/queries/clientpositive/create_like.q   |   74 +-
 .../test/queries/clientpositive/create_like2.q  |    8 +-
 .../clientpositive/create_like_tbl_props.q      |   20 +-
 .../queries/clientpositive/create_like_view.q   |   56 +-
 .../clientpositive/create_merge_compressed.q    |   28 +-
 .../queries/clientpositive/create_nested_type.q |   10 +-
 .../clientpositive/create_table_like_stats.q    |   24 +-
 .../test/queries/clientpositive/create_udaf.q   |    6 +-
 .../test/queries/clientpositive/create_view.q   |   26 +-
 .../clientpositive/create_view_partitioned.q    |   10 +-
 .../clientpositive/create_view_translate.q      |    8 +-
 .../clientpositive/create_with_constraints.q    |  102 +-
 .../clientpositive/create_with_constraints2.q   |   12 +-
 .../test/queries/clientpositive/cross_prod_1.q  |   40 +-
 .../test/queries/clientpositive/cross_prod_3.q  |    8 +-
 .../test/queries/clientpositive/cross_prod_4.q  |    6 +-
 .../clientpositive/cross_product_check_1.q      |   18 +-
 .../clientpositive/cross_product_check_2.q      |   18 +-
 ql/src/test/queries/clientpositive/cteViews.q   |   34 +-
 ql/src/test/queries/clientpositive/cte_2.q      |   28 +-
 ql/src/test/queries/clientpositive/cte_4.q      |   20 +-
 ql/src/test/queries/clientpositive/cte_5.q      |   12 +-
 ql/src/test/queries/clientpositive/cte_7.q      |   12 +-
 ql/src/test/queries/clientpositive/database.q   |   20 +-
 .../test/queries/clientpositive/database_drop.q |   12 +-
 .../queries/clientpositive/database_location.q  |    4 +-
 .../queries/clientpositive/dbtxnmgr_compact1.q  |    8 +-
 .../queries/clientpositive/dbtxnmgr_compact2.q  |   12 +-
 .../queries/clientpositive/dbtxnmgr_compact3.q  |    8 +-
 .../test/queries/clientpositive/dbtxnmgr_ddl1.q |   56 +-
 .../queries/clientpositive/dbtxnmgr_query1.q    |   16 +-
 .../queries/clientpositive/dbtxnmgr_query2.q    |   16 +-
 .../queries/clientpositive/dbtxnmgr_query3.q    |   20 +-
 .../queries/clientpositive/dbtxnmgr_query4.q    |   16 +-
 .../queries/clientpositive/dbtxnmgr_query5.q    |   12 +-
 ql/src/test/queries/clientpositive/decimal_1.q  |   30 +-
 .../test/queries/clientpositive/decimal_10_0.q  |   10 +-
 ql/src/test/queries/clientpositive/decimal_2.q  |   64 +-
 ql/src/test/queries/clientpositive/decimal_5.q  |   16 +-
 ql/src/test/queries/clientpositive/decimal_6.q  |   22 +-
 .../test/queries/clientpositive/decimal_join2.q |   14 +-
 .../queries/clientpositive/decimal_precision.q  |   42 +-
 .../test/queries/clientpositive/decimal_stats.q |   16 +-
 .../queries/clientpositive/decimal_trailing.q   |   10 +-
 .../queries/clientpositive/default_constraint.q |  170 +-
 .../clientpositive/default_file_format.q        |   36 +-
 .../test/queries/clientpositive/deleteAnalyze.q |   16 +-
 .../queries/clientpositive/desc_tbl_part_cols.q |    6 +-
 .../clientpositive/describe_comment_indent.q    |    6 +-
 .../describe_formatted_view_partitioned_json.q  |   10 +-
 .../queries/clientpositive/describe_table.q     |   24 +-
 .../disable_merge_for_bucketing.q               |   10 +-
 .../clientpositive/display_colstats_tbllvl.q    |   58 +-
 .../queries/clientpositive/distinct_stats.q     |   14 +-
 .../queries/clientpositive/distinct_windowing.q |   18 +-
 .../clientpositive/distinct_windowing_no_cbo.q  |   26 +-
 .../test/queries/clientpositive/dp_counter_mm.q |   40 +-
 .../queries/clientpositive/dp_counter_non_mm.q  |   40 +-
 .../drop_database_removes_partition_dirs.q      |    6 +-
 .../clientpositive/drop_multi_partitions.q      |   22 +-
 .../clientpositive/drop_partition_with_stats.q  |   96 +-
 .../clientpositive/drop_partitions_filter.q     |   60 +-
 .../clientpositive/drop_partitions_filter2.q    |   32 +-
 .../clientpositive/drop_partitions_filter3.q    |   28 +-
 .../clientpositive/drop_partitions_filter4.q    |   70 +-
 .../test/queries/clientpositive/drop_table2.q   |   18 +-
 .../queries/clientpositive/drop_table_purge.q   |    4 +-
 .../drop_table_removes_partition_dirs.q         |    8 +-
 .../clientpositive/drop_table_with_stats.q      |   32 +-
 .../test/queries/clientpositive/druid_basic2.q  |   32 +-
 .../test/queries/clientpositive/druid_basic3.q  |   28 +-
 .../queries/clientpositive/druid_intervals.q    |   24 +-
 .../queries/clientpositive/druid_timeseries.q   |   42 +-
 .../queries/clientpositive/druid_timestamptz.q  |   58 +-
 ql/src/test/queries/clientpositive/druid_topn.q |   20 +-
 .../clientpositive/druidmini_expressions.q      |   28 +-
 .../clientpositive/druidmini_floorTime.q        |   70 +-
 .../test/queries/clientpositive/druidmini_mv.q  |   60 +-
 .../queries/clientpositive/druidmini_test1.q    |   50 +-
 .../clientpositive/druidmini_test_alter.q       |   26 +-
 .../clientpositive/druidmini_test_insert.q      |   72 +-
 .../clientpositive/dynamic_partition_insert.q   |   78 +-
 .../clientpositive/dynamic_partition_pruning.q  |  174 +-
 .../queries/clientpositive/dynamic_rdd_cache.q  |   22 +-
 .../clientpositive/dynamic_semijoin_reduction.q |  126 +-
 .../dynamic_semijoin_reduction_2.q              |   46 +-
 .../dynamic_semijoin_reduction_4.q              |   28 +-
 .../dynamic_semijoin_reduction_sw.q             |   54 +-
 .../dynamic_semijoin_user_level.q               |   90 +-
 .../clientpositive/dynpart_sort_opt_bucketing.q |   32 +-
 .../dynpart_sort_opt_vectorization.q            |    8 +-
 .../clientpositive/dynpart_sort_optimization.q  |  102 +-
 .../clientpositive/dynpart_sort_optimization2.q |   26 +-
 ql/src/test/queries/clientpositive/empty_join.q |   24 +-
 .../encryption_auto_purge_tables.q              |   36 +-
 .../clientpositive/encryption_drop_table.q      |    8 +-
 .../encryption_insert_partition_dynamic.q       |   26 +-
 .../clientpositive/encryption_insert_values.q   |    8 +-
 .../encryption_load_data_to_encrypted_tables.q  |   14 +-
 .../clientpositive/encryption_move_tbl.q        |   34 +-
 .../encryption_select_read_only_encrypted_tbl.q |   10 +-
 .../clientpositive/enforce_constraint_notnull.q |  136 +-
 ql/src/test/queries/clientpositive/escape1.q    |   14 +-
 .../test/queries/clientpositive/escape_crlf.q   |   18 +-
 ql/src/test/queries/clientpositive/except_all.q |   48 +-
 .../queries/clientpositive/except_distinct.q    |   48 +-
 .../clientpositive/exchange_partition3.q        |   24 +-
 .../queries/clientpositive/exchgpartition2lel.q |   48 +-
 .../clientpositive/exec_parallel_column_stats.q |    6 +-
 .../clientpositive/exim_00_nonpart_empty.q      |   16 +-
 .../queries/clientpositive/exim_01_nonpart.q    |   18 +-
 .../clientpositive/exim_02_00_part_empty.q      |   16 +-
 .../exim_03_nonpart_over_compat.q               |   18 +-
 .../queries/clientpositive/exim_04_all_part.q   |   24 +-
 .../clientpositive/exim_04_evolved_parts.q      |   32 +-
 .../queries/clientpositive/exim_05_some_part.q  |   24 +-
 .../queries/clientpositive/exim_06_one_part.q   |   24 +-
 .../exim_07_all_part_over_nonoverlap.q          |   26 +-
 .../clientpositive/exim_08_nonpart_rename.q     |   16 +-
 .../exim_09_part_spec_nonoverlap.q              |   30 +-
 .../clientpositive/exim_10_external_managed.q   |   16 +-
 .../clientpositive/exim_12_external_location.q  |   20 +-
 .../clientpositive/exim_13_managed_location.q   |   20 +-
 .../exim_14_managed_location_over_existing.q    |   22 +-
 .../clientpositive/exim_15_external_part.q      |   34 +-
 .../clientpositive/exim_16_part_external.q      |   30 +-
 .../clientpositive/exim_17_part_managed.q       |   34 +-
 .../clientpositive/exim_18_part_external.q      |   30 +-
 .../exim_19_00_part_external_location.q         |   28 +-
 .../exim_19_part_external_location.q            |   30 +-
 .../exim_20_part_managed_location.q             |   30 +-
 .../clientpositive/exim_21_export_authsuccess.q |   10 +-
 .../exim_22_import_exist_authsuccess.q          |   20 +-
 .../exim_23_import_part_authsuccess.q           |   20 +-
 .../exim_24_import_nonexist_authsuccess.q       |   14 +-
 .../queries/clientpositive/exim_hidden_files.q  |   16 +-
 .../test/queries/clientpositive/explain_ddl.q   |   10 +-
 .../queries/clientpositive/explain_dependency.q |   12 +-
 .../queries/clientpositive/explain_logical.q    |   24 +-
 .../queries/clientpositive/explain_outputs.q    |   14 +-
 .../queries/clientpositive/explain_rearrange.q  |   20 +-
 .../queries/clientpositive/explainanalyze_1.q   |    6 +-
 .../queries/clientpositive/explainanalyze_2.q   |  102 +-
 .../queries/clientpositive/explainanalyze_3.q   |   72 +-
 .../queries/clientpositive/explainanalyze_5.q   |   46 +-
 .../test/queries/clientpositive/explainuser_1.q |  218 +-
 .../test/queries/clientpositive/explainuser_2.q |  158 +-
 .../test/queries/clientpositive/explainuser_3.q |   80 +-
 .../extrapolate_part_stats_date.q               |   16 +-
 .../extrapolate_part_stats_partial.q            |   40 +-
 .../extrapolate_part_stats_partial_ndv.q        |   80 +-
 .../clientpositive/fileformat_sequencefile.q    |   10 +-
 .../queries/clientpositive/fileformat_text.q    |   10 +-
 .../clientpositive/filter_join_breaktask2.q     |   30 +-
 ql/src/test/queries/clientpositive/floor_time.q |   30 +-
 ql/src/test/queries/clientpositive/fm-sketch.q  |   58 +-
 .../clientpositive/gen_udf_example_add10.q      |   10 +-
 ql/src/test/queries/clientpositive/groupby10.q  |   20 +-
 ql/src/test/queries/clientpositive/groupby11.q  |   16 +-
 ql/src/test/queries/clientpositive/groupby12.q  |    8 +-
 .../queries/clientpositive/groupby1_limit.q     |    8 +-
 .../test/queries/clientpositive/groupby1_map.q  |    8 +-
 .../queries/clientpositive/groupby1_map_nomap.q |    8 +-
 .../queries/clientpositive/groupby1_map_skew.q  |    8 +-
 .../queries/clientpositive/groupby1_noskew.q    |    8 +-
 ql/src/test/queries/clientpositive/groupby2.q   |    8 +-
 .../test/queries/clientpositive/groupby2_map.q  |    8 +-
 .../groupby2_map_multi_distinct.q               |   14 +-
 .../queries/clientpositive/groupby2_map_skew.q  |    8 +-
 .../queries/clientpositive/groupby2_noskew.q    |    8 +-
 .../groupby2_noskew_multi_distinct.q            |    8 +-
 ql/src/test/queries/clientpositive/groupby3.q   |    8 +-
 .../test/queries/clientpositive/groupby3_map.q  |    8 +-
 .../groupby3_map_multi_distinct.q               |    8 +-
 .../queries/clientpositive/groupby3_map_skew.q  |    8 +-
 .../queries/clientpositive/groupby3_noskew.q    |    8 +-
 .../groupby3_noskew_multi_distinct.q            |    8 +-
 ql/src/test/queries/clientpositive/groupby4.q   |    8 +-
 .../test/queries/clientpositive/groupby4_map.q  |    8 +-
 .../queries/clientpositive/groupby4_map_skew.q  |    8 +-
 .../queries/clientpositive/groupby4_noskew.q    |    8 +-
 ql/src/test/queries/clientpositive/groupby5.q   |    8 +-
 .../test/queries/clientpositive/groupby5_map.q  |    8 +-
 .../queries/clientpositive/groupby5_map_skew.q  |    8 +-
 .../queries/clientpositive/groupby5_noskew.q    |    8 +-
 ql/src/test/queries/clientpositive/groupby6.q   |    8 +-
 .../test/queries/clientpositive/groupby6_map.q  |    8 +-
 .../queries/clientpositive/groupby6_map_skew.q  |    8 +-
 .../queries/clientpositive/groupby6_noskew.q    |    8 +-
 ql/src/test/queries/clientpositive/groupby7.q   |   12 +-
 .../test/queries/clientpositive/groupby7_map.q  |   16 +-
 .../groupby7_map_multi_single_reducer.q         |   16 +-
 .../queries/clientpositive/groupby7_map_skew.q  |   16 +-
 .../queries/clientpositive/groupby7_noskew.q    |   16 +-
 .../groupby7_noskew_multi_single_reducer.q      |   16 +-
 ql/src/test/queries/clientpositive/groupby8.q   |   28 +-
 .../test/queries/clientpositive/groupby8_map.q  |   16 +-
 .../queries/clientpositive/groupby8_map_skew.q  |   16 +-
 .../queries/clientpositive/groupby8_noskew.q    |   16 +-
 ql/src/test/queries/clientpositive/groupby9.q   |   64 +-
 .../clientpositive/groupby_complex_types.q      |   24 +-
 ...groupby_complex_types_multi_single_reducer.q |   16 +-
 .../test/queries/clientpositive/groupby_cube1.q |   42 +-
 .../clientpositive/groupby_cube_multi_gby.q     |    8 +-
 .../clientpositive/groupby_distinct_samekey.q   |   14 +-
 .../clientpositive/groupby_duplicate_key.q      |    6 +-
 .../test/queries/clientpositive/groupby_empty.q |    8 +-
 .../clientpositive/groupby_grouping_id1.q       |   16 +-
 .../clientpositive/groupby_grouping_id2.q       |   28 +-
 .../clientpositive/groupby_grouping_id3.q       |   12 +-
 .../clientpositive/groupby_grouping_sets1.q     |   34 +-
 .../clientpositive/groupby_grouping_sets2.q     |   24 +-
 .../clientpositive/groupby_grouping_sets3.q     |   18 +-
 .../clientpositive/groupby_grouping_sets4.q     |   24 +-
 .../clientpositive/groupby_grouping_sets5.q     |   14 +-
 .../clientpositive/groupby_grouping_sets6.q     |   12 +-
 .../groupby_grouping_sets_grouping.q            |   64 +-
 .../groupby_grouping_sets_limit.q               |   28 +-
 .../clientpositive/groupby_grouping_window.q    |   14 +-
 .../queries/clientpositive/groupby_map_ppr.q    |    8 +-
 .../groupby_map_ppr_multi_distinct.q            |    8 +-
 .../groupby_multi_insert_common_distinct.q      |   16 +-
 .../groupby_multi_single_reducer2.q             |   20 +-
 .../groupby_multi_single_reducer3.q             |   52 +-
 .../queries/clientpositive/groupby_multialias.q |    8 +-
 .../test/queries/clientpositive/groupby_ppd.q   |    6 +-
 .../test/queries/clientpositive/groupby_ppr.q   |    8 +-
 .../queries/clientpositive/groupby_rollup1.q    |   36 +-
 .../clientpositive/groupby_rollup_empty.q       |   38 +-
 .../queries/clientpositive/groupby_sort_1.q     |  184 +-
 .../queries/clientpositive/groupby_sort_10.q    |   16 +-
 .../queries/clientpositive/groupby_sort_11.q    |   32 +-
 .../queries/clientpositive/groupby_sort_1_23.q  |  232 +-
 .../queries/clientpositive/groupby_sort_2.q     |   18 +-
 .../queries/clientpositive/groupby_sort_3.q     |   30 +-
 .../queries/clientpositive/groupby_sort_4.q     |   30 +-
 .../queries/clientpositive/groupby_sort_5.q     |   58 +-
 .../queries/clientpositive/groupby_sort_6.q     |   36 +-
 .../queries/clientpositive/groupby_sort_7.q     |   20 +-
 .../queries/clientpositive/groupby_sort_8.q     |   12 +-
 .../queries/clientpositive/groupby_sort_9.q     |   14 +-
 .../clientpositive/groupby_sort_skew_1.q        |  232 +-
 .../clientpositive/groupby_sort_skew_1_23.q     |  232 +-
 .../clientpositive/groupby_sort_test_1.q        |   12 +-
 .../queries/clientpositive/infer_bucket_sort.q  |  102 +-
 .../infer_bucket_sort_convert_join.q            |   10 +-
 .../clientpositive/infer_bucket_sort_dyn_part.q |   50 +-
 .../infer_bucket_sort_map_operators.q           |   50 +-
 .../clientpositive/infer_bucket_sort_merge.q    |   10 +-
 .../infer_bucket_sort_num_buckets.q             |   10 +-
 .../infer_bucket_sort_reducers_power_two.q      |   26 +-
 .../queries/clientpositive/infer_join_preds.q   |   14 +-
 ql/src/test/queries/clientpositive/innerjoin.q  |   16 +-
 .../test/queries/clientpositive/inoutdriver.q   |    4 +-
 ql/src/test/queries/clientpositive/input1.q     |    6 +-
 ql/src/test/queries/clientpositive/input11.q    |    8 +-
 .../test/queries/clientpositive/input11_limit.q |    8 +-
 ql/src/test/queries/clientpositive/input12.q    |   24 +-
 .../queries/clientpositive/input12_hadoop20.q   |   24 +-
 ql/src/test/queries/clientpositive/input13.q    |   24 +-
 ql/src/test/queries/clientpositive/input14.q    |    8 +-
 .../test/queries/clientpositive/input14_limit.q |    8 +-
 ql/src/test/queries/clientpositive/input17.q    |    8 +-
 ql/src/test/queries/clientpositive/input18.q    |    8 +-
 .../test/queries/clientpositive/input1_limit.q  |   16 +-
 ql/src/test/queries/clientpositive/input20.q    |    8 +-
 ql/src/test/queries/clientpositive/input24.q    |    8 +-
 ql/src/test/queries/clientpositive/input28.q    |   10 +-
 ql/src/test/queries/clientpositive/input33.q    |    8 +-
 ql/src/test/queries/clientpositive/input34.q    |    8 +-
 ql/src/test/queries/clientpositive/input35.q    |    8 +-
 ql/src/test/queries/clientpositive/input36.q    |    8 +-
 ql/src/test/queries/clientpositive/input38.q    |    8 +-
 ql/src/test/queries/clientpositive/input39.q    |   14 +-
 .../queries/clientpositive/input39_hadoop20.q   |   14 +-
 .../test/queries/clientpositive/input3_limit.q  |   14 +-
 ql/src/test/queries/clientpositive/input4.q     |   10 +-
 ql/src/test/queries/clientpositive/input44.q    |    6 +-
 ql/src/test/queries/clientpositive/input5.q     |    8 +-
 ql/src/test/queries/clientpositive/input6.q     |    8 +-
 ql/src/test/queries/clientpositive/input7.q     |    8 +-
 ql/src/test/queries/clientpositive/input8.q     |    8 +-
 ql/src/test/queries/clientpositive/input9.q     |    8 +-
 .../queries/clientpositive/input_dynamicserde.q |   10 +-
 .../queries/clientpositive/input_lazyserde.q    |   36 +-
 .../queries/clientpositive/input_lazyserde2.q   |   52 +-
 .../test/queries/clientpositive/input_part1.q   |    8 +-
 .../test/queries/clientpositive/input_part2.q   |   16 +-
 .../test/queries/clientpositive/input_part5.q   |    8 +-
 .../queries/clientpositive/input_testxpath.q    |    8 +-
 .../queries/clientpositive/input_testxpath2.q   |    8 +-
 ql/src/test/queries/clientpositive/inputddl7.q  |   32 +-
 ql/src/test/queries/clientpositive/insert0.q    |   14 +-
 ql/src/test/queries/clientpositive/insert1.q    |    8 +-
 .../clientpositive/insert_acid_not_bucketed.q   |    6 +-
 .../insert_into_default_keyword.q               |  150 +-
 .../clientpositive/insert_into_with_schema.q    |   18 +-
 .../clientpositive/insert_into_with_schema2.q   |    8 +-
 .../clientpositive/insert_nonacid_from_acid.q   |    6 +-
 .../clientpositive/insert_overwrite_directory.q |   32 +-
 .../insert_overwrite_directory2.q               |   12 +-
 .../insert_overwrite_local_directory_1.q        |   28 +-
 .../clientpositive/insert_values_orig_table.q   |   16 +-
 .../queries/clientpositive/insertexternal1.q    |    8 +-
 .../test/queries/clientpositive/intersect_all.q |   32 +-
 .../queries/clientpositive/intersect_distinct.q |   32 +-
 .../queries/clientpositive/intersect_merge.q    |   24 +-
 .../test/queries/clientpositive/interval_alt.q  |    8 +-
 .../clientpositive/interval_arithmetic.q        |   42 +-
 .../queries/clientpositive/is_distinct_from.q   |   18 +-
 ql/src/test/queries/clientpositive/join1.q      |    8 +-
 ql/src/test/queries/clientpositive/join14.q     |    8 +-
 .../queries/clientpositive/join14_hadoop20.q    |    8 +-
 ql/src/test/queries/clientpositive/join17.q     |    8 +-
 ql/src/test/queries/clientpositive/join2.q      |    8 +-
 ql/src/test/queries/clientpositive/join25.q     |    8 +-
 ql/src/test/queries/clientpositive/join26.q     |    8 +-
 ql/src/test/queries/clientpositive/join27.q     |    8 +-
 ql/src/test/queries/clientpositive/join28.q     |    8 +-
 ql/src/test/queries/clientpositive/join29.q     |    8 +-
 ql/src/test/queries/clientpositive/join3.q      |    8 +-
 ql/src/test/queries/clientpositive/join30.q     |    8 +-
 ql/src/test/queries/clientpositive/join31.q     |    8 +-
 ql/src/test/queries/clientpositive/join32.q     |    8 +-
 .../queries/clientpositive/join32_lessSize.q    |   40 +-
 ql/src/test/queries/clientpositive/join33.q     |    8 +-
 ql/src/test/queries/clientpositive/join34.q     |    8 +-
 ql/src/test/queries/clientpositive/join35.q     |    8 +-
 ql/src/test/queries/clientpositive/join36.q     |   20 +-
 ql/src/test/queries/clientpositive/join37.q     |    8 +-
 ql/src/test/queries/clientpositive/join38.q     |   10 +-
 ql/src/test/queries/clientpositive/join39.q     |    8 +-
 ql/src/test/queries/clientpositive/join4.q      |    8 +-
 ql/src/test/queries/clientpositive/join42.q     |   20 +-
 ql/src/test/queries/clientpositive/join44.q     |    4 +-
 ql/src/test/queries/clientpositive/join46.q     |  288 +-
 ql/src/test/queries/clientpositive/join5.q      |    8 +-
 ql/src/test/queries/clientpositive/join6.q      |    8 +-
 ql/src/test/queries/clientpositive/join7.q      |    8 +-
 ql/src/test/queries/clientpositive/join8.q      |    8 +-
 ql/src/test/queries/clientpositive/join9.q      |    8 +-
 .../clientpositive/join_cond_pushdown_unqual1.q |   12 +-
 .../clientpositive/join_cond_pushdown_unqual3.q |   12 +-
 .../clientpositive/join_cond_pushdown_unqual4.q |    8 +-
 .../queries/clientpositive/join_emit_interval.q |   24 +-
 .../test/queries/clientpositive/join_filters.q  |  296 +-
 .../clientpositive/join_filters_overlap.q       |   36 +-
 .../clientpositive/join_is_not_distinct_from.q  |   80 +-
 .../test/queries/clientpositive/join_map_ppr.q  |   14 +-
 ql/src/test/queries/clientpositive/join_nulls.q |   76 +-
 .../test/queries/clientpositive/join_nullsafe.q |   80 +-
 .../queries/clientpositive/join_on_varchar.q    |   16 +-
 .../test/queries/clientpositive/join_reorder.q  |   68 +-
 .../test/queries/clientpositive/join_reorder2.q |   40 +-
 .../test/queries/clientpositive/join_reorder3.q |   40 +-
 .../test/queries/clientpositive/join_reorder4.q |   24 +-
 .../clientpositive/join_reordering_no_stats.q   |   20 +-
 .../clientpositive/json_serde_tsformat.q        |    8 +-
 ql/src/test/queries/clientpositive/keyword_2.q  |   10 +-
 .../lateral_view_multi_lateralviews.q           |    6 +-
 .../clientpositive/lateral_view_onview.q        |   14 +-
 .../clientpositive/lateral_view_onview2.q       |    6 +-
 .../test/queries/clientpositive/lb_fs_stats.q   |    8 +-
 .../test/queries/clientpositive/leftsemijoin.q  |   24 +-
 .../queries/clientpositive/leftsemijoin_mr.q    |   16 +-
 ql/src/test/queries/clientpositive/lineage2.q   |   74 +-
 ql/src/test/queries/clientpositive/lineage3.q   |   24 +-
 .../queries/clientpositive/list_bucket_dml_1.q  |   18 +-
 .../queries/clientpositive/list_bucket_dml_11.q |   16 +-
 .../queries/clientpositive/list_bucket_dml_12.q |   20 +-
 .../queries/clientpositive/list_bucket_dml_2.q  |   30 +-
 .../queries/clientpositive/list_bucket_dml_3.q  |   16 +-
 .../queries/clientpositive/list_bucket_dml_4.q  |   26 +-
 .../queries/clientpositive/list_bucket_dml_5.q  |   18 +-
 .../queries/clientpositive/list_bucket_dml_6.q  |   30 +-
 .../queries/clientpositive/list_bucket_dml_8.q  |   24 +-
 .../queries/clientpositive/list_bucket_dml_9.q  |   26 +-
 .../list_bucket_query_multiskew_2.q             |   22 +-
 .../list_bucket_query_multiskew_3.q             |   34 +-
 .../list_bucket_query_oneskew_1.q               |   40 +-
 .../list_bucket_query_oneskew_2.q               |   44 +-
 .../list_bucket_query_oneskew_3.q               |   24 +-
 ql/src/test/queries/clientpositive/llap_acid.q  |   28 +-
 ql/src/test/queries/clientpositive/llap_acid2.q |   14 +-
 .../test/queries/clientpositive/llap_nullscan.q |   22 +-
 .../queries/clientpositive/llap_partitioned.q   |   10 +-
 .../test/queries/clientpositive/llap_reader.q   |   22 +-
 ql/src/test/queries/clientpositive/llap_udf.q   |   18 +-
 .../queries/clientpositive/llap_uncompressed.q  |   16 +-
 .../test/queries/clientpositive/llapdecider.q   |   34 +-
 .../queries/clientpositive/load_binary_data.q   |   10 +-
 .../clientpositive/load_data_using_job.q        |  110 +-
 .../queries/clientpositive/load_dyn_part1.q     |   22 +-
 .../queries/clientpositive/load_dyn_part11.q    |   10 +-
 .../queries/clientpositive/load_dyn_part14.q    |   12 +-
 .../queries/clientpositive/load_dyn_part8.q     |   16 +-
 .../load_exist_part_authsuccess.q               |    8 +-
 .../load_file_with_space_in_the_name.q          |    6 +-
 ql/src/test/queries/clientpositive/load_fs2.q   |   14 +-
 .../queries/clientpositive/load_fs_overwrite.q  |   14 +-
 .../queries/clientpositive/load_non_hdfs_path.q |    4 +-
 ql/src/test/queries/clientpositive/load_orc.q   |   14 +-
 .../queries/clientpositive/load_overwrite.q     |   20 +-
 .../clientpositive/load_part_authsuccess.q      |    6 +-
 ql/src/test/queries/clientpositive/loadpart1.q  |    8 +-
 ql/src/test/queries/clientpositive/lock1.q      |   32 +-
 ql/src/test/queries/clientpositive/lock2.q      |   34 +-
 ql/src/test/queries/clientpositive/lock3.q      |   22 +-
 ql/src/test/queries/clientpositive/lock4.q      |   22 +-
 ql/src/test/queries/clientpositive/mapjoin2.q   |   12 +-
 ql/src/test/queries/clientpositive/mapjoin46.q  |  276 +-
 .../queries/clientpositive/mapjoin_addjar.q     |    8 +-
 .../queries/clientpositive/mapjoin_decimal.q    |   18 +-
 .../clientpositive/mapjoin_emit_interval.q      |   20 +-
 .../test/queries/clientpositive/mapjoin_hint.q  |   42 +-
 .../test/queries/clientpositive/mapjoin_hook.q  |   12 +-
 .../queries/clientpositive/mapjoin_test_outer.q |   20 +-
 ql/src/test/queries/clientpositive/mapreduce1.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce2.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce3.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce4.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce5.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce6.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce7.q |    8 +-
 ql/src/test/queries/clientpositive/mapreduce8.q |    8 +-
 ql/src/test/queries/clientpositive/masking_1.q  |   30 +-
 ql/src/test/queries/clientpositive/masking_12.q |   12 +-
 .../queries/clientpositive/masking_1_newdb.q    |   10 +-
 ql/src/test/queries/clientpositive/masking_2.q  |   16 +-
 ql/src/test/queries/clientpositive/masking_3.q  |   30 +-
 ql/src/test/queries/clientpositive/masking_4.q  |   20 +-
 ql/src/test/queries/clientpositive/masking_5.q  |   20 +-
 ql/src/test/queries/clientpositive/masking_6.q  |   24 +-
 ql/src/test/queries/clientpositive/masking_7.q  |   24 +-
 ql/src/test/queries/clientpositive/masking_8.q  |   30 +-
 .../clientpositive/masking_acid_no_masking.q    |    4 +-
 .../clientpositive/masking_disablecbo_1.q       |   30 +-
 .../clientpositive/masking_disablecbo_2.q       |   16 +-
 .../clientpositive/masking_disablecbo_4.q       |   20 +-
 .../clientpositive/materialized_view_create.q   |   26 +-
 .../materialized_view_create_rewrite.q          |   60 +-
 .../materialized_view_create_rewrite_2.q        |   80 +-
 .../materialized_view_create_rewrite_4.q        |  168 +-
 .../materialized_view_create_rewrite_5.q        |  112 +-
 .../materialized_view_create_rewrite_dummy.q    |   46 +-
 .../materialized_view_create_rewrite_multi_db.q |   26 +-
 ...rialized_view_create_rewrite_rebuild_dummy.q |  168 +-
 ...terialized_view_create_rewrite_time_window.q |  100 +-
 .../clientpositive/materialized_view_describe.q |   52 +-
 .../materialized_view_rewrite_1.q               |  178 +-
 .../materialized_view_rewrite_2.q               |  198 +-
 .../materialized_view_rewrite_3.q               |  118 +-
 .../materialized_view_rewrite_4.q               |  196 +-
 .../materialized_view_rewrite_5.q               |  352 +-
 .../materialized_view_rewrite_7.q               |  184 +-
 .../materialized_view_rewrite_9.q               |   30 +-
 .../materialized_view_rewrite_ssb.q             |  100 +-
 .../materialized_view_rewrite_ssb_2.q           |   24 +-
 ql/src/test/queries/clientpositive/merge1.q     |   26 +-
 ql/src/test/queries/clientpositive/merge2.q     |   26 +-
 .../clientpositive/merge_dynamic_partition.q    |   36 +-
 .../clientpositive/merge_dynamic_partition2.q   |   22 +-
 .../clientpositive/merge_dynamic_partition3.q   |   38 +-
 .../clientpositive/merge_dynamic_partition4.q   |   42 +-
 .../test/queries/clientpositive/merge_empty.q   |   12 +-
 ql/src/test/queries/clientpositive/mergejoin.q  |  110 +-
 ql/src/test/queries/clientpositive/mergejoins.q |   14 +-
 .../queries/clientpositive/mergejoins_mixed.q   |   34 +-
 .../clientpositive/metadata_only_queries.q      |   12 +-
 .../metadata_only_queries_with_filters.q        |   32 +-
 .../test/queries/clientpositive/metadataonly1.q |   54 +-
 ql/src/test/queries/clientpositive/misc_json.q  |    6 +-
 ql/src/test/queries/clientpositive/mm_all.q     |  110 +-
 ql/src/test/queries/clientpositive/mm_buckets.q |   24 +-
 ql/src/test/queries/clientpositive/mm_cttas.q   |   14 +-
 ql/src/test/queries/clientpositive/mm_default.q |   12 +-
 ql/src/test/queries/clientpositive/mm_exim.q    |   18 +-
 .../test/queries/clientpositive/msck_repair_0.q |   26 +-
 .../test/queries/clientpositive/msck_repair_2.q |   22 +-
 .../test/queries/clientpositive/msck_repair_3.q |   22 +-
 .../clientpositive/msck_repair_batchsize.q      |   28 +-
 .../queries/clientpositive/msck_repair_drop.q   |   66 +-
 .../test/queries/clientpositive/multiMapJoin2.q |   10 +-
 .../queries/clientpositive/multi_column_in.q    |   66 +-
 .../clientpositive/multi_column_in_single.q     |   58 +-
 .../clientpositive/multi_count_distinct.q       |   24 +-
 .../test/queries/clientpositive/multi_insert.q  |  148 +-
 .../queries/clientpositive/multi_insert_gby.q   |   28 +-
 .../queries/clientpositive/multi_insert_gby2.q  |    8 +-
 .../queries/clientpositive/multi_insert_gby3.q  |   34 +-
 .../queries/clientpositive/multi_insert_gby4.q  |   24 +-
 .../clientpositive/multi_insert_lateral_view.q  |   22 +-
 .../queries/clientpositive/multi_insert_mixed.q |   16 +-
 ...multi_insert_move_tasks_share_dependencies.q |  196 +-
 .../clientpositive/multi_insert_partitioned.q   |   22 +-
 .../clientpositive/multi_insert_union_src.q     |   28 +-
 .../clientpositive/multigroupby_singlemr.q      |   40 +-
 .../queries/clientpositive/named_column_join.q  |   50 +-
 .../clientpositive/nested_column_pruning.q      |  132 +-
 ql/src/test/queries/clientpositive/newline.q    |   34 +-
 .../queries/clientpositive/notable_alias1.q     |    8 +-
 .../queries/clientpositive/notable_alias2.q     |    8 +-
 .../queries/clientpositive/notable_alias3.q     |    4 +-
 ql/src/test/queries/clientpositive/nullMap.q    |    8 +-
 .../test/queries/clientpositive/null_column.q   |    6 +-
 .../nullability_transitive_inference.q          |   30 +-
 .../queries/clientpositive/nullformatCTAS.q     |   14 +-
 .../test/queries/clientpositive/nullformatdir.q |   12 +-
 ql/src/test/queries/clientpositive/nullgroup3.q |   44 +-
 .../clientpositive/optimize_filter_literal.q    |   36 +-
 .../queries/clientpositive/optimize_join_ptp.q  |   12 +-
 .../test/queries/clientpositive/orc_analyze.q   |  106 +-
 ql/src/test/queries/clientpositive/orc_create.q |   32 +-
 .../clientpositive/orc_dictionary_threshold.q   |   12 +-
 .../queries/clientpositive/orc_diff_part_cols.q |   10 +-
 .../clientpositive/orc_diff_part_cols2.q        |    8 +-
 .../queries/clientpositive/orc_empty_files.q    |    6 +-
 .../queries/clientpositive/orc_empty_strings.q  |   10 +-
 .../clientpositive/orc_ends_with_nulls.q        |    6 +-
 .../test/queries/clientpositive/orc_file_dump.q |   18 +-
 .../clientpositive/orc_int_type_promotion.q     |   24 +-
 .../queries/clientpositive/orc_llap_counters.q  |  104 +-
 .../queries/clientpositive/orc_llap_nonvector.q |    8 +-
 ql/src/test/queries/clientpositive/orc_merge1.q |   48 +-
 .../test/queries/clientpositive/orc_merge11.q   |   36 +-
 ql/src/test/queries/clientpositive/orc_merge2.q |   14 +-
 ql/src/test/queries/clientpositive/orc_merge3.q |   30 +-
 ql/src/test/queries/clientpositive/orc_merge5.q |   44 +-
 ql/src/test/queries/clientpositive/orc_merge6.q |   76 +-
 ql/src/test/queries/clientpositive/orc_merge7.q |   76 +-
 ql/src/test/queries/clientpositive/orc_merge8.q |   18 +-
 .../queries/clientpositive/orc_merge_diff_fs.q  |   48 +-
 .../clientpositive/orc_merge_incompat1.q        |   18 +-
 .../clientpositive/orc_merge_incompat_schema.q  |   34 +-
 .../orc_merge_incompat_writer_version.q         |   20 +-
 .../test/queries/clientpositive/orc_min_max.q   |   14 +-
 .../clientpositive/orc_nested_column_pruning.q  |  132 +-
 .../test/queries/clientpositive/orc_ppd_basic.q |  114 +-
 .../queries/clientpositive/orc_ppd_boolean.q    |   20 +-
 .../test/queries/clientpositive/orc_ppd_char.q  |   48 +-
 .../test/queries/clientpositive/orc_ppd_date.q  |   66 +-
 .../queries/clientpositive/orc_ppd_decimal.q    |  108 +-
 .../orc_ppd_same_table_multiple_aliases.q       |   14 +-
 .../clientpositive/orc_ppd_schema_evol_1a.q     |   12 +-
 .../clientpositive/orc_ppd_schema_evol_1b.q     |    6 +-
 .../clientpositive/orc_ppd_schema_evol_2a.q     |   16 +-
 .../clientpositive/orc_ppd_schema_evol_2b.q     |   24 +-
 .../clientpositive/orc_ppd_schema_evol_3a.q     |  140 +-
 .../clientpositive/orc_ppd_str_conversion.q     |   10 +-
 .../queries/clientpositive/orc_ppd_timestamp.q  |   64 +-
 .../queries/clientpositive/orc_ppd_varchar.q    |   48 +-
 .../clientpositive/orc_predicate_pushdown.q     |    6 +-
 .../clientpositive/orc_schema_evolution.q       |   18 +-
 .../queries/clientpositive/orc_wide_table.q     |   10 +-
 ql/src/test/queries/clientpositive/order3.q     |   30 +-
 .../queries/clientpositive/order_by_expr_1.q    |   62 +-
 .../queries/clientpositive/order_by_expr_2.q    |   14 +-
 .../test/queries/clientpositive/order_by_pos.q  |   18 +-
 ql/src/test/queries/clientpositive/order_null.q |   36 +-
 ql/src/test/queries/clientpositive/parallel.q   |   12 +-
 .../queries/clientpositive/parallel_colstats.q  |   24 +-
 .../queries/clientpositive/parallel_join1.q     |    8 +-
 .../queries/clientpositive/parallel_orderby.q   |   12 +-
 .../test/queries/clientpositive/parquet_ctas.q  |   14 +-
 .../queries/clientpositive/parquet_decimal.q    |   28 +-
 .../test/queries/clientpositive/parquet_join.q  |   14 +-
 .../test/queries/clientpositive/parquet_join2.q |   18 +-
 .../queries/clientpositive/parquet_map_null.q   |   10 +-
 .../clientpositive/parquet_nested_complex.q     |   14 +-
 .../queries/clientpositive/parquet_ppd_char.q   |   48 +-
 .../queries/clientpositive/parquet_ppd_date.q   |   66 +-
 .../clientpositive/parquet_ppd_decimal.q        |  108 +-
 .../clientpositive/parquet_ppd_partition.q      |   10 +-
 .../clientpositive/parquet_ppd_timestamp.q      |   64 +-
 .../clientpositive/parquet_ppd_varchar.q        |   48 +-
 .../clientpositive/parquet_predicate_pushdown.q |    6 +-
 .../parquet_table_with_subschema.q              |   14 +-
 ...ypes_non_dictionary_encoding_vectorization.q |   40 +-
 .../parquet_types_vectorization.q               |   44 +-
 .../parquet_vectorization_part_project.q        |   10 +-
 ql/src/test/queries/clientpositive/partInit.q   |   12 +-
 .../clientpositive/part_inherit_tbl_props.q     |    6 +-
 .../part_inherit_tbl_props_empty.q              |    6 +-
 ql/src/test/queries/clientpositive/partcols1.q  |    6 +-
 .../clientpositive/partial_column_stats.q       |    8 +-
 .../partition_condition_remover.q               |   14 +-
 .../clientpositive/partition_decode_name.q      |   16 +-
 .../clientpositive/partition_shared_scan.q      |   22 +-
 .../clientpositive/partition_type_check.q       |   26 +-
 .../clientpositive/partition_wise_fileformat.q  |   50 +-
 .../partition_wise_fileformat11.q               |   22 +-
 .../partition_wise_fileformat12.q               |   30 +-
 .../partition_wise_fileformat13.q               |   20 +-
 .../partition_wise_fileformat14.q               |   46 +-
 .../partition_wise_fileformat15.q               |   26 +-
 .../partition_wise_fileformat16.q               |   26 +-
 .../clientpositive/partition_wise_fileformat3.q |   22 +-
 .../clientpositive/partition_wise_fileformat4.q |   12 +-
 .../clientpositive/partition_wise_fileformat5.q |   16 +-
 .../clientpositive/partition_wise_fileformat6.q |   18 +-
 .../clientpositive/partition_wise_fileformat7.q |   10 +-
 .../clientpositive/partition_wise_fileformat8.q |   16 +-
 .../clientpositive/partition_wise_fileformat9.q |   12 +-
 .../queries/clientpositive/partitions_json.q    |   22 +-
 .../test/queries/clientpositive/pointlookup2.q  |   66 +-
 .../test/queries/clientpositive/pointlookup3.q  |   52 +-
 .../test/queries/clientpositive/pointlookup4.q  |   20 +-
 ql/src/test/queries/clientpositive/ppd_join5.q  |   20 +-
 .../queries/clientpositive/ppd_outer_join5.q    |   22 +-
 .../queries/clientpositive/ppd_repeated_alias.q |   20 +-
 .../queries/clientpositive/ppd_union_view.q     |   22 +-
 .../test/queries/clientpositive/ppr_pushdown.q  |   78 +-
 .../queries/clientpositive/primitive_types.q    |    4 +-
 ql/src/test/queries/clientpositive/ptf.q        |   22 +-
 .../test/queries/clientpositive/ptf_matchpath.q |   18 +-
 .../queries/clientpositive/ql_rewrite_gbtoidx.q |  130 +-
 .../clientpositive/ql_rewrite_gbtoidx_cbo_2.q   |  134 +-
 ql/src/test/queries/clientpositive/quote1.q     |   10 +-
 .../queries/clientpositive/quotedid_basic.q     |   16 +-
 .../test/queries/clientpositive/quotedid_skew.q |   10 +-
 .../queries/clientpositive/quotedid_stats.q     |    8 +-
 .../clientpositive/rand_partitionpruner2.q      |    8 +-
 .../test/queries/clientpositive/rcfile_merge3.q |   28 +-
 .../clientpositive/rcfile_toleratecorruptions.q |    6 +-
 .../read_uint_parquet_vectorized.q              |  184 +-
 .../test/queries/clientpositive/recursive_dir.q |   14 +-
 .../reduce_deduplicate_exclude_gby.q            |    6 +-
 .../queries/clientpositive/remove_exprs_stats.q |   66 +-
 .../clientpositive/rename_partition_location.q  |   12 +-
 ql/src/test/queries/clientpositive/repair.q     |   14 +-
 .../clientpositive/results_cache_invalidation.q |   66 +-
 .../results_cache_transactional.q               |   32 +-
 .../clientpositive/results_cache_with_masking.q |   10 +-
 .../test/queries/clientpositive/retry_failure.q |    6 +-
 .../clientpositive/retry_failure_stat_changes.q |   14 +-
 .../clientpositive/root_dir_external_table.q    |    4 +-
 .../runtime_skewjoin_mapjoin_spark.q            |    8 +-
 .../queries/clientpositive/runtime_stats_hs2.q  |   14 +-
 ql/src/test/queries/clientpositive/sample1.q    |    8 +-
 ql/src/test/queries/clientpositive/sample2.q    |    8 +-
 ql/src/test/queries/clientpositive/sample4.q    |    8 +-
 ql/src/test/queries/clientpositive/sample5.q    |    8 +-
 ql/src/test/queries/clientpositive/sample6.q    |    8 +-
 ql/src/test/queries/clientpositive/sample7.q    |    8 +-
 .../sample_islocalmode_hook_hadoop20.q          |   18 +-
 .../sample_islocalmode_hook_use_metadata.q      |   26 +-
 .../clientpositive/schema_evol_orc_acid_part.q  |  150 +-
 .../schema_evol_orc_acid_part_llap_io.q         |  150 +-
 .../schema_evol_orc_acid_part_update.q          |  106 +-
 .../schema_evol_orc_acid_part_update_llap_io.q  |   26 +-
 .../clientpositive/schema_evol_orc_acid_table.q |  150 +-
 .../schema_evol_orc_acid_table_llap_io.q        |  150 +-
 .../schema_evol_orc_acid_table_update.q         |   72 +-
 .../schema_evol_orc_acid_table_update_llap_io.q |   72 +-
 .../schema_evol_orc_acidvec_part.q              |  176 +-
 .../schema_evol_orc_acidvec_part_llap_io.q      |  176 +-
 .../schema_evol_orc_acidvec_part_update.q       |   80 +-
 ...chema_evol_orc_acidvec_part_update_llap_io.q |   80 +-
 .../schema_evol_orc_acidvec_table.q             |   22 +-
 .../schema_evol_orc_acidvec_table_llap_io.q     |  176 +-
 .../schema_evol_orc_acidvec_table_update.q      |   72 +-
 .../schema_evol_orc_nonvec_part.q               |  166 +-
 .../schema_evol_orc_nonvec_part_all_complex.q   |  102 +-
 ...a_evol_orc_nonvec_part_all_complex_llap_io.q |  102 +-
 .../schema_evol_orc_nonvec_part_all_primitive.q |  110 +-
 ...evol_orc_nonvec_part_all_primitive_llap_io.q |  110 +-
 .../schema_evol_orc_nonvec_part_llap_io.q       |  166 +-
 .../schema_evol_orc_nonvec_table.q              |  158 +-
 .../schema_evol_orc_nonvec_table_llap_io.q      |  158 +-
 .../clientpositive/schema_evol_orc_vec_part.q   |  166 +-
 .../schema_evol_orc_vec_part_all_complex.q      |  102 +-
 ...hema_evol_orc_vec_part_all_complex_llap_io.q |  102 +-
 .../schema_evol_orc_vec_part_all_primitive.q    |  110 +-
 ...ma_evol_orc_vec_part_all_primitive_llap_io.q |  110 +-
 .../schema_evol_orc_vec_part_llap_io.q          |  166 +-
 .../clientpositive/schema_evol_orc_vec_table.q  |  158 +-
 .../schema_evol_orc_vec_table_llap_io.q         |  158 +-
 ...evol_par_vec_table_non_dictionary_encoding.q |  120 +-
 .../queries/clientpositive/schema_evol_stats.q  |   42 +-
 .../schema_evol_text_nonvec_part.q              |  166 +-
 .../schema_evol_text_nonvec_part_all_complex.q  |  102 +-
 ..._evol_text_nonvec_part_all_complex_llap_io.q |  102 +-
 ...schema_evol_text_nonvec_part_all_primitive.q |  110 +-
 ...vol_text_nonvec_part_all_primitive_llap_io.q |  120 +-
 .../schema_evol_text_nonvec_part_llap_io.q      |  166 +-
 .../schema_evol_text_nonvec_table.q             |  158 +-
 .../schema_evol_text_nonvec_table_llap_io.q     |  158 +-
 .../clientpositive/schema_evol_text_vec_part.q  |  166 +-
 .../schema_evol_text_vec_part_all_complex.q     |  102 +-
 .../schema_evol_text_vec_part_all_primitive.q   |  110 +-
 ...a_evol_text_vec_part_all_primitive_llap_io.q |  120 +-
 .../schema_evol_text_vec_part_llap_io.q         |  192 +-
 .../clientpositive/schema_evol_text_vec_table.q |  158 +-
 .../schema_evol_text_vec_table_llap_io.q        |  184 +-
 .../schema_evol_text_vecrow_part.q              |  166 +-
 .../schema_evol_text_vecrow_part_all_complex.q  |  102 +-
 ..._evol_text_vecrow_part_all_complex_llap_io.q |  108 +-
 ...schema_evol_text_vecrow_part_all_primitive.q |  110 +-
 ...vol_text_vecrow_part_all_primitive_llap_io.q |   24 +-
 .../schema_evol_text_vecrow_part_llap_io.q      |   20 +-
 .../schema_evol_text_vecrow_table.q             |  158 +-
 .../schema_evol_text_vecrow_table_llap_io.q     |  186 +-
 .../queries/clientpositive/schemeAuthority2.q   |    8 +-
 .../test/queries/clientpositive/scriptfile1.q   |    6 +-
 .../queries/clientpositive/select_unquote_and.q |   14 +-
 .../queries/clientpositive/select_unquote_not.q |   14 +-
 ql/src/test/queries/clientpositive/semijoin.q   |  100 +-
 ql/src/test/queries/clientpositive/semijoin2.q  |   12 +-
 ql/src/test/queries/clientpositive/semijoin3.q  |   20 +-
 ql/src/test/queries/clientpositive/semijoin5.q  |   20 +-
 ql/src/test/queries/clientpositive/semijoin6.q  |   36 +-
 .../queries/clientpositive/setop_no_distinct.q  |   48 +-
 .../test/queries/clientpositive/show_columns.q  |   36 +-
 .../clientpositive/show_create_table_alter.q    |   22 +-
 .../show_create_table_partitioned.q             |    6 +-
 .../clientpositive/show_create_table_serde.q    |   26 +-
 .../clientpositive/show_materialized_views.q    |    6 +-
 .../test/queries/clientpositive/show_tables.q   |   24 +-
 ql/src/test/queries/clientpositive/show_views.q |   42 +-
 ql/src/test/queries/clientpositive/skewjoin.q   |   76 +-
 .../queries/clientpositive/skewjoin_mapjoin1.q  |   24 +-
 .../queries/clientpositive/skewjoin_mapjoin10.q |   32 +-
 .../queries/clientpositive/skewjoin_mapjoin11.q |   12 +-
 .../queries/clientpositive/skewjoin_mapjoin2.q  |   16 +-
 .../queries/clientpositive/skewjoin_mapjoin3.q  |   12 +-
 .../queries/clientpositive/skewjoin_mapjoin4.q  |   16 +-
 .../queries/clientpositive/skewjoin_mapjoin5.q  |   28 +-
 .../queries/clientpositive/skewjoin_mapjoin6.q  |   14 +-
 .../queries/clientpositive/skewjoin_mapjoin7.q  |   16 +-
 .../queries/clientpositive/skewjoin_mapjoin8.q  |   20 +-
 .../queries/clientpositive/skewjoin_mapjoin9.q  |   20 +-
 .../clientpositive/skewjoin_onesideskew.q       |    6 +-
 .../clientpositive/skewjoin_union_remove_1.q    |   38 +-
 .../clientpositive/skewjoin_union_remove_2.q    |   16 +-
 .../test/queries/clientpositive/skewjoinopt1.q  |   24 +-
 .../test/queries/clientpositive/skewjoinopt10.q |   14 +-
 .../test/queries/clientpositive/skewjoinopt11.q |   16 +-
 .../test/queries/clientpositive/skewjoinopt12.q |   12 +-
 .../test/queries/clientpositive/skewjoinopt13.q |   20 +-
 .../test/queries/clientpositive/skewjoinopt14.q |   20 +-
 .../test/queries/clientpositive/skewjoinopt15.q |   32 +-
 .../test/queries/clientpositive/skewjoinopt16.q |   12 +-
 .../test/queries/clientpositive/skewjoinopt17.q |   28 +-
 .../test/queries/clientpositive/skewjoinopt18.q |   16 +-
 .../test/queries/clientpositive/skewjoinopt19.q |   12 +-
 .../test/queries/clientpositive/skewjoinopt2.q  |   24 +-
 .../test/queries/clientpositive/skewjoinopt20.q |   12 +-
 .../test/queries/clientpositive/skewjoinopt21.q |   16 +-
 .../test/queries/clientpositive/skewjoinopt3.q  |   16 +-
 .../test/queries/clientpositive/skewjoinopt4.q  |   16 +-
 .../test/queries/clientpositive/skewjoinopt5.q  |   12 +-
 .../test/queries/clientpositive/skewjoinopt6.q  |   12 +-
 .../test/queries/clientpositive/skewjoinopt8.q  |   16 +-
 .../test/queries/clientpositive/skewjoinopt9.q  |   28 +-
 .../test/queries/clientpositive/smb_mapjoin_1.q |   48 +-
 .../queries/clientpositive/smb_mapjoin_11.q     |   28 +-
 .../queries/clientpositive/smb_mapjoin_12.q     |   30 +-
 .../queries/clientpositive/smb_mapjoin_13.q     |   24 +-
 .../queries/clientpositive/smb_mapjoin_14.q     |   96 +-
 .../queries/clientpositive/smb_mapjoin_15.q     |   40 +-
 .../queries/clientpositive/smb_mapjoin_16.q     |   12 +-
 .../queries/clientpositive/smb_mapjoin_17.q     |   64 +-
 .../queries/clientpositive/smb_mapjoin_18.q     |   70 +-
 .../queries/clientpositive/smb_mapjoin_19.q     |   48 +-
 .../test/queries/clientpositive/smb_mapjoin_2.q |   44 +-
 .../queries/clientpositive/smb_mapjoin_21.q     |   50 +-
 .../queries/clientpositive/smb_mapjoin_22.q     |   48 +-
 .../queries/clientpositive/smb_mapjoin_25.q     |   22 +-
 .../test/queries/clientpositive/smb_mapjoin_3.q |   44 +-
 .../queries/clientpositive/smb_mapjoin_46.q     |  228 +-
 .../queries/clientpositive/smb_mapjoin_47.q     |  176 +-
 .../test/queries/clientpositive/smb_mapjoin_5.q |   64 +-
 .../test/queries/clientpositive/smb_mapjoin_6.q |   68 +-
 .../test/queries/clientpositive/smb_mapjoin_8.q |   66 +-
 .../clientpositive/sort_merge_join_desc_1.q     |   16 +-
 .../clientpositive/sort_merge_join_desc_2.q     |   16 +-
 .../clientpositive/sort_merge_join_desc_3.q     |   16 +-
 .../clientpositive/sort_merge_join_desc_5.q     |   14 +-
 .../clientpositive/sort_merge_join_desc_6.q     |   14 +-
 .../clientpositive/sort_merge_join_desc_7.q     |   22 +-
 .../clientpositive/sort_merge_join_desc_8.q     |   16 +-
 .../clientpositive/spark_constprog_dpp.q        |   14 +-
 .../spark_dynamic_partition_pruning.q           |  182 +-
 .../spark_dynamic_partition_pruning_2.q         |   74 +-
 .../spark_dynamic_partition_pruning_4.q         |   56 +-
 .../spark_dynamic_partition_pruning_5.q         |   16 +-
 ...ark_dynamic_partition_pruning_mapjoin_only.q |   24 +-
 .../clientpositive/spark_explainuser_1.q        |  160 +-
 .../spark_multi_insert_parallel_orderby.q       |   48 +-
 ...spark_vectorized_dynamic_partition_pruning.q |  118 +-
 .../special_character_in_tabnames_1.q           |   40 +-
 ql/src/test/queries/clientpositive/sqlmerge.q   |    8 +-
 ql/src/test/queries/clientpositive/stats1.q     |   14 +-
 ql/src/test/queries/clientpositive/stats10.q    |   22 +-
 ql/src/test/queries/clientpositive/stats11.q    |   90 +-
 ql/src/test/queries/clientpositive/stats12.q    |   18 +-
 ql/src/test/queries/clientpositive/stats15.q    |   34 +-
 ql/src/test/queries/clientpositive/stats18.q    |   12 +-
 ql/src/test/queries/clientpositive/stats3.q     |   38 +-
 ql/src/test/queries/clientpositive/stats6.q     |   18 +-
 ql/src/test/queries/clientpositive/stats7.q     |   14 +-
 ql/src/test/queries/clientpositive/stats8.q     |   44 +-
 .../clientpositive/stats_aggregator_error_1.q   |   18 +-
 ql/src/test/queries/clientpositive/stats_date.q |   16 +-
 .../clientpositive/stats_empty_dyn_part.q       |    6 +-
 .../clientpositive/stats_empty_partition.q      |    6 +-
 .../clientpositive/stats_empty_partition2.q     |   22 +-
 .../queries/clientpositive/stats_noscan_1.q     |   22 +-
 ql/src/test/queries/clientpositive/statsfs.q    |   54 +-
 .../queries/clientpositive/struct_in_view.q     |   24 +-
 ql/src/test/queries/clientpositive/structin.q   |    6 +-
 .../queries/clientpositive/subquery_exists.q    |   48 +-
 .../clientpositive/subquery_exists_having.q     |    4 +-
 .../test/queries/clientpositive/subquery_in.q   |   46 +-
 .../queries/clientpositive/subquery_in_having.q |   20 +-
 .../queries/clientpositive/subquery_notin.q     |   66 +-
 .../clientpositive/subquery_notin_having.q      |   20 +-
 .../queries/clientpositive/subquery_scalar.q    |  134 +-
 .../queries/clientpositive/subquery_select.q    |   22 +-
 .../clientpositive/subquery_unqualcolumnrefs.q  |    6 +-
 .../clientpositive/table_access_keys_stats.q    |  122 +-
 .../test/queries/clientpositive/tablevalues.q   |   34 +-
 ql/src/test/queries/clientpositive/temp_table.q |   26 +-
 .../queries/clientpositive/temp_table_gb1.q     |    8 +-
 .../temp_table_windowing_expressions.q          |   10 +-
 .../queries/clientpositive/testSetQueryString.q |    6 +-
 ql/src/test/queries/clientpositive/tez-tag.q    |   48 +-
 .../clientpositive/tez_bmj_schema_evolution.q   |   14 +-
 ql/src/test/queries/clientpositive/tez_fsstat.q |   18 +-
 ql/src/test/queries/clientpositive/tez_join.q   |   28 +-
 .../clientpositive/tez_schema_evolution.q       |   16 +-
 .../test/queries/clientpositive/tez_smb_empty.q |   54 +-
 .../test/queries/clientpositive/tez_smb_main.q  |   84 +-
 ql/src/test/queries/clientpositive/tez_union.q  |   16 +-
 .../tez_union_dynamic_partition.q               |   14 +-
 .../tez_union_dynamic_partition_2.q             |   30 +-
 .../queries/clientpositive/tez_union_group_by.q |   44 +-
 .../clientpositive/tez_union_multiinsert.q      |   64 +-
 .../test/queries/clientpositive/timestamp_udf.q |   26 +-
 .../test/queries/clientpositive/timestamptz_3.q |   14 +-
 .../queries/clientpositive/truncate_column.q    |   48 +-
 .../truncate_column_list_bucket.q               |   18 +-
 .../clientpositive/truncate_column_merge.q      |   16 +-
 .../test/queries/clientpositive/tunable_ndv.q   |   38 +-
 .../clientpositive/type_change_test_int.q       |  328 +-
 .../test/queries/clientpositive/type_widening.q |   12 +-
 .../queries/clientpositive/typechangetest.q     |  280 +-
 .../test/queries/clientpositive/uber_reduce.q   |    6 +-
 .../clientpositive/udaf_binarysetfunctions.q    |   70 +-
 .../udaf_binarysetfunctions_no_cbo.q            |   68 +-
 .../clientpositive/udaf_context_ngrams.q        |   16 +-
 ql/src/test/queries/clientpositive/udaf_corr.q  |   18 +-
 .../queries/clientpositive/udaf_covar_samp.q    |   18 +-
 .../clientpositive/udaf_percentile_approx_20.q  |   50 +-
 .../clientpositive/udaf_percentile_approx_23.q  |  162 +-
 ql/src/test/queries/clientpositive/udf1.q       |    8 +-
 ql/src/test/queries/clientpositive/udf2.q       |    8 +-
 ql/src/test/queries/clientpositive/udf3.q       |    8 +-
 ql/src/test/queries/clientpositive/udf4.q       |    8 +-
 ql/src/test/queries/clientpositive/udf5.q       |   12 +-
 ql/src/test/queries/clientpositive/udf6.q       |   12 +-
 ql/src/test/queries/clientpositive/udf7.q       |    8 +-
 ql/src/test/queries/clientpositive/udf8.q       |   10 +-
 .../test/queries/clientpositive/udf_10_trims.q  |    6 +-
 .../clientpositive/udf_character_length.q       |   26 +-
 .../queries/clientpositive/udf_concat_insert1.q |    6 +-
 .../queries/clientpositive/udf_concat_insert2.q |    6 +-
 .../test/queries/clientpositive/udf_concat_ws.q |   26 +-
 ql/src/test/queries/clientpositive/udf_field.q  |   12 +-
 .../clientpositive/udf_get_json_object.q        |   12 +-
 ql/src/test/queries/clientpositive/udf_isops.q  |   28 +-
 ql/src/test/queries/clientpositive/udf_length.q |   18 +-
 .../queries/clientpositive/udf_octet_length.q   |   22 +-
 ql/src/test/queries/clientpositive/udf_printf.q |    8 +-
 .../test/queries/clientpositive/udf_reverse.q   |   16 +-
 .../test/queries/clientpositive/udf_round_2.q   |   10 +-
 .../queries/clientpositive/udf_sort_array.q     |    6 +-
 .../queries/clientpositive/udf_stddev_samp.q    |   12 +-
 .../clientpositive/udf_to_unix_timestamp.q      |   12 +-
 .../queries/clientpositive/udf_unix_timestamp.q |    4 +-
 .../test/queries/clientpositive/udf_var_samp.q  |   12 +-
 .../queries/clientpositive/udf_width_bucket.q   |   14 +-
 .../queries/clientpositive/udtf_json_tuple.q    |    8 +-
 .../clientpositive/udtf_replicate_rows.q        |   16 +-
 ql/src/test/queries/clientpositive/union10.q    |    8 +-
 ql/src/test/queries/clientpositive/union12.q    |    8 +-
 ql/src/test/queries/clientpositive/union17.q    |   16 +-
 ql/src/test/queries/clientpositive/union18.q    |   16 +-
 ql/src/test/queries/clientpositive/union19.q    |   16 +-
 ql/src/test/queries/clientpositive/union24.q    |   48 +-
 ql/src/test/queries/clientpositive/union27.q    |   10 +-
 ql/src/test/queries/clientpositive/union29.q    |    8 +-
 ql/src/test/queries/clientpositive/union3.q     |    6 +-
 ql/src/test/queries/clientpositive/union30.q    |    8 +-
 ql/src/test/queries/clientpositive/union31.q    |   88 +-
 ql/src/test/queries/clientpositive/union32.q    |   44 +-
 ql/src/test/queries/clientpositive/union33.q    |   14 +-
 ql/src/test/queries/clientpositive/union34.q    |   32 +-
 ql/src/test/queries/clientpositive/union4.q     |    8 +-
 ql/src/test/queries/clientpositive/union6.q     |    8 +-
 .../queries/clientpositive/unionDistinct_1.q    |  254 +-
 .../queries/clientpositive/unionDistinct_2.q    |   24 +-
 .../queries/clientpositive/unionDistinct_3.q    |   12 +-
 .../queries/clientpositive/union_fast_stats.q   |   80 +-
 .../test/queries/clientpositive/union_paren.q   |   16 +-
 .../queries/clientpositive/union_pos_alias.q    |   16 +-
 .../queries/clientpositive/union_remove_10.q    |   28 +-
 .../queries/clientpositive/union_remove_11.q    |   28 +-
 .../queries/clientpositive/union_remove_12.q    |   24 +-
 .../queries/clientpositive/union_remove_13.q    |   24 +-
 .../queries/clientpositive/union_remove_14.q    |   24 +-
 .../queries/clientpositive/union_remove_15.q    |   28 +-
 .../queries/clientpositive/union_remove_16.q    |   28 +-
 .../queries/clientpositive/union_remove_17.q    |   28 +-
 .../queries/clientpositive/union_remove_18.q    |   30 +-
 .../queries/clientpositive/union_remove_19.q    |   52 +-
 .../queries/clientpositive/union_remove_2.q     |   28 +-
 .../queries/clientpositive/union_remove_20.q    |   24 +-
 .../queries/clientpositive/union_remove_21.q    |   24 +-
 .../queries/clientpositive/union_remove_22.q    |   38 +-
 .../queries/clientpositive/union_remove_23.q    |   24 +-
 .../queries/clientpositive/union_remove_24.q    |   24 +-
 .../queries/clientpositive/union_remove_25.q    |   44 +-
 .../queries/clientpositive/union_remove_26.q    |   26 +-
 .../queries/clientpositive/union_remove_3.q     |   28 +-
 .../queries/clientpositive/union_remove_4.q     |   24 +-
 .../queries/clientpositive/union_remove_5.q     |   28 +-
 .../queries/clientpositive/union_remove_6.q     |   28 +-
 .../clientpositive/union_remove_6_subq.q        |   20 +-
 .../queries/clientpositive/union_remove_7.q     |   24 +-
 .../queries/clientpositive/union_remove_8.q     |   28 +-
 .../queries/clientpositive/union_remove_9.q     |   28 +-
 .../test/queries/clientpositive/union_stats.q   |   36 +-
 ql/src/test/queries/clientpositive/union_view.q |   86 +-
 ql/src/test/queries/clientpositive/uniquejoin.q |   24 +-
 .../queries/clientpositive/updateAccessTime.q   |   34 +-
 .../queries/clientpositive/updateBasicStats.q   |   50 +-
 .../update_access_time_non_current_db.q         |    6 +-
 .../test/queries/clientpositive/varchar_join1.q |   30 +-
 .../clientpositive/vector_adaptor_usage_mode.q  |   68 +-
 .../queries/clientpositive/vector_aggregate_9.q |   20 +-
 .../vector_annotate_stats_select.q              |   80 +-
 .../clientpositive/vector_auto_smb_mapjoin_14.q |  132 +-
 .../clientpositive/vector_binary_join_groupby.q |    8 +-
 .../clientpositive/vector_cast_constant.q       |   16 +-
 .../test/queries/clientpositive/vector_char_2.q |   18 +-
 .../queries/clientpositive/vector_char_cast.q   |    8 +-
 .../queries/clientpositive/vector_coalesce_3.q  |   16 +-
 .../queries/clientpositive/vector_complex_all.q |   66 +-
 .../clientpositive/vector_complex_join.q        |   26 +-
 .../clientpositive/vector_create_struct_table.q |   24 +-
 .../queries/clientpositive/vector_data_types.q  |   28 +-
 .../queries/clientpositive/vector_decimal_3.q   |   32 +-
 .../queries/clientpositive/vector_decimal_4.q   |   24 +-
 .../clientpositive/vector_decimal_expressions.q |   20 +-
 .../clientpositive/vector_decimal_mapjoin.q     |   20 +-
 .../clientpositive/vector_decimal_math_funcs.q  |    8 +-
 .../queries/clientpositive/vector_decimal_udf.q |  146 +-
 .../clientpositive/vector_decimal_udf2.q        |   22 +-
 .../queries/clientpositive/vector_distinct_2.q  |   12 +-
 .../queries/clientpositive/vector_groupby4.q    |   14 +-
 .../queries/clientpositive/vector_groupby6.q    |   14 +-
 .../queries/clientpositive/vector_groupby_3.q   |   12 +-
 .../clientpositive/vector_groupby_cube1.q       |   42 +-
 .../vector_groupby_grouping_id1.q               |   26 +-
 .../vector_groupby_grouping_id2.q               |   54 +-
 .../vector_groupby_grouping_id3.q               |   14 +-
 .../vector_groupby_grouping_sets1.q             |   36 +-
 .../vector_groupby_grouping_sets2.q             |   26 +-
 .../vector_groupby_grouping_sets3.q             |   20 +-
 .../vector_groupby_grouping_sets3_dec.q         |   20 +-
 .../vector_groupby_grouping_sets4.q             |   26 +-
 .../vector_groupby_grouping_sets5.q             |   16 +-
 .../vector_groupby_grouping_sets6.q             |   14 +-
 .../vector_groupby_grouping_sets_grouping.q     |   66 +-
 .../vector_groupby_grouping_sets_limit.q        |   30 +-
 .../vector_groupby_grouping_window.q            |    8 +-
 .../clientpositive/vector_groupby_reduce.q      |   26 +-
 .../clientpositive/vector_groupby_rollup1.q     |   38 +-
 .../clientpositive/vector_groupby_sort_11.q     |   32 +-
 .../clientpositive/vector_groupby_sort_8.q      |   12 +-
 .../clientpositive/vector_grouping_sets.q       |   12 +-
 .../clientpositive/vector_include_no_sel.q      |   14 +-
 .../test/queries/clientpositive/vector_join30.q |   86 +-
 .../clientpositive/vector_join_filters.q        |   48 +-
 .../queries/clientpositive/vector_join_nulls.q  |   42 +-
 .../clientpositive/vector_leftsemi_mapjoin.q    |  498 +-
 .../queries/clientpositive/vector_llap_text_1.q |   32 +-
 .../queries/clientpositive/vector_map_order.q   |    8 +-
 .../vector_mr_diff_schema_alias.q               |   18 +-
 .../clientpositive/vector_null_projection.q     |   16 +-
 .../vector_number_compare_projection.q          |   10 +-
 .../vector_orc_nested_column_pruning.q          |   10 +-
 .../clientpositive/vector_orc_null_check.q      |   12 +-
 .../queries/clientpositive/vector_order_null.q  |   58 +-
 .../queries/clientpositive/vector_orderby_5.q   |   12 +-
 .../queries/clientpositive/vector_outer_join2.q |   48 +-
 .../queries/clientpositive/vector_outer_join3.q |   68 +-
 .../queries/clientpositive/vector_outer_join6.q |   12 +-
 .../vector_outer_reference_windowed.q           |  100 +-
 .../vector_partitioned_date_time.q              |    8 +-
 .../queries/clientpositive/vector_reduce1.q     |   12 +-
 .../queries/clientpositive/vector_reduce2.q     |   12 +-
 .../queries/clientpositive/vector_reduce3.q     |   12 +-
 .../vector_reduce_groupby_decimal.q             |   10 +-
 .../clientpositive/vector_retry_failure.q       |    8 +-
 .../clientpositive/vector_string_concat.q       |   12 +-
 .../clientpositive/vector_string_decimal.q      |   10 +-
 .../queries/clientpositive/vector_struct_in.q   |   24 +-
 .../clientpositive/vector_tablesample_rows.q    |   10 +-
 .../test/queries/clientpositive/vector_udf1.q   |  124 +-
 .../vector_udf_character_length.q               |   30 +-
 .../clientpositive/vector_udf_octet_length.q    |   26 +-
 .../vector_udf_string_to_boolean.q              |   30 +-
 .../queries/clientpositive/vector_varchar_4.q   |   16 +-
 .../clientpositive/vector_varchar_simple.q      |   16 +-
 .../clientpositive/vector_when_case_null.q      |    8 +-
 .../queries/clientpositive/vector_windowing.q   |   42 +-
 .../vector_windowing_expressions.q              |   40 +-
 .../vector_windowing_multipartitioning.q        |   30 +-
 .../clientpositive/vector_windowing_navfn.q     |   30 +-
 .../vector_windowing_order_null.q               |   40 +-
 .../vector_windowing_range_multiorder.q         |   50 +-
 .../clientpositive/vector_windowing_rank.q      |   46 +-
 .../clientpositive/vector_windowing_streaming.q |   14 +-
 .../vector_windowing_windowspec.q               |   50 +-
 .../vector_windowing_windowspec4.q              |   10 +-
 .../queries/clientpositive/vectorization_0.q    |   10 +-
 .../vectorization_input_format_excludes.q       |   40 +-
 .../vectorization_parquet_ppd_decimal.q         |  108 +-
 .../vectorization_parquet_projection.q          |   14 +-
 .../queries/clientpositive/vectorization_part.q |   10 +-
 .../queries/clientpositive/vectorized_case.q    |   32 +-
 .../clientpositive/vectorized_date_funcs.q      |    6 +-
 .../vectorized_dynamic_partition_pruning.q      |  168 +-
 .../queries/clientpositive/vectorized_join46.q  |  228 +-
 .../clientpositive/vectorized_parquet_types.q   |   50 +-
 .../queries/clientpositive/vectorized_ptf.q     |    6 +-
 .../clientpositive/vectorized_rcfile_columnar.q |    8 +-
 .../clientpositive/vectorized_timestamp.q       |   32 +-
 ql/src/test/queries/clientpositive/view.q       |   34 +-
 ql/src/test/queries/clientpositive/view_alias.q |   56 +-
 .../clientpositive/view_authorization_sqlstd.q  |   34 +-
 ql/src/test/queries/clientpositive/view_cbo.q   |   58 +-
 .../clientpositive/windowing_duplicate.q        |    2 +-
 .../clientpositive/windowing_expressions.q      |   24 +-
 .../windowing_multipartitioning.q               |   18 +-
 .../queries/clientpositive/windowing_navfn.q    |   30 +-
 .../queries/clientpositive/windowing_ntile.q    |   14 +-
 .../clientpositive/windowing_range_multiorder.q |   28 +-
 .../queries/clientpositive/windowing_rank.q     |   26 +-
 .../clientpositive/windowing_streaming.q        |   24 +-
 .../queries/clientpositive/windowing_udaf.q     |   16 +-
 .../clientpositive/windowing_windowspec.q       |   30 +-
 .../clientpositive/windowing_windowspec2.q      |   62 +-
 .../clientpositive/windowing_windowspec3.q      |   16 +-
 .../results/clientpositive/acid_nullscan.q.out  |   64 +-
 .../acid_vectorization_project.q.out            |   46 +-
 .../clientpositive/add_part_multiple.q.out      |  100 +-
 .../allow_change_col_type_par.q.out             |   20 +-
 ql/src/test/results/clientpositive/alter5.q.out |  124 +-
 .../clientpositive/alterColumnStats.q.out       |   78 +-
 .../alter_change_db_location.q.out              |   20 +-
 .../clientpositive/alter_file_format.q.out      |  164 +-
 .../results/clientpositive/alter_merge.q.out    |  226 +-
 .../results/clientpositive/alter_merge_2.q.out  |  122 +-
 ...lter_numbuckets_partitioned_table2_h23.q.out |  374 +-
 ...alter_numbuckets_partitioned_table_h23.q.out |  230 +-
 .../alter_partition_with_whitelist.q.out        |   42 +-
 .../alter_rename_partition_authorization.q.out  |  138 +-
 .../clientpositive/alter_table_serde.q.out      |  190 +-
 .../clientpositive/alter_table_serde2.q.out     |   80 +-
 .../alter_table_stats_status.q.out              |  202 +-
 .../alter_table_update_status.q.out             |  592 +-
 .../clientpositive/alter_view_rename.q.out      |   38 +-
 .../analyze_table_null_partition.q.out          |  188 +-
 .../clientpositive/analyze_tbl_date.q.out       |   52 +-
 .../clientpositive/analyze_tbl_part.q.out       |  112 +-
 .../annotate_stats_deep_filters.q.out           |   60 +-
 .../clientpositive/annotate_stats_groupby.q.out |  218 +-
 .../clientpositive/annotate_stats_join.q.out    |  148 +-
 .../annotate_stats_join_pkfk.q.out              |  156 +-
 .../clientpositive/annotate_stats_limit.q.out   |   90 +-
 .../clientpositive/annotate_stats_part.q.out    |  220 +-
 .../clientpositive/annotate_stats_table.q.out   |   22 +-
 .../clientpositive/annotate_stats_union.q.out   |  204 +-
 .../archive_excludeHadoop20.q.out               |  252 +-
 .../clientpositive/array_size_estimation.q.out  |   42 +-
 .../clientpositive/authorization_1.q.out        |  260 +-
 .../clientpositive/authorization_3.q.out        |   98 +-
 .../clientpositive/authorization_4.q.out        |   46 +-
 .../clientpositive/authorization_6.q.out        |  274 +-
 .../clientpositive/authorization_9.q.out        |  108 +-
 .../authorization_admin_almighty1.q.out         |   48 +-
 ...authorization_cli_createtab_noauthzapi.q.out |   22 +-
 .../authorization_cli_nonsql.q.out              |   20 +-
 .../authorization_cli_stdconfigauth.q.out       |   16 +-
 .../authorization_grant_option_role.q.out       |   72 +-
 .../clientpositive/authorization_non_id.q.out   |   44 +-
 .../authorization_owner_actions.q.out           |   78 +-
 .../clientpositive/authorization_parts.q.out    |   64 +-
 .../authorization_show_grant.q.out              |  156 +-
 .../clientpositive/authorization_update.q.out   |   16 +-
 .../authorization_update_own_table.q.out        |   20 +-
 .../clientpositive/authorization_view_1.q.out   |  246 +-
 .../clientpositive/authorization_view_2.q.out   |   72 +-
 .../clientpositive/authorization_view_3.q.out   |   80 +-
 .../clientpositive/authorization_view_4.q.out   |   72 +-
 .../authorization_view_disable_cbo_1.q.out      |  270 +-
 .../authorization_view_disable_cbo_2.q.out      |   72 +-
 .../authorization_view_disable_cbo_3.q.out      |   64 +-
 .../authorization_view_disable_cbo_4.q.out      |   72 +-
 .../clientpositive/autoColumnStats_1.q.out      |  886 +--
 .../clientpositive/autoColumnStats_10.q.out     |  240 +-
 .../clientpositive/autoColumnStats_2.q.out      |  494 +-
 .../clientpositive/autoColumnStats_3.q.out      |  190 +-
 .../clientpositive/autoColumnStats_5.q.out      |  178 +-
 .../clientpositive/autoColumnStats_7.q.out      |   52 +-
 .../clientpositive/autoColumnStats_9.q.out      |   56 +-
 .../results/clientpositive/auto_join1.q.out     |   38 +-
 .../results/clientpositive/auto_join14.q.out    |   38 +-
 .../results/clientpositive/auto_join17.q.out    |   42 +-
 .../results/clientpositive/auto_join19.q.out    |   38 +-
 .../clientpositive/auto_join19_inclause.q.out   |   38 +-
 .../results/clientpositive/auto_join24.q.out    |   32 +-
 .../results/clientpositive/auto_join25.q.out    |   84 +-
 .../results/clientpositive/auto_join3.q.out     |   38 +-
 .../results/clientpositive/auto_join4.q.out     |   42 +-
 .../results/clientpositive/auto_join5.q.out     |   42 +-
 .../results/clientpositive/auto_join6.q.out     |   42 +-
 .../results/clientpositive/auto_join7.q.out     |   46 +-
 .../results/clientpositive/auto_join8.q.out     |   42 +-
 .../results/clientpositive/auto_join9.q.out     |   38 +-
 .../clientpositive/auto_join_stats.q.out        |  102 +-
 .../clientpositive/avro_add_column.q.out        |   52 +-
 .../clientpositive/avro_add_column3.q.out       |   72 +-
 .../avro_alter_table_update_columns.q.out       |  208 +-
 .../avro_compression_enabled.q.out              |   16 +-
 .../avro_compression_enabled_native.q.out       |   16 +-
 .../results/clientpositive/avro_decimal.q.out   |  156 +-
 .../results/clientpositive/avro_joins.q.out     |   64 +-
 .../clientpositive/avro_joins_native.q.out      |   32 +-
 .../results/clientpositive/avro_native.q.out    |   32 +-
 .../clientpositive/avro_partitioned.q.out       |  246 +-
 .../clientpositive/avro_sanity_test.q.out       |   36 +-
 .../avro_schema_evolution_native.q.out          |  314 +-
 .../avro_tableproperty_optimize.q.out           |   76 +-
 .../clientpositive/avrocountemptytbl.q.out      |   60 +-
 .../results/clientpositive/avrotblsjoin.q.out   |   34 +-
 .../test/results/clientpositive/ba_table1.q.out |   52 +-
 .../test/results/clientpositive/ba_table2.q.out |   64 +-
 .../test/results/clientpositive/ba_table3.q.out |   44 +-
 .../results/clientpositive/ba_table_udfs.q.out  |   48 +-
 .../beeline/colstats_all_nulls.q.out            |   36 +-
 .../beeline/create_merge_compressed.q.out       |  136 +-
 .../beeline/explain_outputs.q.out               |   80 +-
 .../insert_overwrite_local_directory_1.q.out    |  120 +-
 .../clientpositive/beeline/mapjoin2.q.out       |   56 +-
 .../materialized_view_create_rewrite.q.out      |  244 +-
 .../clientpositive/beeline/smb_mapjoin_1.q.out  |  192 +-
 .../clientpositive/beeline/smb_mapjoin_11.q.out |  216 +-
 .../clientpositive/beeline/smb_mapjoin_12.q.out |  240 +-
 .../clientpositive/beeline/smb_mapjoin_13.q.out |  144 +-
 .../clientpositive/beeline/smb_mapjoin_16.q.out |   56 +-
 .../clientpositive/beeline/smb_mapjoin_2.q.out  |  176 +-
 .../clientpositive/beeline/smb_mapjoin_3.q.out  |  176 +-
 .../beeline/udf_unix_timestamp.q.out            |   24 +-
 .../clientpositive/binary_output_format.q.out   |   80 +-
 .../binary_table_bincolserde.q.out              |   64 +-
 .../clientpositive/binary_table_colserde.q.out  |   64 +-
 .../clientpositive/binarysortable_1.q.out       |  Bin 4339 -> 4384 bytes
 .../bucket_if_with_path_filter.q.out            |   24 +-
 .../clientpositive/bucket_map_join_1.q.out      |   72 +-
 .../clientpositive/bucket_map_join_spark1.q.out |  356 +-
 .../clientpositive/bucket_map_join_spark2.q.out |  372 +-
 .../clientpositive/bucket_map_join_spark3.q.out |  372 +-
 .../clientpositive/bucket_map_join_spark4.q.out |  132 +-
 .../clientpositive/bucketcontext_1.q.out        |  226 +-
 .../clientpositive/bucketcontext_2.q.out        |  210 +-
 .../clientpositive/bucketcontext_3.q.out        |  194 +-
 .../clientpositive/bucketcontext_5.q.out        |  128 +-
 .../clientpositive/bucketcontext_6.q.out        |  188 +-
 .../clientpositive/bucketcontext_7.q.out        |  268 +-
 .../clientpositive/bucketcontext_8.q.out        |  268 +-
 .../bucketizedhiveinputformat_auto.q.out        |  174 +-
 .../clientpositive/bucketmapjoin10.q.out        |  224 +-
 .../clientpositive/bucketmapjoin11.q.out        |  312 +-
 .../clientpositive/bucketmapjoin12.q.out        |   66 +-
 .../clientpositive/bucketmapjoin13.q.out        |  306 +-
 .../results/clientpositive/bucketmapjoin5.q.out |  212 +-
 .../results/clientpositive/bucketmapjoin8.q.out |  176 +-
 .../results/clientpositive/bucketmapjoin9.q.out |  226 +-
 .../clientpositive/bucketmapjoin_negative.q.out |  152 +-
 .../bucketmapjoin_negative2.q.out               |  174 +-
 .../bucketmapjoin_negative3.q.out               |  232 +-
 .../bucketsortoptimize_insert_1.q.out           |  210 +-
 .../bucketsortoptimize_insert_3.q.out           |  176 +-
 .../bucketsortoptimize_insert_4.q.out           |  222 +-
 .../bucketsortoptimize_insert_5.q.out           |  198 +-
 .../bucketsortoptimize_insert_8.q.out           |  192 +-
 .../clientpositive/case_sensitivity.q.out       |   42 +-
 ql/src/test/results/clientpositive/cast1.q.out  |   52 +-
 .../clientpositive/cast_on_constant.q.out       |   50 +-
 .../clientpositive/cast_tinyint_to_double.q.out |   38 +-
 .../cbo_SortUnionTransposeRule.q.out            |   92 +-
 .../test/results/clientpositive/cbo_const.q.out |   24 +-
 .../cbo_rp_annotate_stats_groupby.q.out         |  218 +-
 .../clientpositive/cbo_rp_auto_join1.q.out      |  372 +-
 .../clientpositive/cbo_rp_auto_join17.q.out     |   42 +-
 .../cbo_rp_cross_product_check_2.q.out          |   80 +-
 .../cbo_rp_gby2_map_multi_distinct.q.out        |   80 +-
 .../cbo_rp_groupby3_noskew_multi_distinct.q.out |   56 +-
 .../results/clientpositive/cbo_rp_join1.q.out   |   64 +-
 .../cbo_rp_udaf_percentile_approx_23.q.out      |  612 +-
 .../clientpositive/cbo_subq_exists.q.out        |   20 +-
 ql/src/test/results/clientpositive/char_2.q.out |   52 +-
 .../results/clientpositive/char_join1.q.out     |   40 +-
 .../clientpositive/char_pad_convert.q.out       |   80 +-
 .../clientpositive/colstats_all_nulls.q.out     |   36 +-
 .../column_pruner_multiple_children.q.out       |   80 +-
 .../clientpositive/columnstats_infinity.q.out   |  188 +-
 .../clientpositive/columnstats_partlvl_dp.q.out |  600 +-
 .../test/results/clientpositive/combine2.q.out  |  112 +-
 .../clientpositive/comma_in_column_name.q.out   |   64 +-
 .../test/results/clientpositive/constGby.q.out  |  122 +-
 .../clientpositive/constantPropWhen.q.out       |  136 +-
 .../clientpositive/constant_prop_1.q.out        |   14 +-
 .../clientpositive/constantfolding.q.out        |  116 +-
 .../results/clientpositive/constprog_dp.q.out   |   34 +-
 .../results/clientpositive/constprog_type.q.out |   40 +-
 .../clientpositive/correlated_join_keys.q.out   |   64 +-
 .../clientpositive/correlationoptimizer11.q.out |  104 +-
 .../clientpositive/correlationoptimizer5.q.out  |  172 +-
 .../clientpositive/correlationoptimizer9.q.out  |  104 +-
 .../test/results/clientpositive/create_1.q.out  |   76 +-
 .../results/clientpositive/create_escape.q.out  |   44 +-
 .../clientpositive/create_genericudf.q.out      |   38 +-
 .../results/clientpositive/create_like.q.out    |  296 +-
 .../results/clientpositive/create_like2.q.out   |   36 +-
 .../clientpositive/create_like_tbl_props.q.out  |   80 +-
 .../clientpositive/create_like_view.q.out       |  240 +-
 .../create_merge_compressed.q.out               |  136 +-
 .../clientpositive/create_nested_type.q.out     |   40 +-
 .../create_table_like_stats.q.out               |  100 +-
 .../results/clientpositive/create_udaf.q.out    |   26 +-
 .../results/clientpositive/create_view.q.out    |  152 +-
 .../create_view_partitioned.q.out               |   58 +-
 .../clientpositive/create_view_translate.q.out  |   34 +-
 .../create_with_constraints.q.out               |  472 +-
 .../create_with_constraints2.q.out              |   56 +-
 .../clientpositive/cross_product_check_1.q.out  |   64 +-
 .../clientpositive/cross_product_check_2.q.out  |   80 +-
 .../test/results/clientpositive/cteViews.q.out  |  158 +-
 ql/src/test/results/clientpositive/cte_2.q.out  |  134 +-
 ql/src/test/results/clientpositive/cte_4.q.out  |  100 +-
 ql/src/test/results/clientpositive/cte_5.q.out  |   42 +-
 ql/src/test/results/clientpositive/cte_7.q.out  |   54 +-
 .../results/clientpositive/database_drop.q.out  |   60 +-
 .../clientpositive/database_location.q.out      |   18 +-
 .../clientpositive/dbtxnmgr_compact1.q.out      |   28 +-
 .../clientpositive/dbtxnmgr_compact2.q.out      |   48 +-
 .../clientpositive/dbtxnmgr_compact3.q.out      |   28 +-
 .../results/clientpositive/dbtxnmgr_ddl1.q.out  |  312 +-
 .../clientpositive/dbtxnmgr_query1.q.out        |   80 +-
 .../clientpositive/dbtxnmgr_query2.q.out        |   80 +-
 .../clientpositive/dbtxnmgr_query3.q.out        |  112 +-
 .../clientpositive/dbtxnmgr_query4.q.out        |  122 +-
 .../clientpositive/dbtxnmgr_query5.q.out        |   68 +-
 .../test/results/clientpositive/decimal_1.q.out |  130 +-
 .../results/clientpositive/decimal_10_0.q.out   |   40 +-
 .../test/results/clientpositive/decimal_2.q.out |  264 +-
 .../test/results/clientpositive/decimal_5.q.out |   64 +-
 .../test/results/clientpositive/decimal_6.q.out |   84 +-
 .../results/clientpositive/decimal_join2.q.out  |   52 +-
 .../clientpositive/decimal_precision.q.out      |  172 +-
 .../results/clientpositive/decimal_stats.q.out  |   72 +-
 .../clientpositive/decimal_trailing.q.out       |   40 +-
 .../clientpositive/default_file_format.q.out    |  152 +-
 .../results/clientpositive/deleteAnalyze.q.out  |   76 +-
 .../clientpositive/desc_tbl_part_cols.q.out     |   24 +-
 .../describe_comment_indent.q.out               |   24 +-
 ...scribe_formatted_view_partitioned_json.q.out |   48 +-
 .../results/clientpositive/describe_table.q.out |   96 +-
 .../display_colstats_tbllvl.q.out               |  260 +-
 .../results/clientpositive/distinct_stats.q.out |   62 +-
 .../clientpositive/distinct_windowing.q.out     |   62 +-
 .../distinct_windowing_no_cbo.q.out             |   90 +-
 .../drop_database_removes_partition_dirs.q.out  |   34 +-
 .../clientpositive/drop_multi_partitions.q.out  |  104 +-
 .../clientpositive/drop_partitions_filter.q.out |  254 +-
 .../drop_partitions_filter2.q.out               |  164 +-
 .../drop_partitions_filter3.q.out               |  140 +-
 .../drop_partitions_filter4.q.out               |  302 +-
 .../results/clientpositive/drop_table2.q.out    |   86 +-
 .../clientpositive/drop_table_purge.q.out       |   20 +-
 .../drop_table_removes_partition_dirs.q.out     |   42 +-
 .../clientpositive/drop_table_with_stats.q.out  |  160 +-
 .../druid/druid_timestamptz.q.out               |  212 +-
 .../druid/druidmini_expressions.q.out           |  130 +-
 .../druid/druidmini_floorTime.q.out             |  298 +-
 .../clientpositive/druid/druidmini_mv.q.out     |  260 +-
 .../clientpositive/druid/druidmini_test1.q.out  |  222 +-
 .../druid/druidmini_test_alter.q.out            |  130 +-
 .../druid/druidmini_test_insert.q.out           |  318 +-
 .../results/clientpositive/druid_basic2.q.out   |  150 +-
 .../results/clientpositive/druid_basic3.q.out   |   86 +-
 .../clientpositive/druid_intervals.q.out        |   76 +-
 .../clientpositive/druid_timeseries.q.out       |  122 +-
 .../results/clientpositive/druid_topn.q.out     |   64 +-
 .../dynamic_partition_insert.q.out              | 1002 +--
 .../dynpart_sort_opt_bucketing.q.out            |   64 +-
 .../results/clientpositive/empty_join.q.out     |   76 +-
 .../encryption_auto_purge_tables.q.out          |  150 +-
 .../encrypted/encryption_drop_table.q.out       |   36 +-
 .../encryption_insert_partition_dynamic.q.out   |  186 +-
 .../encrypted/encryption_insert_values.q.out    |   28 +-
 ...cryption_load_data_to_encrypted_tables.q.out |   48 +-
 .../encrypted/encryption_move_tbl.q.out         |  186 +-
 ...ryption_select_read_only_encrypted_tbl.q.out |   36 +-
 .../results/clientpositive/escape_crlf.q.out    |   76 +-
 .../results/clientpositive/except_all.q.out     |  248 +-
 .../clientpositive/exchange_partition3.q.out    |  118 +-
 .../exec_parallel_column_stats.q.out            |   32 +-
 .../clientpositive/exim_00_nonpart_empty.q.out  |   64 +-
 .../clientpositive/exim_01_nonpart.q.out        |   72 +-
 .../clientpositive/exim_02_00_part_empty.q.out  |   60 +-
 .../exim_03_nonpart_over_compat.q.out           |   76 +-
 .../clientpositive/exim_04_all_part.q.out       |  140 +-
 .../clientpositive/exim_04_evolved_parts.q.out  |  164 +-
 .../clientpositive/exim_05_some_part.q.out      |  120 +-
 .../clientpositive/exim_06_one_part.q.out       |  110 +-
 .../exim_07_all_part_over_nonoverlap.q.out      |  160 +-
 .../clientpositive/exim_08_nonpart_rename.q.out |   66 +-
 .../exim_09_part_spec_nonoverlap.q.out          |  158 +-
 .../exim_10_external_managed.q.out              |   66 +-
 .../exim_12_external_location.q.out             |   78 +-
 .../exim_13_managed_location.q.out              |   78 +-
 ...exim_14_managed_location_over_existing.q.out |   88 +-
 .../clientpositive/exim_15_external_part.q.out  |  198 +-
 .../clientpositive/exim_16_part_external.q.out  |  146 +-
 .../clientpositive/exim_17_part_managed.q.out   |  170 +-
 .../clientpositive/exim_18_part_external.q.out  |  144 +-
 .../exim_19_00_part_external_location.q.out     |  132 +-
 .../exim_19_part_external_location.q.out        |  144 +-
 .../exim_20_part_managed_location.q.out         |  144 +-
 .../exim_21_export_authsuccess.q.out            |   44 +-
 .../exim_22_import_exist_authsuccess.q.out      |   84 +-
 .../exim_23_import_part_authsuccess.q.out       |   92 +-
 .../exim_24_import_nonexist_authsuccess.q.out   |   58 +-
 .../clientpositive/exim_hidden_files.q.out      |   74 +-
 .../results/clientpositive/explain_ddl.q.out    |   42 +-
 .../clientpositive/explain_dependency.q.out     |   62 +-
 .../clientpositive/explain_logical.q.out        |  108 +-
 .../clientpositive/explain_outputs.q.out        |   84 +-
 .../clientpositive/explain_rearrange.q.out      |   48 +-
 .../extrapolate_part_stats_date.q.out           |  144 +-
 .../extrapolate_part_stats_partial.q.out        |  778 +-
 .../fileformat_sequencefile.q.out               |   42 +-
 .../clientpositive/fileformat_text.q.out        |   42 +-
 .../clientpositive/filter_join_breaktask2.q.out |  396 +-
 .../results/clientpositive/floor_time.q.out     |  114 +-
 .../test/results/clientpositive/fm-sketch.q.out |  282 +-
 .../clientpositive/gen_udf_example_add10.q.out  |   42 +-
 .../test/results/clientpositive/groupby10.q.out |  104 +-
 .../test/results/clientpositive/groupby11.q.out |   88 +-
 .../test/results/clientpositive/groupby12.q.out |   38 +-
 .../results/clientpositive/groupby1_limit.q.out |   36 +-
 .../results/clientpositive/groupby1_map.q.out   |   38 +-
 .../clientpositive/groupby1_map_nomap.q.out     |   38 +-
 .../clientpositive/groupby1_map_skew.q.out      |   38 +-
 .../clientpositive/groupby1_noskew.q.out        |   38 +-
 .../results/clientpositive/groupby2_map.q.out   |   40 +-
 .../groupby2_map_multi_distinct.q.out           |   80 +-
 .../clientpositive/groupby2_map_skew.q.out      |   40 +-
 .../clientpositive/groupby2_noskew.q.out        |   40 +-
 .../groupby2_noskew_multi_distinct.q.out        |   44 +-
 .../test/results/clientpositive/groupby3.q.out  |   52 +-
 .../results/clientpositive/groupby3_map.q.out   |   52 +-
 .../groupby3_map_multi_distinct.q.out           |   56 +-
 .../clientpositive/groupby3_map_skew.q.out      |   52 +-
 .../clientpositive/groupby3_noskew.q.out        |   52 +-
 .../groupby3_noskew_multi_distinct.q.out        |   56 +-
 .../test/results/clientpositive/groupby4.q.out  |   36 +-
 .../results/clientpositive/groupby4_map.q.out   |   36 +-
 .../clientpositive/groupby4_map_skew.q.out      |   36 +-
 .../clientpositive/groupby4_noskew.q.out        |   36 +-
 .../test/results/clientpositive/groupby5.q.out  |   38 +-
 .../results/clientpositive/groupby5_map.q.out   |   36 +-
 .../clientpositive/groupby5_map_skew.q.out      |   36 +-
 .../clientpositive/groupby5_noskew.q.out        |   38 +-
 .../test/results/clientpositive/groupby6.q.out  |   36 +-
 .../results/clientpositive/groupby6_map.q.out   |   36 +-
 .../clientpositive/groupby6_map_skew.q.out      |   36 +-
 .../clientpositive/groupby6_noskew.q.out        |   36 +-
 .../test/results/clientpositive/groupby7.q.out  |   56 +-
 .../results/clientpositive/groupby7_map.q.out   |   76 +-
 .../groupby7_map_multi_single_reducer.q.out     |   76 +-
 .../clientpositive/groupby7_map_skew.q.out      |   76 +-
 .../clientpositive/groupby7_noskew.q.out        |   76 +-
 .../groupby7_noskew_multi_single_reducer.q.out  |   76 +-
 .../test/results/clientpositive/groupby8.q.out  |  136 +-
 .../results/clientpositive/groupby8_map.q.out   |   76 +-
 .../clientpositive/groupby8_map_skew.q.out      |   76 +-
 .../clientpositive/groupby8_noskew.q.out        |   76 +-
 .../test/results/clientpositive/groupby9.q.out  |  326 +-
 .../clientpositive/groupby_complex_types.q.out  |  108 +-
 ...pby_complex_types_multi_single_reducer.q.out |   72 +-
 .../results/clientpositive/groupby_cube1.q.out  |  170 +-
 .../clientpositive/groupby_cube_multi_gby.q.out |   36 +-
 .../groupby_distinct_samekey.q.out              |   80 +-
 .../clientpositive/groupby_duplicate_key.q.out  |   30 +-
 .../results/clientpositive/groupby_empty.q.out  |   30 +-
 .../clientpositive/groupby_grouping_id1.q.out   |   64 +-
 .../clientpositive/groupby_grouping_id3.q.out   |   44 +-
 .../clientpositive/groupby_grouping_sets1.q.out |  124 +-
 .../clientpositive/groupby_grouping_sets2.q.out |   96 +-
 .../clientpositive/groupby_grouping_sets3.q.out |   58 +-
 .../clientpositive/groupby_grouping_sets4.q.out |   76 +-
 .../clientpositive/groupby_grouping_sets5.q.out |   50 +-
 .../clientpositive/groupby_grouping_sets6.q.out |   44 +-
 .../groupby_grouping_sets_grouping.q.out        |  226 +-
 .../groupby_grouping_sets_limit.q.out           |  100 +-
 .../groupby_grouping_window.q.out               |   60 +-
 .../clientpositive/groupby_map_ppr.q.out        |   48 +-
 .../groupby_map_ppr_multi_distinct.q.out        |   52 +-
 .../groupby_multi_insert_common_distinct.q.out  |   76 +-
 .../groupby_multi_single_reducer2.q.out         |  102 +-
 .../groupby_multi_single_reducer3.q.out         |  256 +-
 .../clientpositive/groupby_multialias.q.out     |   22 +-
 .../results/clientpositive/groupby_ppd.q.out    |   24 +-
 .../results/clientpositive/groupby_ppr.q.out    |   48 +-
 .../clientpositive/groupby_rollup1.q.out        |  150 +-
 .../clientpositive/groupby_rollup_empty.q.out   |  152 +-
 .../clientpositive/groupby_sort_10.q.out        |   84 +-
 .../clientpositive/groupby_sort_11.q.out        |  146 +-
 .../clientpositive/groupby_sort_1_23.q.out      | 1842 ++---
 .../results/clientpositive/groupby_sort_2.q.out |   84 +-
 .../results/clientpositive/groupby_sort_3.q.out |  146 +-
 .../results/clientpositive/groupby_sort_4.q.out |  138 +-
 .../results/clientpositive/groupby_sort_5.q.out |  292 +-
 .../results/clientpositive/groupby_sort_6.q.out |  200 +-
 .../results/clientpositive/groupby_sort_7.q.out |  112 +-
 .../results/clientpositive/groupby_sort_8.q.out |   68 +-
 .../results/clientpositive/groupby_sort_9.q.out |   92 +-
 .../clientpositive/groupby_sort_skew_1_23.q.out | 1842 ++---
 .../clientpositive/groupby_sort_test_1.q.out    |   60 +-
 .../clientpositive/infer_bucket_sort.q.out      |  558 +-
 .../infer_bucket_sort_convert_join.q.out        |   52 +-
 .../infer_bucket_sort_dyn_part.q.out            |  288 +-
 .../infer_bucket_sort_map_operators.q.out       |  244 +-
 .../infer_bucket_sort_merge.q.out               |   52 +-
 .../infer_bucket_sort_num_buckets.q.out         |   56 +-
 .../infer_bucket_sort_reducers_power_two.q.out  |  140 +-
 .../clientpositive/infer_join_preds.q.out       |   52 +-
 .../test/results/clientpositive/innerjoin.q.out |   62 +-
 .../results/clientpositive/inoutdriver.q.out    |   16 +-
 ql/src/test/results/clientpositive/input1.q.out |   22 +-
 .../test/results/clientpositive/input11.q.out   |   42 +-
 .../results/clientpositive/input11_limit.q.out  |   36 +-
 .../test/results/clientpositive/input12.q.out   |  120 +-
 .../test/results/clientpositive/input13.q.out   |  120 +-
 .../test/results/clientpositive/input14.q.out   |   38 +-
 .../results/clientpositive/input14_limit.q.out  |   36 +-
 .../test/results/clientpositive/input17.q.out   |   38 +-
 .../test/results/clientpositive/input18.q.out   |   38 +-
 .../results/clientpositive/input1_limit.q.out   |   76 +-
 .../test/results/clientpositive/input20.q.out   |   38 +-
 .../test/results/clientpositive/input24.q.out   |   30 +-
 .../test/results/clientpositive/input28.q.out   |   54 +-
 .../test/results/clientpositive/input33.q.out   |   38 +-
 .../test/results/clientpositive/input34.q.out   |   42 +-
 .../test/results/clientpositive/input35.q.out   |   42 +-
 .../test/results/clientpositive/input36.q.out   |   42 +-
 .../test/results/clientpositive/input38.q.out   |   42 +-
 .../test/results/clientpositive/input39.q.out   |   80 +-
 .../results/clientpositive/input3_limit.q.out   |   68 +-
 ql/src/test/results/clientpositive/input4.q.out |   36 +-
 .../test/results/clientpositive/input44.q.out   |   20 +-
 ql/src/test/results/clientpositive/input5.q.out |   38 +-
 ql/src/test/results/clientpositive/input6.q.out |   42 +-
 ql/src/test/results/clientpositive/input7.q.out |   42 +-
 ql/src/test/results/clientpositive/input8.q.out |   44 +-
 ql/src/test/results/clientpositive/input9.q.out |   42 +-
 .../clientpositive/input_dynamicserde.q.out     |   54 +-
 .../clientpositive/input_lazyserde.q.out        |  160 +-
 .../clientpositive/input_lazyserde2.q.out       |  232 +-
 .../results/clientpositive/input_part1.q.out    |   86 +-
 .../results/clientpositive/input_part2.q.out    |  136 +-
 .../results/clientpositive/input_part5.q.out    |   46 +-
 .../clientpositive/input_testxpath.q.out        |   44 +-
 .../clientpositive/input_testxpath2.q.out       |   44 +-
 .../test/results/clientpositive/inputddl7.q.out |  140 +-
 .../test/results/clientpositive/insert0.q.out   |   64 +-
 .../test/results/clientpositive/insert1.q.out   |   36 +-
 .../insert_acid_not_bucketed.q.out              |   28 +-
 .../insert_into_with_schema2.q.out              |   38 +-
 .../insert_nonacid_from_acid.q.out              |   30 +-
 .../insert_overwrite_directory.q.out            |  136 +-
 .../insert_overwrite_directory2.q.out           |   32 +-
 .../insert_overwrite_local_directory_1.q.out    |  120 +-
 .../clientpositive/insertexternal1.q.out        |   38 +-
 .../results/clientpositive/interval_alt.q.out   |   32 +-
 .../clientpositive/interval_arithmetic.q.out    |  158 +-
 ql/src/test/results/clientpositive/join14.q.out |   38 +-
 ql/src/test/results/clientpositive/join17.q.out |   50 +-
 ql/src/test/results/clientpositive/join2.q.out  |   36 +-
 ql/src/test/results/clientpositive/join25.q.out |   40 +-
 ql/src/test/results/clientpositive/join26.q.out |   48 +-
 ql/src/test/results/clientpositive/join27.q.out |   40 +-
 ql/src/test/results/clientpositive/join28.q.out |   38 +-
 ql/src/test/results/clientpositive/join29.q.out |   44 +-
 ql/src/test/results/clientpositive/join3.q.out  |   38 +-
 ql/src/test/results/clientpositive/join30.q.out |   38 +-
 ql/src/test/results/clientpositive/join31.q.out |   38 +-
 ql/src/test/results/clientpositive/join32.q.out |   48 +-
 ql/src/test/results/clientpositive/join33.q.out |   48 +-
 ql/src/test/results/clientpositive/join34.q.out |   54 +-
 ql/src/test/results/clientpositive/join35.q.out |   54 +-
 ql/src/test/results/clientpositive/join36.q.out |   96 +-
 ql/src/test/results/clientpositive/join37.q.out |   40 +-
 ql/src/test/results/clientpositive/join38.q.out |   60 +-
 ql/src/test/results/clientpositive/join39.q.out |   42 +-
 ql/src/test/results/clientpositive/join4.q.out  |   42 +-
 ql/src/test/results/clientpositive/join42.q.out |   68 +-
 ql/src/test/results/clientpositive/join44.q.out |   12 +-
 ql/src/test/results/clientpositive/join46.q.out |  836 +-
 ql/src/test/results/clientpositive/join5.q.out  |   42 +-
 ql/src/test/results/clientpositive/join6.q.out  |   42 +-
 ql/src/test/results/clientpositive/join7.q.out  |   46 +-
 ql/src/test/results/clientpositive/join8.q.out  |   42 +-
 ql/src/test/results/clientpositive/join9.q.out  |   46 +-
 .../join_cond_pushdown_unqual1.q.out            |   32 +-
 .../join_cond_pushdown_unqual3.q.out            |   32 +-
 .../join_cond_pushdown_unqual4.q.out            |   24 +-
 .../clientpositive/join_emit_interval.q.out     |  100 +-
 .../clientpositive/join_filters_overlap.q.out   |  194 +-
 .../results/clientpositive/join_map_ppr.q.out   |  160 +-
 .../clientpositive/join_on_varchar.q.out        |   84 +-
 .../results/clientpositive/join_reorder.q.out   |  216 +-
 .../results/clientpositive/join_reorder2.q.out  |  144 +-
 .../results/clientpositive/join_reorder3.q.out  |  144 +-
 .../results/clientpositive/join_reorder4.q.out  |  108 +-
 .../clientpositive/json_serde_tsformat.q.out    |   36 +-
 .../test/results/clientpositive/keyword_2.q.out |   48 +-
 .../lateral_view_multi_lateralviews.q.out       |   26 +-
 .../clientpositive/lateral_view_onview.q.out    |  124 +-
 .../clientpositive/lateral_view_onview2.q.out   |   42 +-
 .../results/clientpositive/lb_fs_stats.q.out    |   44 +-
 .../results/clientpositive/leftsemijoin.q.out   |  120 +-
 .../clientpositive/list_bucket_dml_1.q.out      |  118 +-
 .../clientpositive/list_bucket_dml_11.q.out     |  100 +-
 .../clientpositive/list_bucket_dml_12.q.out     |  136 +-
 .../clientpositive/list_bucket_dml_2.q.out      |  180 +-
 .../clientpositive/list_bucket_dml_3.q.out      |  100 +-
 .../clientpositive/list_bucket_dml_4.q.out      |  182 +-
 .../clientpositive/list_bucket_dml_5.q.out      |  134 +-
 .../clientpositive/list_bucket_dml_6.q.out      |  230 +-
 .../clientpositive/list_bucket_dml_8.q.out      |  172 +-
 .../clientpositive/list_bucket_dml_9.q.out      |  182 +-
 .../list_bucket_query_multiskew_2.q.out         |  142 +-
 .../list_bucket_query_multiskew_3.q.out         |  204 +-
 .../list_bucket_query_oneskew_1.q.out           |  192 +-
 .../list_bucket_query_oneskew_2.q.out           |  230 +-
 .../list_bucket_query_oneskew_3.q.out           |  104 +-
 .../llap/acid_vectorization_original.q.out      |   84 +-
 .../clientpositive/llap/alter_merge_orc.q.out   |  138 +-
 .../clientpositive/llap/autoColumnStats_1.q.out |  886 +--
 .../llap/autoColumnStats_10.q.out               |  240 +-
 .../clientpositive/llap/autoColumnStats_2.q.out |  494 +-
 .../clientpositive/llap/auto_join1.q.out        |   38 +-
 .../clientpositive/llap/auto_join_filters.q.out |  480 +-
 .../clientpositive/llap/auto_join_nulls.q.out   |  192 +-
 .../llap/auto_smb_mapjoin_14.q.out              |  158 +-
 .../llap/auto_sortmerge_join_1.q.out            |  312 +-
 .../llap/auto_sortmerge_join_10.q.out           |   96 +-
 .../llap/auto_sortmerge_join_11.q.out           |  410 +-
 .../llap/auto_sortmerge_join_12.q.out           |  172 +-
 .../llap/auto_sortmerge_join_13.q.out           |  284 +-
 .../llap/auto_sortmerge_join_14.q.out           |   84 +-
 .../llap/auto_sortmerge_join_15.q.out           |   48 +-
 .../llap/auto_sortmerge_join_16.q.out           |  338 +-
 .../llap/auto_sortmerge_join_2.q.out            |  226 +-
 .../llap/auto_sortmerge_join_3.q.out            |  296 +-
 .../llap/auto_sortmerge_join_4.q.out            |  312 +-
 .../llap/auto_sortmerge_join_5.q.out            |  196 +-
 .../llap/auto_sortmerge_join_6.q.out            |  228 +-
 .../llap/auto_sortmerge_join_7.q.out            |  390 +-
 .../llap/auto_sortmerge_join_8.q.out            |  390 +-
 .../llap/auto_sortmerge_join_9.q.out            |  600 +-
 .../llap/bucket_map_join_tez2.q.out             |  392 +-
 .../llap/bucket_map_join_tez_empty.q.out        |   60 +-
 .../llap/bucket_num_reducers2.q.out             |   50 +-
 .../llap/bucketizedhiveinputformat.q.out        |  106 +-
 .../clientpositive/llap/bucketmapjoin1.q.out    |  516 +-
 .../clientpositive/llap/bucketmapjoin2.q.out    |  702 +-
 .../clientpositive/llap/bucketmapjoin3.q.out    |  496 +-
 .../clientpositive/llap/bucketmapjoin4.q.out    |  456 +-
 .../clientpositive/llap/bucketmapjoin7.q.out    |  104 +-
 .../llap/bucketsortoptimize_insert_2.q.out      |  536 +-
 .../llap/bucketsortoptimize_insert_6.q.out      |  372 +-
 .../llap/bucketsortoptimize_insert_7.q.out      |  282 +-
 .../llap/cbo_rp_unionDistinct_2.q.out           |  448 +-
 .../clientpositive/llap/cbo_rp_views.q.out      |  190 +-
 .../llap/cbo_rp_windowing_2.q.out               |  164 +-
 .../clientpositive/llap/cbo_subq_exists.q.out   |   20 +-
 .../results/clientpositive/llap/cbo_views.q.out |  190 +-
 .../clientpositive/llap/check_constraint.q.out  |  462 +-
 .../columnStatsUpdateForStatsOptimizer_1.q.out  |  280 +-
 .../llap/column_access_stats.q.out              |  268 +-
 .../llap/column_table_stats_orc.q.out           |  344 +-
 .../llap/constprog_semijoin.q.out               |  234 +-
 .../llap/correlationoptimizer4.q.out            |  268 +-
 .../results/clientpositive/llap/count.q.out     |  192 +-
 .../llap/create_merge_compressed.q.out          |  136 +-
 .../clientpositive/llap/cross_prod_1.q.out      |  126 +-
 .../clientpositive/llap/cross_prod_3.q.out      |   38 +-
 .../clientpositive/llap/cross_prod_4.q.out      |   24 +-
 .../llap/cross_product_check_1.q.out            |   64 +-
 .../llap/cross_product_check_2.q.out            |   64 +-
 .../results/clientpositive/llap/cte_2.q.out     |  134 +-
 .../results/clientpositive/llap/cte_4.q.out     |  100 +-
 .../results/clientpositive/llap/cte_5.q.out     |   44 +-
 .../results/clientpositive/llap/database.q.out  |   92 +-
 .../llap/default_constraint.q.out               |  938 +--
 .../clientpositive/llap/deleteAnalyze.q.out     |   80 +-
 .../llap/disable_merge_for_bucketing.q.out      |   50 +-
 .../clientpositive/llap/dp_counter_mm.q.out     |  108 +-
 .../clientpositive/llap/dp_counter_non_mm.q.out |  108 +-
 .../llap/drop_partition_with_stats.q.out        |  760 +-
 .../llap/dynamic_partition_pruning.q.out        |  648 +-
 .../llap/dynamic_semijoin_reduction.q.out       | 1170 +--
 .../llap/dynamic_semijoin_reduction_2.q.out     |  198 +-
 .../llap/dynamic_semijoin_reduction_4.q.out     |  172 +-
 .../llap/dynamic_semijoin_reduction_sw.q.out    |  282 +-
 .../llap/dynamic_semijoin_user_level.q.out      |  786 +-
 .../llap/dynpart_sort_opt_vectorization.q.out   |   50 +-
 .../llap/dynpart_sort_optimization.q.out        |  740 +-
 .../llap/dynpart_sort_optimization2.q.out       |  134 +-
 .../clientpositive/llap/empty_join.q.out        |   82 +-
 .../llap/enforce_constraint_notnull.q.out       |  728 +-
 .../results/clientpositive/llap/escape1.q.out   |  Bin 44317 -> 44401 bytes
 .../clientpositive/llap/except_distinct.q.out   |  248 +-
 .../llap/exchgpartition2lel.q.out               |  232 +-
 .../clientpositive/llap/explainanalyze_2.q.out  |  654 +-
 .../clientpositive/llap/explainuser_1.q.out     |  886 +--
 .../clientpositive/llap/explainuser_2.q.out     |  588 +-
 .../extrapolate_part_stats_partial_ndv.q.out    |  734 +-
 .../llap/filter_join_breaktask2.q.out           |  396 +-
 .../results/clientpositive/llap/groupby2.q.out  |   40 +-
 .../results/clientpositive/llap/groupby3.q.out  |   52 +-
 .../llap/groupby_grouping_id2.q.out             |  100 +-
 .../llap/groupby_rollup_empty.q.out             |  152 +-
 .../results/clientpositive/llap/insert1.q.out   |   36 +-
 .../llap/insert_into_default_keyword.q.out      |  714 +-
 .../llap/insert_into_with_schema.q.out          |  100 +-
 .../llap/insert_values_orig_table.q.out         |  112 +-
 .../clientpositive/llap/intersect_all.q.out     |  160 +-
 .../llap/intersect_distinct.q.out               |  164 +-
 .../clientpositive/llap/intersect_merge.q.out   |  136 +-
 .../clientpositive/llap/is_distinct_from.q.out  |   76 +-
 .../results/clientpositive/llap/join1.q.out     |   38 +-
 .../clientpositive/llap/join32_lessSize.q.out   |  240 +-
 .../results/clientpositive/llap/join46.q.out    |  832 +-
 .../llap/join_emit_interval.q.out               |  100 +-
 .../clientpositive/llap/join_filters.q.out      |  992 +--
 .../llap/join_is_not_distinct_from.q.out        |  320 +-
 .../clientpositive/llap/join_nulls.q.out        |  304 +-
 .../clientpositive/llap/join_nullsafe.q.out     |  320 +-
 .../llap/join_reordering_no_stats.q.out         |   92 +-
 .../clientpositive/llap/leftsemijoin.q.out      |  120 +-
 .../clientpositive/llap/leftsemijoin_mr.q.out   |   72 +-
 .../results/clientpositive/llap/lineage2.q.out  |  166 +-
 .../results/clientpositive/llap/lineage3.q.out  |   48 +-
 .../results/clientpositive/llap/llap_acid.q.out |  184 +-
 .../clientpositive/llap/llap_acid2.q.out        |   84 +-
 .../clientpositive/llap/llap_nullscan.q.out     |  106 +-
 .../clientpositive/llap/llap_partitioned.q.out  |   46 +-
 .../results/clientpositive/llap/llap_udf.q.out  |   64 +-
 .../clientpositive/llap/llapdecider.q.out       |  102 +-
 .../llap/load_data_using_job.q.out              |  688 +-
 .../clientpositive/llap/load_dyn_part1.q.out    |  128 +-
 .../results/clientpositive/llap/load_fs2.q.out  |   50 +-
 .../results/clientpositive/llap/mapjoin2.q.out  |   56 +-
 .../results/clientpositive/llap/mapjoin46.q.out |  798 +-
 .../clientpositive/llap/mapjoin_decimal.q.out   |   92 +-
 .../llap/mapjoin_emit_interval.q.out            |   66 +-
 .../clientpositive/llap/mapjoin_hint.q.out      |  250 +-
 .../clientpositive/llap/mapreduce1.q.out        |   42 +-
 .../clientpositive/llap/mapreduce2.q.out        |   42 +-
 .../llap/materialized_view_create.q.out         |  134 +-
 .../llap/materialized_view_create_rewrite.q.out |  244 +-
 .../materialized_view_create_rewrite_2.q.out    |  280 +-
 .../materialized_view_create_rewrite_4.q.out    |  774 +-
 .../materialized_view_create_rewrite_5.q.out    |  536 +-
 ...materialized_view_create_rewrite_dummy.q.out |  166 +-
 ...erialized_view_create_rewrite_multi_db.q.out |  110 +-
 ...ized_view_create_rewrite_rebuild_dummy.q.out |  612 +-
 ...alized_view_create_rewrite_time_window.q.out |  454 +-
 .../llap/materialized_view_describe.q.out       |  242 +-
 .../llap/materialized_view_rewrite_1.q.out      |  798 +-
 .../llap/materialized_view_rewrite_2.q.out      |  738 +-
 .../llap/materialized_view_rewrite_3.q.out      |  498 +-
 .../llap/materialized_view_rewrite_4.q.out      |  762 +-
 .../llap/materialized_view_rewrite_5.q.out      | 1372 ++--
 .../llap/materialized_view_rewrite_7.q.out      |  636 +-
 .../llap/materialized_view_rewrite_9.q.out      |  142 +-
 .../llap/materialized_view_rewrite_ssb.q.out    |  514 +-
 .../llap/materialized_view_rewrite_ssb_2.q.out  |   84 +-
 .../results/clientpositive/llap/merge1.q.out    |  158 +-
 .../results/clientpositive/llap/merge2.q.out    |  158 +-
 .../results/clientpositive/llap/mergejoin.q.out |  564 +-
 .../llap/metadata_only_queries.q.out            |  136 +-
 .../metadata_only_queries_with_filters.q.out    |  220 +-
 .../clientpositive/llap/metadataonly1.q.out     |  614 +-
 .../results/clientpositive/llap/mm_all.q.out    |  784 +-
 .../results/clientpositive/llap/mm_cttas.q.out  |   74 +-
 .../results/clientpositive/llap/mm_exim.q.out   |  132 +-
 .../clientpositive/llap/multiMapJoin2.q.out     |   52 +-
 .../clientpositive/llap/multi_column_in.q.out   |  254 +-
 .../llap/multi_column_in_single.q.out           |  222 +-
 .../clientpositive/llap/multi_insert.q.out      |  752 +-
 .../llap/multi_insert_lateral_view.q.out        |  138 +-
 .../clientpositive/llap/optimize_join_ptp.q.out |   60 +-
 .../clientpositive/llap/orc_analyze.q.out       |  726 +-
 .../clientpositive/llap/orc_create.q.out        |  140 +-
 .../clientpositive/llap/orc_llap_counters.q.out |  368 +-
 .../llap/orc_llap_nonvector.q.out               |   32 +-
 .../clientpositive/llap/orc_merge1.q.out        |  256 +-
 .../clientpositive/llap/orc_merge11.q.out       |  122 +-
 .../clientpositive/llap/orc_merge2.q.out        |  248 +-
 .../clientpositive/llap/orc_merge3.q.out        |  140 +-
 .../clientpositive/llap/orc_merge5.q.out        |  212 +-
 .../clientpositive/llap/orc_merge6.q.out        |  434 +-
 .../clientpositive/llap/orc_merge7.q.out        |  682 +-
 .../clientpositive/llap/orc_merge8.q.out        |  136 +-
 .../clientpositive/llap/orc_merge_diff_fs.q.out |  256 +-
 .../llap/orc_merge_incompat1.q.out              |  130 +-
 .../llap/orc_merge_incompat_schema.q.out        |  158 +-
 .../orc_merge_incompat_writer_version.q.out     |  100 +-
 .../clientpositive/llap/orc_ppd_basic.q.out     |  384 +-
 .../clientpositive/llap/orc_ppd_date.q.out      |  272 +-
 .../clientpositive/llap/orc_ppd_decimal.q.out   |  440 +-
 .../llap/orc_ppd_schema_evol_1a.q.out           |   36 +-
 .../llap/orc_ppd_schema_evol_1b.q.out           |   32 +-
 .../llap/orc_ppd_schema_evol_2a.q.out           |   58 +-
 .../llap/orc_ppd_schema_evol_2b.q.out           |  102 +-
 .../llap/orc_ppd_schema_evol_3a.q.out           |  458 +-
 .../clientpositive/llap/orc_ppd_timestamp.q.out |  264 +-
 .../clientpositive/llap/orc_ppd_varchar.q.out   |  200 +-
 .../llap/orc_predicate_pushdown.q.out           |   46 +-
 .../clientpositive/llap/order_null.q.out        |  168 +-
 .../results/clientpositive/llap/parallel.q.out  |   58 +-
 .../clientpositive/llap/parallel_colstats.q.out |  116 +-
 .../llap/parquet_predicate_pushdown.q.out       |   46 +-
 .../llap/parquet_types_vectorization.q.out      |  182 +-
 .../llap/partition_shared_scan.q.out            |   90 +-
 .../clientpositive/llap/ppd_union_view.q.out    |  134 +-
 .../clientpositive/llap/ppr_pushdown.q.out      |  368 +-
 .../test/results/clientpositive/llap/ptf.q.out  |  124 +-
 .../clientpositive/llap/ptf_matchpath.q.out     |   68 +-
 .../clientpositive/llap/rcfile_merge3.q.out     |  140 +-
 .../llap/results_cache_invalidation.q.out       |  242 +-
 .../llap/results_cache_transactional.q.out      |  130 +-
 .../llap/results_cache_with_masking.q.out       |  663 +-
 .../clientpositive/llap/retry_failure.q.out     |   32 +-
 .../llap/retry_failure_stat_changes.q.out       |   80 +-
 .../clientpositive/llap/runtime_stats_hs2.q.out |   68 +-
 .../results/clientpositive/llap/sample1.q.out   |   50 +-
 .../llap/schema_evol_orc_acid_part.q.out        | 1170 +--
 .../schema_evol_orc_acid_part_llap_io.q.out     | 1170 +--
 .../llap/schema_evol_orc_acid_part_update.q.out | 2676 +++----
 ...hema_evol_orc_acid_part_update_llap_io.q.out |  164 +-
 .../llap/schema_evol_orc_acid_table.q.out       | 1086 +--
 .../schema_evol_orc_acid_table_llap_io.q.out    | 1086 +--
 .../schema_evol_orc_acid_table_update.q.out     |  412 +-
 ...ema_evol_orc_acid_table_update_llap_io.q.out |  412 +-
 .../schema_evol_orc_acidvec_part_llap_io.q.out  | 1222 +--
 .../schema_evol_orc_acidvec_part_update.q.out   |  554 +-
 ...a_evol_orc_acidvec_part_update_llap_io.q.out |  554 +-
 .../llap/schema_evol_orc_acidvec_table.q.out    |  268 +-
 .../schema_evol_orc_acidvec_table_llap_io.q.out | 1138 +--
 .../schema_evol_orc_acidvec_table_update.q.out  |  412 +-
 .../llap/schema_evol_orc_nonvec_part.q.out      | 1220 +--
 ...chema_evol_orc_nonvec_part_all_complex.q.out |  598 +-
 ...ol_orc_nonvec_part_all_complex_llap_io.q.out |  598 +-
 ...ema_evol_orc_nonvec_part_all_primitive.q.out | 1036 +--
 ..._orc_nonvec_part_all_primitive_llap_io.q.out | 1036 +--
 .../schema_evol_orc_nonvec_part_llap_io.q.out   | 1220 +--
 .../llap/schema_evol_orc_nonvec_table.q.out     | 1112 +--
 .../schema_evol_orc_nonvec_table_llap_io.q.out  | 1112 +--
 .../llap/schema_evol_orc_vec_part.q.out         | 1220 +--
 .../schema_evol_orc_vec_part_all_complex.q.out  |  598 +-
 ..._evol_orc_vec_part_all_complex_llap_io.q.out |  598 +-
 ...schema_evol_orc_vec_part_all_primitive.q.out | 1036 +--
 ...vol_orc_vec_part_all_primitive_llap_io.q.out | 1036 +--
 .../llap/schema_evol_orc_vec_table.q.out        | 1112 +--
 .../schema_evol_orc_vec_table_llap_io.q.out     | 1112 +--
 .../clientpositive/llap/schema_evol_stats.q.out |  244 +-
 .../llap/schema_evol_text_nonvec_part.q.out     | 1220 +--
 ...hema_evol_text_nonvec_part_all_complex.q.out |  598 +-
 ...l_text_nonvec_part_all_complex_llap_io.q.out |  598 +-
 ...ma_evol_text_nonvec_part_all_primitive.q.out | 1036 +--
 ...text_nonvec_part_all_primitive_llap_io.q.out | 1066 +--
 .../schema_evol_text_nonvec_part_llap_io.q.out  | 1220 +--
 .../llap/schema_evol_text_nonvec_table.q.out    | 1112 +--
 .../schema_evol_text_nonvec_table_llap_io.q.out | 1112 +--
 .../llap/schema_evol_text_vec_part.q.out        | 1220 +--
 .../schema_evol_text_vec_part_all_complex.q.out |  598 +-
 ...chema_evol_text_vec_part_all_primitive.q.out | 1036 +--
 ...ol_text_vec_part_all_primitive_llap_io.q.out | 1066 +--
 .../schema_evol_text_vec_part_llap_io.q.out     |  676 +-
 .../llap/schema_evol_text_vec_table.q.out       | 1112 +--
 .../schema_evol_text_vec_table_llap_io.q.out    | 1014 +--
 .../llap/schema_evol_text_vecrow_part.q.out     | 1220 +--
 ...hema_evol_text_vecrow_part_all_complex.q.out |  598 +-
 ...l_text_vecrow_part_all_complex_llap_io.q.out |  516 +-
 ...ma_evol_text_vecrow_part_all_primitive.q.out | 1036 +--
 ...text_vecrow_part_all_primitive_llap_io.q.out |  520 +-
 .../schema_evol_text_vecrow_part_llap_io.q.out  |  260 +-
 .../llap/schema_evol_text_vecrow_table.q.out    | 1112 +--
 .../schema_evol_text_vecrow_table_llap_io.q.out | 1068 +--
 .../clientpositive/llap/schemeAuthority2.q.out  |   40 +-
 .../results/clientpositive/llap/semijoin.q.out  |  466 +-
 .../results/clientpositive/llap/semijoin6.q.out |  148 +-
 .../results/clientpositive/llap/skewjoin.q.out  |  306 +-
 .../clientpositive/llap/skewjoinopt15.q.out     |  144 +-
 .../clientpositive/llap/smb_mapjoin_14.q.out    |  308 +-
 .../clientpositive/llap/smb_mapjoin_15.q.out    |  324 +-
 .../clientpositive/llap/smb_mapjoin_17.q.out    |  224 +-
 .../clientpositive/llap/smb_mapjoin_18.q.out    |  350 +-
 .../clientpositive/llap/smb_mapjoin_19.q.out    |  226 +-
 .../clientpositive/llap/smb_mapjoin_5.q.out     |  308 +-
 .../clientpositive/llap/smb_mapjoin_6.q.out     |  364 +-
 .../results/clientpositive/llap/sqlmerge.q.out  |   44 +-
 .../results/clientpositive/llap/stats11.q.out   |  530 +-
 .../clientpositive/llap/stats_date.q.out        |   52 +-
 .../clientpositive/llap/stats_noscan_1.q.out    |  142 +-
 .../clientpositive/llap/subquery_exists.q.out   |  214 +-
 .../clientpositive/llap/subquery_in.q.out       |  218 +-
 .../llap/subquery_in_having.q.out               |   70 +-
 .../clientpositive/llap/subquery_notin.q.out    |  272 +-
 .../clientpositive/llap/subquery_scalar.q.out   |  704 +-
 .../clientpositive/llap/subquery_select.q.out   |   92 +-
 .../llap/table_access_keys_stats.q.out          |  328 +-
 .../clientpositive/llap/temp_table.q.out        |  104 +-
 .../llap/tez_bmj_schema_evolution.q.out         |   74 +-
 .../clientpositive/llap/tez_fsstat.q.out        |   84 +-
 .../results/clientpositive/llap/tez_join.q.out  |   76 +-
 .../llap/tez_schema_evolution.q.out             |   92 +-
 .../clientpositive/llap/tez_smb_empty.q.out     |  252 +-
 .../clientpositive/llap/tez_smb_main.q.out      |  372 +-
 .../results/clientpositive/llap/tez_union.q.out |   76 +-
 .../llap/tez_union_dynamic_partition.q.out      |   50 +-
 .../llap/tez_union_dynamic_partition_2.q.out    |  124 +-
 .../llap/tez_union_group_by.q.out               |  130 +-
 .../llap/tez_union_multiinsert.q.out            |  326 +-
 .../clientpositive/llap/uber_reduce.q.out       |   24 +-
 .../results/clientpositive/llap/union3.q.out    |   26 +-
 .../results/clientpositive/llap/union4.q.out    |   40 +-
 .../results/clientpositive/llap/union6.q.out    |   40 +-
 .../clientpositive/llap/unionDistinct_1.q.out   | 3714 ++++-----
 .../clientpositive/llap/unionDistinct_2.q.out   |  112 +-
 .../clientpositive/llap/unionDistinct_3.q.out   |   54 +-
 .../clientpositive/llap/union_remove_26.q.out   |  100 +-
 .../update_access_time_non_current_db.q.out     |   20 +-
 .../llap/vector_adaptor_usage_mode.q.out        |  280 +-
 .../llap/vector_aggregate_9.q.out               |  104 +-
 .../llap/vector_annotate_stats_select.q.out     |  290 +-
 .../llap/vector_auto_smb_mapjoin_14.q.out       |  474 +-
 .../llap/vector_binary_join_groupby.q.out       |   50 +-
 .../llap/vector_cast_constant.q.out             |   80 +-
 .../clientpositive/llap/vector_char_2.q.out     |   76 +-
 .../clientpositive/llap/vector_char_cast.q.out  |   34 +-
 .../clientpositive/llap/vector_coalesce_3.q.out |   76 +-
 .../llap/vector_complex_all.q.out               |  264 +-
 .../llap/vector_complex_join.q.out              |  118 +-
 .../llap/vector_create_struct_table.q.out       |   90 +-
 .../clientpositive/llap/vector_data_types.q.out |  146 +-
 .../clientpositive/llap/vector_decimal_3.q.out  |  136 +-
 .../clientpositive/llap/vector_decimal_4.q.out  |  104 +-
 .../llap/vector_decimal_expressions.q.out       |   94 +-
 .../llap/vector_decimal_mapjoin.q.out           |  104 +-
 .../llap/vector_decimal_math_funcs.q.out        |   46 +-
 .../llap/vector_decimal_udf.q.out               |  510 +-
 .../llap/vector_decimal_udf2.q.out              |   92 +-
 .../clientpositive/llap/vector_distinct_2.q.out |   76 +-
 .../clientpositive/llap/vector_groupby4.q.out   |   62 +-
 .../clientpositive/llap/vector_groupby6.q.out   |   62 +-
 .../clientpositive/llap/vector_groupby_3.q.out  |   76 +-
 .../llap/vector_groupby_cube1.q.out             |  170 +-
 .../llap/vector_groupby_grouping_id1.q.out      |   96 +-
 .../llap/vector_groupby_grouping_id2.q.out      |  184 +-
 .../llap/vector_groupby_grouping_id3.q.out      |   62 +-
 .../llap/vector_groupby_grouping_sets1.q.out    |  144 +-
 .../llap/vector_groupby_grouping_sets2.q.out    |  116 +-
 .../llap/vector_groupby_grouping_sets3.q.out    |   78 +-
 .../vector_groupby_grouping_sets3_dec.q.out     |   76 +-
 .../llap/vector_groupby_grouping_sets4.q.out    |   90 +-
 .../llap/vector_groupby_grouping_sets5.q.out    |   70 +-
 .../llap/vector_groupby_grouping_sets6.q.out    |   64 +-
 .../vector_groupby_grouping_sets_grouping.q.out |  244 +-
 .../vector_groupby_grouping_sets_limit.q.out    |  120 +-
 .../llap/vector_groupby_grouping_window.q.out   |   36 +-
 .../llap/vector_groupby_reduce.q.out            |  144 +-
 .../llap/vector_groupby_rollup1.q.out           |  162 +-
 .../llap/vector_groupby_sort_11.q.out           |  146 +-
 .../llap/vector_groupby_sort_8.q.out            |   68 +-
 .../llap/vector_grouping_sets.q.out             |  100 +-
 .../llap/vector_include_no_sel.q.out            |   88 +-
 .../clientpositive/llap/vector_join30.q.out     |  254 +-
 .../llap/vector_join_filters.q.out              |  200 +-
 .../clientpositive/llap/vector_join_nulls.q.out |  176 +-
 .../llap/vector_leftsemi_mapjoin.q.out          | 2236 +++---
 .../llap/vector_llap_text_1.q.out               |  156 +-
 .../clientpositive/llap/vector_map_order.q.out  |   30 +-
 .../llap/vector_mr_diff_schema_alias.q.out      |   54 +-
 .../llap/vector_null_projection.q.out           |   76 +-
 .../llap/vector_number_compare_projection.q.out |   74 +-
 .../llap/vector_orc_nested_column_pruning.q.out |   38 +-
 .../llap/vector_orc_null_check.q.out            |   54 +-
 .../clientpositive/llap/vector_order_null.q.out |  212 +-
 .../clientpositive/llap/vector_orderby_5.q.out  |   76 +-
 .../llap/vector_outer_join2.q.out               |  284 +-
 .../llap/vector_outer_join3.q.out               |  340 +-
 .../llap/vector_outer_join6.q.out               |   60 +-
 .../llap/vector_outer_reference_windowed.q.out  |  312 +-
 .../llap/vector_partitioned_date_time.q.out     |   56 +-
 .../clientpositive/llap/vector_reduce1.q.out    |   76 +-
 .../clientpositive/llap/vector_reduce2.q.out    |   76 +-
 .../clientpositive/llap/vector_reduce3.q.out    |   76 +-
 .../llap/vector_reduce_groupby_decimal.q.out    |   46 +-
 .../llap/vector_retry_failure.q.out             |   38 +-
 .../llap/vector_string_concat.q.out             |   76 +-
 .../llap/vector_string_decimal.q.out            |   44 +-
 .../clientpositive/llap/vector_struct_in.q.out  |   96 +-
 .../clientpositive/llap/vector_udf1.q.out       |  454 +-
 .../llap/vector_udf_character_length.q.out      |  138 +-
 .../llap/vector_udf_octet_length.q.out          |  124 +-
 .../llap/vector_udf_string_to_boolean.q.out     |  142 +-
 .../clientpositive/llap/vector_varchar_4.q.out  |   76 +-
 .../llap/vector_varchar_simple.q.out            |   64 +-
 .../llap/vector_when_case_null.q.out            |   34 +-
 .../clientpositive/llap/vector_windowing.q.out  |  222 +-
 .../llap/vector_windowing_expressions.q.out     |  194 +-
 .../vector_windowing_multipartitioning.q.out    |  104 +-
 .../llap/vector_windowing_navfn.q.out           |   96 +-
 .../llap/vector_windowing_order_null.q.out      |  140 +-
 .../vector_windowing_range_multiorder.q.out     |  174 +-
 .../llap/vector_windowing_rank.q.out            |  142 +-
 .../llap/vector_windowing_streaming.q.out       |   42 +-
 .../llap/vector_windowing_windowspec.q.out      |  174 +-
 .../llap/vector_windowing_windowspec4.q.out     |   38 +-
 .../clientpositive/llap/vectorization_0.q.out   |   44 +-
 .../vectorization_input_format_excludes.q.out   |  168 +-
 .../llap/vectorization_part.q.out               |  100 +-
 .../clientpositive/llap/vectorized_case.q.out   |  124 +-
 .../llap/vectorized_date_funcs.q.out            |   28 +-
 .../vectorized_dynamic_partition_pruning.q.out  |  684 +-
 .../clientpositive/llap/vectorized_join46.q.out |  688 +-
 .../llap/vectorized_parquet_types.q.out         |  206 +-
 .../clientpositive/llap/vectorized_ptf.q.out    |   28 +-
 .../llap/vectorized_rcfile_columnar.q.out       |   36 +-
 .../llap/vectorized_timestamp.q.out             |  116 +-
 .../llap/windowing_windowspec2.q.out            |  244 +-
 .../results/clientpositive/llap_reader.q.out    |   50 +-
 .../clientpositive/llap_uncompressed.q.out      |  108 +-
 .../clientpositive/load_binary_data.q.out       |  Bin 2262 -> 2392 bytes
 .../results/clientpositive/load_dyn_part1.q.out |  132 +-
 .../clientpositive/load_dyn_part11.q.out        |   58 +-
 .../clientpositive/load_dyn_part14.q.out        |   72 +-
 .../results/clientpositive/load_dyn_part8.q.out |  118 +-
 .../load_exist_part_authsuccess.q.out           |   34 +-
 .../load_file_with_space_in_the_name.q.out      |   24 +-
 .../clientpositive/load_fs_overwrite.q.out      |   44 +-
 .../clientpositive/load_non_hdfs_path.q.out     |   12 +-
 .../test/results/clientpositive/load_orc.q.out  |   36 +-
 .../results/clientpositive/load_overwrite.q.out |   78 +-
 .../clientpositive/load_part_authsuccess.q.out  |   26 +-
 .../test/results/clientpositive/loadpart1.q.out |   36 +-
 ql/src/test/results/clientpositive/lock1.q.out  |  116 +-
 ql/src/test/results/clientpositive/lock2.q.out  |  112 +-
 ql/src/test/results/clientpositive/lock3.q.out  |  118 +-
 ql/src/test/results/clientpositive/lock4.q.out  |  118 +-
 .../test/results/clientpositive/mapjoin2.q.out  |   56 +-
 .../test/results/clientpositive/mapjoin46.q.out |  860 +-
 .../results/clientpositive/mapjoin_addjar.q.out |   36 +-
 .../results/clientpositive/mapjoin_hook.q.out   |   22 +-
 .../clientpositive/mapjoin_test_outer.q.out     |   76 +-
 .../results/clientpositive/mapreduce1.q.out     |   42 +-
 .../results/clientpositive/mapreduce2.q.out     |   42 +-
 .../results/clientpositive/mapreduce3.q.out     |   42 +-
 .../results/clientpositive/mapreduce4.q.out     |   42 +-
 .../results/clientpositive/mapreduce5.q.out     |   42 +-
 .../results/clientpositive/mapreduce6.q.out     |   42 +-
 .../results/clientpositive/mapreduce7.q.out     |   46 +-
 .../results/clientpositive/mapreduce8.q.out     |   46 +-
 .../test/results/clientpositive/masking_1.q.out | 7360 ++++++++++++++++-
 .../results/clientpositive/masking_12.q.out     | 1834 ++++-
 .../clientpositive/masking_1_newdb.q.out        | 1088 ++-
 .../test/results/clientpositive/masking_2.q.out | 1176 ++-
 .../test/results/clientpositive/masking_3.q.out | 6518 +++++++---------
 .../test/results/clientpositive/masking_4.q.out |  204 +-
 .../test/results/clientpositive/masking_5.q.out |  791 +-
 .../test/results/clientpositive/masking_6.q.out | 2172 +++++-
 .../test/results/clientpositive/masking_7.q.out | 2176 +++++-
 .../test/results/clientpositive/masking_8.q.out | 1801 ++++-
 .../masking_acid_no_masking.q.out               |   20 +-
 .../clientpositive/masking_disablecbo_1.q.out   | 7372 +++++++++++++++++-
 .../clientpositive/masking_disablecbo_2.q.out   | 1271 ++-
 .../clientpositive/masking_disablecbo_4.q.out   |  132 +-
 ql/src/test/results/clientpositive/merge1.q.out |  170 +-
 ql/src/test/results/clientpositive/merge2.q.out |  170 +-
 .../merge_dynamic_partition.q.out               |  208 +-
 .../merge_dynamic_partition2.q.out              |  120 +-
 .../merge_dynamic_partition3.q.out              |  224 +-
 .../merge_dynamic_partition4.q.out              |  216 +-
 .../results/clientpositive/merge_empty.q.out    |   44 +-
 .../test/results/clientpositive/mergejoin.q.out |  564 +-
 .../results/clientpositive/mergejoins.q.out     |   64 +-
 .../clientpositive/mergejoins_mixed.q.out       |   80 +-
 .../clientpositive/metadata_only_queries.q.out  |  136 +-
 .../metadata_only_queries_with_filters.q.out    |  220 +-
 .../test/results/clientpositive/misc_json.q.out |   32 +-
 ql/src/test/results/clientpositive/mm_all.q.out |  788 +-
 .../results/clientpositive/mm_buckets.q.out     |  218 +-
 .../test/results/clientpositive/mm_cttas.q.out  |   74 +-
 .../results/clientpositive/mm_default.q.out     |   56 +-
 .../results/clientpositive/msck_repair_0.q.out  |  113 +-
 .../results/clientpositive/msck_repair_2.q.out  |   93 +-
 .../results/clientpositive/msck_repair_3.q.out  |   93 +-
 .../clientpositive/msck_repair_batchsize.q.out  |  123 +-
 .../clientpositive/msck_repair_drop.q.out       |  348 +-
 .../clientpositive/multi_insert_gby.q.out       |  136 +-
 .../clientpositive/multi_insert_gby2.q.out      |   36 +-
 .../clientpositive/multi_insert_gby3.q.out      |  170 +-
 .../clientpositive/multi_insert_gby4.q.out      |  114 +-
 .../clientpositive/multi_insert_mixed.q.out     |   76 +-
 ...i_insert_move_tasks_share_dependencies.q.out | 1056 +--
 .../multi_insert_partitioned.q.out              |  202 +-
 .../clientpositive/multi_insert_union_src.q.out |  114 +-
 .../clientpositive/multigroupby_singlemr.q.out  |  166 +-
 .../clientpositive/named_column_join.q.out      |  240 +-
 .../clientpositive/nested_column_pruning.q.out  |  494 +-
 .../test/results/clientpositive/newline.q.out   |  160 +-
 .../results/clientpositive/notable_alias1.q.out |   40 +-
 .../results/clientpositive/notable_alias2.q.out |   40 +-
 .../results/clientpositive/notable_alias3.q.out |   22 +-
 .../test/results/clientpositive/nullMap.q.out   |   32 +-
 .../results/clientpositive/null_column.q.out    |   28 +-
 .../nullability_transitive_inference.q.out      |  120 +-
 .../results/clientpositive/nullformatCTAS.q.out |   58 +-
 .../results/clientpositive/nullformatdir.q.out  |   48 +-
 .../results/clientpositive/nullgroup3.q.out     |  224 +-
 .../optimize_filter_literal.q.out               |  188 +-
 .../orc_dictionary_threshold.q.out              |   56 +-
 .../clientpositive/orc_diff_part_cols.q.out     |   58 +-
 .../clientpositive/orc_diff_part_cols2.q.out    |   38 +-
 .../clientpositive/orc_empty_files.q.out        |   28 +-
 .../clientpositive/orc_empty_strings.q.out      |   44 +-
 .../clientpositive/orc_ends_with_nulls.q.out    |   26 +-
 .../results/clientpositive/orc_file_dump.q.out  |   82 +-
 .../clientpositive/orc_int_type_promotion.q.out |  142 +-
 .../results/clientpositive/orc_merge1.q.out     |  256 +-
 .../results/clientpositive/orc_merge11.q.out    |  122 +-
 .../results/clientpositive/orc_merge2.q.out     |  248 +-
 .../results/clientpositive/orc_merge3.q.out     |  140 +-
 .../results/clientpositive/orc_merge5.q.out     |  212 +-
 .../results/clientpositive/orc_merge6.q.out     |  434 +-
 .../results/clientpositive/orc_merge8.q.out     |  136 +-
 .../clientpositive/orc_merge_diff_fs.q.out      |  256 +-
 .../clientpositive/orc_merge_incompat1.q.out    |  130 +-
 .../orc_merge_incompat_schema.q.out             |  158 +-
 .../orc_merge_incompat_writer_version.q.out     |  100 +-
 .../results/clientpositive/orc_min_max.q.out    |   96 +-
 .../orc_nested_column_pruning.q.out             |  494 +-
 .../clientpositive/orc_ppd_boolean.q.out        |   88 +-
 .../results/clientpositive/orc_ppd_char.q.out   |  200 +-
 .../orc_ppd_same_table_multiple_aliases.q.out   |   60 +-
 .../clientpositive/orc_ppd_schema_evol_1a.q.out |   36 +-
 .../clientpositive/orc_ppd_schema_evol_1b.q.out |   32 +-
 .../clientpositive/orc_ppd_schema_evol_2a.q.out |   58 +-
 .../clientpositive/orc_ppd_schema_evol_2b.q.out |  102 +-
 .../clientpositive/orc_ppd_str_conversion.q.out |   48 +-
 .../clientpositive/orc_schema_evolution.q.out   |   88 +-
 .../results/clientpositive/orc_wide_table.q.out | 4040 +++++-----
 ql/src/test/results/clientpositive/order3.q.out |   98 +-
 .../clientpositive/order_by_expr_1.q.out        |  246 +-
 .../clientpositive/order_by_expr_2.q.out        |   60 +-
 .../results/clientpositive/order_by_pos.q.out   |   76 +-
 .../test/results/clientpositive/parallel.q.out  |   58 +-
 .../clientpositive/parallel_colstats.q.out      |  116 +-
 .../results/clientpositive/parallel_join1.q.out |   38 +-
 .../clientpositive/parallel_orderby.q.out       |   54 +-
 .../results/clientpositive/parquet_ctas.q.out   |   74 +-
 .../clientpositive/parquet_decimal.q.out        |  128 +-
 .../results/clientpositive/parquet_join.q.out   |   76 +-
 .../results/clientpositive/parquet_join2.q.out  |   74 +-
 .../clientpositive/parquet_map_null.q.out       |   42 +-
 .../clientpositive/parquet_nested_complex.q.out |   62 +-
 .../clientpositive/parquet_ppd_char.q.out       |  200 +-
 .../clientpositive/parquet_ppd_date.q.out       |  272 +-
 .../clientpositive/parquet_ppd_decimal.q.out    |  440 +-
 .../clientpositive/parquet_ppd_partition.q.out  |   54 +-
 .../clientpositive/parquet_ppd_timestamp.q.out  |  264 +-
 .../clientpositive/parquet_ppd_varchar.q.out    |  200 +-
 .../parquet_table_with_subschema.q.out          |   40 +-
 ..._non_dictionary_encoding_vectorization.q.out |  168 +-
 .../parquet_types_vectorization.q.out           |  182 +-
 .../parquet_vectorization_part_project.q.out    |   94 +-
 .../test/results/clientpositive/partInit.q.out  |   58 +-
 .../clientpositive/part_inherit_tbl_props.q.out |   28 +-
 .../part_inherit_tbl_props_empty.q.out          |   28 +-
 .../test/results/clientpositive/partcols1.q.out |   30 +-
 .../clientpositive/partial_column_stats.q.out   |   36 +-
 .../partition_condition_remover.q.out           |   82 +-
 .../clientpositive/partition_decode_name.q.out  |   96 +-
 .../clientpositive/partition_type_check.q.out   |  134 +-
 .../partition_wise_fileformat.q.out             |  262 +-
 .../partition_wise_fileformat11.q.out           |  128 +-
 .../partition_wise_fileformat12.q.out           |  202 +-
 .../partition_wise_fileformat13.q.out           |  136 +-
 .../partition_wise_fileformat14.q.out           |  212 +-
 .../partition_wise_fileformat15.q.out           |  162 +-
 .../partition_wise_fileformat16.q.out           |  162 +-
 .../partition_wise_fileformat3.q.out            |  110 +-
 .../partition_wise_fileformat4.q.out            |   68 +-
 .../partition_wise_fileformat5.q.out            |  104 +-
 .../partition_wise_fileformat6.q.out            |   92 +-
 .../partition_wise_fileformat7.q.out            |   56 +-
 .../partition_wise_fileformat8.q.out            |  108 +-
 .../partition_wise_fileformat9.q.out            |   76 +-
 .../clientpositive/partitions_json.q.out        |   96 +-
 .../results/clientpositive/pointlookup2.q.out   |  708 +-
 .../results/clientpositive/pointlookup3.q.out   |  512 +-
 .../results/clientpositive/pointlookup4.q.out   |  160 +-
 .../test/results/clientpositive/ppd_join5.q.out |   72 +-
 .../clientpositive/ppd_outer_join5.q.out        |  110 +-
 .../clientpositive/ppd_repeated_alias.q.out     |   64 +-
 .../clientpositive/primitive_types.q.out        |   16 +-
 .../results/clientpositive/ptf_matchpath.q.out  |   68 +-
 ql/src/test/results/clientpositive/quote1.q.out |   50 +-
 .../results/clientpositive/quotedid_basic.q.out |   54 +-
 .../results/clientpositive/quotedid_skew.q.out  |   36 +-
 .../results/clientpositive/quotedid_stats.q.out |   36 +-
 .../clientpositive/rand_partitionpruner2.q.out  |   86 +-
 .../rcfile_toleratecorruptions.q.out            |   28 +-
 .../read_uint_parquet_vectorized.q.out          |  828 +-
 .../results/clientpositive/recursive_dir.q.out  |   72 +-
 .../reduce_deduplicate_exclude_gby.q.out        |   28 +-
 .../clientpositive/remove_exprs_stats.q.out     |  252 +-
 .../rename_partition_location.q.out             |   54 +-
 ql/src/test/results/clientpositive/repair.q.out |   59 +-
 .../root_dir_external_table.q.out               |   16 +-
 .../runtime_skewjoin_mapjoin_spark.q.out        |   34 +-
 .../test/results/clientpositive/sample1.q.out   |   86 +-
 .../test/results/clientpositive/sample2.q.out   |  336 +-
 .../test/results/clientpositive/sample4.q.out   |  336 +-
 .../test/results/clientpositive/sample5.q.out   |   82 +-
 .../test/results/clientpositive/sample6.q.out   |   82 +-
 .../test/results/clientpositive/sample7.q.out   |   82 +-
 .../sample_islocalmode_hook_use_metadata.q.out  |  114 +-
 ..._par_vec_table_non_dictionary_encoding.q.out |  548 +-
 .../results/clientpositive/scriptfile1.q.out    |   28 +-
 .../clientpositive/select_unquote_and.q.out     |   74 +-
 .../clientpositive/select_unquote_not.q.out     |   74 +-
 .../test/results/clientpositive/semijoin2.q.out |   32 +-
 .../test/results/clientpositive/semijoin3.q.out |   68 +-
 .../test/results/clientpositive/semijoin5.q.out |   56 +-
 .../clientpositive/setop_no_distinct.q.out      |  260 +-
 .../results/clientpositive/show_columns.q.out   |  144 +-
 .../show_create_table_alter.q.out               |  118 +-
 .../show_create_table_partitioned.q.out         |   30 +-
 .../show_create_table_serde.q.out               |  132 +-
 .../show_materialized_views.q.out               |   22 +-
 .../results/clientpositive/show_tables.q.out    |  102 +-
 .../results/clientpositive/show_views.q.out     |  274 +-
 .../test/results/clientpositive/skewjoin.q.out  |  308 +-
 .../clientpositive/skewjoin_mapjoin1.q.out      |   96 +-
 .../clientpositive/skewjoin_mapjoin10.q.out     |  144 +-
 .../clientpositive/skewjoin_mapjoin11.q.out     |   48 +-
 .../clientpositive/skewjoin_mapjoin2.q.out      |   64 +-
 .../clientpositive/skewjoin_mapjoin3.q.out      |   48 +-
 .../clientpositive/skewjoin_mapjoin4.q.out      |   68 +-
 .../clientpositive/skewjoin_mapjoin5.q.out      |   94 +-
 .../clientpositive/skewjoin_mapjoin6.q.out      |   60 +-
 .../clientpositive/skewjoin_mapjoin7.q.out      |   56 +-
 .../clientpositive/skewjoin_mapjoin8.q.out      |   76 +-
 .../clientpositive/skewjoin_mapjoin9.q.out      |   76 +-
 .../clientpositive/skewjoin_onesideskew.q.out   |   30 +-
 .../skewjoin_union_remove_1.q.out               |  172 +-
 .../skewjoin_union_remove_2.q.out               |   68 +-
 .../results/clientpositive/skewjoinopt1.q.out   |   96 +-
 .../results/clientpositive/skewjoinopt10.q.out  |   60 +-
 .../results/clientpositive/skewjoinopt11.q.out  |   56 +-
 .../results/clientpositive/skewjoinopt12.q.out  |   48 +-
 .../results/clientpositive/skewjoinopt13.q.out  |   76 +-
 .../results/clientpositive/skewjoinopt14.q.out  |   76 +-
 .../results/clientpositive/skewjoinopt16.q.out  |   48 +-
 .../results/clientpositive/skewjoinopt17.q.out  |  120 +-
 .../results/clientpositive/skewjoinopt18.q.out  |   72 +-
 .../results/clientpositive/skewjoinopt19.q.out  |   48 +-
 .../results/clientpositive/skewjoinopt2.q.out   |   96 +-
 .../results/clientpositive/skewjoinopt20.q.out  |   48 +-
 .../results/clientpositive/skewjoinopt21.q.out  |   64 +-
 .../results/clientpositive/skewjoinopt3.q.out   |   64 +-
 .../results/clientpositive/skewjoinopt4.q.out   |   64 +-
 .../results/clientpositive/skewjoinopt5.q.out   |   48 +-
 .../results/clientpositive/skewjoinopt6.q.out   |   48 +-
 .../results/clientpositive/skewjoinopt8.q.out   |   68 +-
 .../results/clientpositive/skewjoinopt9.q.out   |   94 +-
 .../results/clientpositive/smb_mapjoin_1.q.out  |  192 +-
 .../results/clientpositive/smb_mapjoin_11.q.out |  216 +-
 .../results/clientpositive/smb_mapjoin_12.q.out |  240 +-
 .../results/clientpositive/smb_mapjoin_13.q.out |  144 +-
 .../results/clientpositive/smb_mapjoin_16.q.out |   56 +-
 .../results/clientpositive/smb_mapjoin_2.q.out  |  176 +-
 .../results/clientpositive/smb_mapjoin_21.q.out |  212 +-
 .../results/clientpositive/smb_mapjoin_22.q.out |  216 +-
 .../results/clientpositive/smb_mapjoin_25.q.out |   72 +-
 .../results/clientpositive/smb_mapjoin_3.q.out  |  176 +-
 .../results/clientpositive/smb_mapjoin_46.q.out |  710 +-
 .../results/clientpositive/smb_mapjoin_47.q.out |  582 +-
 .../results/clientpositive/smb_mapjoin_8.q.out  |  388 +-
 .../clientpositive/sort_merge_join_desc_1.q.out |   64 +-
 .../clientpositive/sort_merge_join_desc_2.q.out |   64 +-
 .../clientpositive/sort_merge_join_desc_3.q.out |   64 +-
 .../clientpositive/sort_merge_join_desc_5.q.out |   90 +-
 .../clientpositive/sort_merge_join_desc_6.q.out |  102 +-
 .../clientpositive/sort_merge_join_desc_7.q.out |  184 +-
 .../clientpositive/sort_merge_join_desc_8.q.out |   64 +-
 .../spark/add_part_multiple.q.out               |  100 +-
 .../clientpositive/spark/alter_merge_orc.q.out  |  138 +-
 .../spark/annotate_stats_join.q.out             |  148 +-
 .../clientpositive/spark/auto_join1.q.out       |   36 +-
 .../clientpositive/spark/auto_join14.q.out      |   36 +-
 .../clientpositive/spark/auto_join17.q.out      |   40 +-
 .../clientpositive/spark/auto_join19.q.out      |   36 +-
 .../clientpositive/spark/auto_join24.q.out      |   32 +-
 .../clientpositive/spark/auto_join3.q.out       |   36 +-
 .../clientpositive/spark/auto_join4.q.out       |   40 +-
 .../clientpositive/spark/auto_join5.q.out       |   40 +-
 .../clientpositive/spark/auto_join6.q.out       |   40 +-
 .../clientpositive/spark/auto_join7.q.out       |   44 +-
 .../clientpositive/spark/auto_join8.q.out       |   40 +-
 .../clientpositive/spark/auto_join9.q.out       |   36 +-
 .../spark/auto_join_filters.q.out               |  480 +-
 .../clientpositive/spark/auto_join_nulls.q.out  |  192 +-
 .../clientpositive/spark/auto_join_stats.q.out  |   90 +-
 .../spark/auto_smb_mapjoin_14.q.out             |  150 +-
 .../spark/auto_sortmerge_join_1.q.out           |  270 +-
 .../spark/auto_sortmerge_join_12.q.out          |  172 +-
 .../spark/auto_sortmerge_join_13.q.out          |  272 +-
 .../spark/auto_sortmerge_join_14.q.out          |   84 +-
 .../spark/auto_sortmerge_join_15.q.out          |   48 +-
 .../spark/auto_sortmerge_join_16.q.out          |  334 +-
 .../spark/auto_sortmerge_join_16.q.out_spark    |  334 +-
 .../spark/auto_sortmerge_join_2.q.out           |  198 +-
 .../spark/auto_sortmerge_join_3.q.out           |  212 +-
 .../spark/auto_sortmerge_join_4.q.out           |  228 +-
 .../spark/auto_sortmerge_join_5.q.out           |  160 +-
 .../spark/auto_sortmerge_join_6.q.out           |  228 +-
 .../spark/auto_sortmerge_join_7.q.out           |  306 +-
 .../spark/auto_sortmerge_join_8.q.out           |  306 +-
 .../spark/auto_sortmerge_join_9.q.out           |  600 +-
 .../spark/avro_compression_enabled_native.q.out |   16 +-
 .../clientpositive/spark/avro_joins.q.out       |   64 +-
 .../spark/avro_joins_native.q.out               |   32 +-
 .../spark/bucket_map_join_1.q.out               |   88 +-
 .../spark/bucket_map_join_spark1.q.out          |  332 +-
 .../spark/bucket_map_join_spark2.q.out          |  316 +-
 .../spark/bucket_map_join_spark3.q.out          |  316 +-
 .../spark/bucket_map_join_spark4.q.out          |  136 +-
 .../spark/bucket_map_join_tez1.q.out            |  768 +-
 .../spark/bucket_map_join_tez2.q.out            |  392 +-
 .../clientpositive/spark/bucketmapjoin1.q.out   |  512 +-
 .../clientpositive/spark/bucketmapjoin10.q.out  |  228 +-
 .../clientpositive/spark/bucketmapjoin11.q.out  |  320 +-
 .../clientpositive/spark/bucketmapjoin12.q.out  |   68 +-
 .../clientpositive/spark/bucketmapjoin13.q.out  |  314 +-
 .../clientpositive/spark/bucketmapjoin2.q.out   |  696 +-
 .../clientpositive/spark/bucketmapjoin3.q.out   |  492 +-
 .../clientpositive/spark/bucketmapjoin4.q.out   |  452 +-
 .../clientpositive/spark/bucketmapjoin5.q.out   |  244 +-
 .../clientpositive/spark/bucketmapjoin7.q.out   |  104 +-
 .../spark/bucketmapjoin7.q.out_spark            |  104 +-
 .../clientpositive/spark/bucketmapjoin8.q.out   |  180 +-
 .../clientpositive/spark/bucketmapjoin9.q.out   |  230 +-
 .../spark/bucketmapjoin_negative.q.out          |  116 +-
 .../spark/bucketmapjoin_negative2.q.out         |  140 +-
 .../spark/bucketmapjoin_negative3.q.out         |  296 +-
 .../spark/bucketsortoptimize_insert_2.q.out     |  518 +-
 .../spark/bucketsortoptimize_insert_4.q.out     |  218 +-
 .../spark/bucketsortoptimize_insert_6.q.out     |  360 +-
 .../spark/bucketsortoptimize_insert_7.q.out     |  272 +-
 .../spark/bucketsortoptimize_insert_8.q.out     |  188 +-
 .../spark/column_access_stats.q.out             |  268 +-
 .../spark/constprog_semijoin.q.out              |  234 +-
 .../results/clientpositive/spark/count.q.out    |  192 +-
 .../spark/create_merge_compressed.q.out         |  136 +-
 .../spark/cross_product_check_1.q.out           |   64 +-
 .../spark/cross_product_check_2.q.out           |   64 +-
 .../spark/disable_merge_for_bucketing.q.out     |   48 +-
 .../disable_merge_for_bucketing.q.out_spark     |   48 +-
 .../spark/dynamic_rdd_cache.q.out               |  100 +-
 .../spark/filter_join_breaktask2.q.out          |  396 +-
 .../spark/gen_udf_example_add10.q.out           |   42 +-
 .../clientpositive/spark/groupby10.q.out        |   98 +-
 .../clientpositive/spark/groupby11.q.out        |   84 +-
 .../clientpositive/spark/groupby1_map.q.out     |   36 +-
 .../spark/groupby1_map_nomap.q.out              |   36 +-
 .../spark/groupby1_map_skew.q.out               |   36 +-
 .../clientpositive/spark/groupby1_noskew.q.out  |   36 +-
 .../results/clientpositive/spark/groupby2.q.out |   38 +-
 .../clientpositive/spark/groupby2_map.q.out     |   38 +-
 .../spark/groupby2_map_multi_distinct.q.out     |   76 +-
 .../spark/groupby2_map_skew.q.out               |   38 +-
 .../clientpositive/spark/groupby2_noskew.q.out  |   38 +-
 .../spark/groupby2_noskew_multi_distinct.q.out  |   42 +-
 .../results/clientpositive/spark/groupby3.q.out |   50 +-
 .../clientpositive/spark/groupby3_map.q.out     |   50 +-
 .../spark/groupby3_map_multi_distinct.q.out     |   54 +-
 .../spark/groupby3_map_skew.q.out               |   50 +-
 .../clientpositive/spark/groupby3_noskew.q.out  |   50 +-
 .../spark/groupby3_noskew_multi_distinct.q.out  |   54 +-
 .../results/clientpositive/spark/groupby4.q.out |   34 +-
 .../clientpositive/spark/groupby4_map.q.out     |   34 +-
 .../spark/groupby4_map_skew.q.out               |   34 +-
 .../clientpositive/spark/groupby4_noskew.q.out  |   34 +-
 .../results/clientpositive/spark/groupby5.q.out |   36 +-
 .../clientpositive/spark/groupby5_map.q.out     |   34 +-
 .../spark/groupby5_map_skew.q.out               |   34 +-
 .../clientpositive/spark/groupby5_noskew.q.out  |   36 +-
 .../results/clientpositive/spark/groupby6.q.out |   34 +-
 .../clientpositive/spark/groupby6_map.q.out     |   34 +-
 .../spark/groupby6_map_skew.q.out               |   34 +-
 .../clientpositive/spark/groupby6_noskew.q.out  |   34 +-
 .../results/clientpositive/spark/groupby7.q.out |   56 +-
 .../clientpositive/spark/groupby7_map.q.out     |   72 +-
 .../groupby7_map_multi_single_reducer.q.out     |   72 +-
 .../spark/groupby7_map_skew.q.out               |   72 +-
 .../clientpositive/spark/groupby7_noskew.q.out  |   72 +-
 .../groupby7_noskew_multi_single_reducer.q.out  |   72 +-
 .../results/clientpositive/spark/groupby8.q.out |  128 +-
 .../clientpositive/spark/groupby8_map.q.out     |   72 +-
 .../spark/groupby8_map_skew.q.out               |   72 +-
 .../clientpositive/spark/groupby8_noskew.q.out  |   72 +-
 .../results/clientpositive/spark/groupby9.q.out |  306 +-
 .../spark/groupby_complex_types.q.out           |  108 +-
 ...pby_complex_types_multi_single_reducer.q.out |   72 +-
 .../clientpositive/spark/groupby_cube1.q.out    |  168 +-
 .../spark/groupby_grouping_id2.q.out            |  100 +-
 .../clientpositive/spark/groupby_map_ppr.q.out  |   46 +-
 .../spark/groupby_map_ppr_multi_distinct.q.out  |   50 +-
 .../groupby_multi_insert_common_distinct.q.out  |   72 +-
 .../spark/groupby_multi_single_reducer2.q.out   |   98 +-
 .../spark/groupby_multi_single_reducer3.q.out   |  240 +-
 .../clientpositive/spark/groupby_ppr.q.out      |   46 +-
 .../clientpositive/spark/groupby_rollup1.q.out  |  148 +-
 .../spark/groupby_sort_1_23.q.out               | 1474 ++--
 .../spark/groupby_sort_skew_1_23.q.out          | 1474 ++--
 .../spark/infer_bucket_sort_map_operators.q.out |  228 +-
 .../spark/infer_bucket_sort_merge.q.out         |   52 +-
 .../spark/infer_bucket_sort_num_buckets.q.out   |   54 +-
 .../infer_bucket_sort_reducers_power_two.q.out  |  140 +-
 .../clientpositive/spark/innerjoin.q.out        |   60 +-
 .../results/clientpositive/spark/input12.q.out  |  110 +-
 .../results/clientpositive/spark/input13.q.out  |  110 +-
 .../results/clientpositive/spark/input14.q.out  |   36 +-
 .../results/clientpositive/spark/input17.q.out  |   36 +-
 .../results/clientpositive/spark/input18.q.out  |   36 +-
 .../clientpositive/spark/input1_limit.q.out     |   72 +-
 .../clientpositive/spark/input_part2.q.out      |   96 +-
 .../results/clientpositive/spark/insert1.q.out  |   36 +-
 .../spark/insert_overwrite_directory2.q.out     |   32 +-
 .../results/clientpositive/spark/join1.q.out    |   36 +-
 .../results/clientpositive/spark/join14.q.out   |   36 +-
 .../results/clientpositive/spark/join17.q.out   |   48 +-
 .../results/clientpositive/spark/join2.q.out    |   36 +-
 .../results/clientpositive/spark/join25.q.out   |   38 +-
 .../results/clientpositive/spark/join26.q.out   |   46 +-
 .../results/clientpositive/spark/join27.q.out   |   38 +-
 .../results/clientpositive/spark/join28.q.out   |   36 +-
 .../results/clientpositive/spark/join29.q.out   |   38 +-
 .../results/clientpositive/spark/join3.q.out    |   36 +-
 .../results/clientpositive/spark/join30.q.out   |   36 +-
 .../results/clientpositive/spark/join31.q.out   |   36 +-
 .../results/clientpositive/spark/join32.q.out   |   46 +-
 .../clientpositive/spark/join32_lessSize.q.out  |  228 +-
 .../results/clientpositive/spark/join33.q.out   |   46 +-
 .../results/clientpositive/spark/join34.q.out   |   46 +-
 .../results/clientpositive/spark/join35.q.out   |   46 +-
 .../results/clientpositive/spark/join36.q.out   |   94 +-
 .../results/clientpositive/spark/join37.q.out   |   38 +-
 .../results/clientpositive/spark/join38.q.out   |   60 +-
 .../results/clientpositive/spark/join39.q.out   |   40 +-
 .../results/clientpositive/spark/join4.q.out    |   40 +-
 .../results/clientpositive/spark/join5.q.out    |   40 +-
 .../results/clientpositive/spark/join6.q.out    |   40 +-
 .../results/clientpositive/spark/join7.q.out    |   44 +-
 .../results/clientpositive/spark/join8.q.out    |   40 +-
 .../results/clientpositive/spark/join9.q.out    |   44 +-
 .../spark/join_cond_pushdown_unqual1.q.out      |   32 +-
 .../spark/join_cond_pushdown_unqual3.q.out      |   32 +-
 .../spark/join_cond_pushdown_unqual4.q.out      |   24 +-
 .../spark/join_filters_overlap.q.out            |  386 +-
 .../clientpositive/spark/join_map_ppr.q.out     |   84 +-
 .../clientpositive/spark/join_nullsafe.q.out    |  320 +-
 .../clientpositive/spark/join_reorder.q.out     |  216 +-
 .../clientpositive/spark/join_reorder2.q.out    |  144 +-
 .../clientpositive/spark/join_reorder3.q.out    |  144 +-
 .../clientpositive/spark/join_reorder4.q.out    |  108 +-
 .../spark/lateral_view_multi_lateralviews.q.out |   26 +-
 .../clientpositive/spark/leftsemijoin.q.out     |  120 +-
 .../clientpositive/spark/leftsemijoin_mr.q.out  |   72 +-
 .../spark/leftsemijoin_mr.q.out_spark           |   72 +-
 .../spark/list_bucket_dml_2.q.out               |  178 +-
 .../clientpositive/spark/load_dyn_part1.q.out   |  124 +-
 .../clientpositive/spark/load_dyn_part11.q.out  |   58 +-
 .../clientpositive/spark/load_dyn_part14.q.out  |   66 +-
 .../clientpositive/spark/load_dyn_part8.q.out   |  116 +-
 .../results/clientpositive/spark/load_fs2.q.out |   50 +-
 .../clientpositive/spark/mapjoin_addjar.q.out   |   36 +-
 .../clientpositive/spark/mapjoin_decimal.q.out  |   92 +-
 .../spark/mapjoin_test_outer.q.out              |   76 +-
 .../clientpositive/spark/mapreduce1.q.out       |   40 +-
 .../clientpositive/spark/mapreduce2.q.out       |   40 +-
 .../results/clientpositive/spark/merge1.q.out   |  164 +-
 .../results/clientpositive/spark/merge2.q.out   |  164 +-
 .../clientpositive/spark/mergejoins.q.out       |   64 +-
 .../clientpositive/spark/mergejoins_mixed.q.out |   80 +-
 .../spark/metadata_only_queries.q.out           |  136 +-
 .../metadata_only_queries_with_filters.q.out    |  220 +-
 .../clientpositive/spark/multi_insert.q.out     |  704 +-
 .../clientpositive/spark/multi_insert_gby.q.out |  128 +-
 .../spark/multi_insert_gby2.q.out               |   34 +-
 .../spark/multi_insert_gby3.q.out               |  156 +-
 .../spark/multi_insert_lateral_view.q.out       |  150 +-
 .../spark/multi_insert_mixed.q.out              |   72 +-
 ...i_insert_move_tasks_share_dependencies.q.out |  928 +--
 .../spark/multigroupby_singlemr.q.out           |  156 +-
 .../clientpositive/spark/orc_merge1.q.out       |  250 +-
 .../clientpositive/spark/orc_merge2.q.out       |  246 +-
 .../clientpositive/spark/orc_merge3.q.out       |  138 +-
 .../clientpositive/spark/orc_merge5.q.out       |  208 +-
 .../clientpositive/spark/orc_merge6.q.out       |  430 +-
 .../clientpositive/spark/orc_merge7.q.out       |  678 +-
 .../clientpositive/spark/orc_merge8.q.out       |  136 +-
 .../spark/orc_merge_diff_fs.q.out               |  250 +-
 .../spark/orc_merge_incompat1.q.out             |  130 +-
 .../results/clientpositive/spark/parallel.q.out |   56 +-
 .../clientpositive/spark/parallel_join1.q.out   |   36 +-
 .../clientpositive/spark/parallel_orderby.q.out |   54 +-
 .../clientpositive/spark/parquet_join.q.out     |   76 +-
 .../parquet_vectorization_part_project.q.out    |   94 +-
 .../clientpositive/spark/ppd_join5.q.out        |   72 +-
 .../clientpositive/spark/ppd_outer_join5.q.out  |  110 +-
 .../test/results/clientpositive/spark/ptf.q.out |  120 +-
 .../clientpositive/spark/ptf_matchpath.q.out    |   68 +-
 .../spark/root_dir_external_table.q.out         |   16 +-
 .../spark/runtime_skewjoin_mapjoin_spark.q.out  |   30 +-
 .../results/clientpositive/spark/sample1.q.out  |   48 +-
 .../results/clientpositive/spark/sample2.q.out  |   44 +-
 .../results/clientpositive/spark/sample4.q.out  |   44 +-
 .../results/clientpositive/spark/sample5.q.out  |   44 +-
 .../results/clientpositive/spark/sample6.q.out  |   44 +-
 .../results/clientpositive/spark/sample7.q.out  |   44 +-
 .../clientpositive/spark/schemeAuthority2.q.out |   40 +-
 .../clientpositive/spark/scriptfile1.q.out      |   28 +-
 .../spark/scriptfile1.q.out_spark               |   28 +-
 .../results/clientpositive/spark/semijoin.q.out |  466 +-
 .../results/clientpositive/spark/skewjoin.q.out |  306 +-
 .../spark/skewjoin_union_remove_1.q.out         |  172 +-
 .../spark/skewjoin_union_remove_2.q.out         |   68 +-
 .../clientpositive/spark/skewjoinopt1.q.out     |   96 +-
 .../clientpositive/spark/skewjoinopt10.q.out    |   60 +-
 .../clientpositive/spark/skewjoinopt11.q.out    |   56 +-
 .../clientpositive/spark/skewjoinopt12.q.out    |   48 +-
 .../clientpositive/spark/skewjoinopt13.q.out    |   76 +-
 .../clientpositive/spark/skewjoinopt14.q.out    |   76 +-
 .../clientpositive/spark/skewjoinopt15.q.out    |  144 +-
 .../clientpositive/spark/skewjoinopt16.q.out    |   48 +-
 .../clientpositive/spark/skewjoinopt17.q.out    |  120 +-
 .../clientpositive/spark/skewjoinopt18.q.out    |   72 +-
 .../clientpositive/spark/skewjoinopt19.q.out    |   48 +-
 .../clientpositive/spark/skewjoinopt2.q.out     |   96 +-
 .../clientpositive/spark/skewjoinopt20.q.out    |   48 +-
 .../clientpositive/spark/skewjoinopt3.q.out     |   64 +-
 .../clientpositive/spark/skewjoinopt4.q.out     |   64 +-
 .../clientpositive/spark/skewjoinopt5.q.out     |   48 +-
 .../clientpositive/spark/skewjoinopt6.q.out     |   48 +-
 .../clientpositive/spark/skewjoinopt8.q.out     |   68 +-
 .../clientpositive/spark/skewjoinopt9.q.out     |   92 +-
 .../clientpositive/spark/smb_mapjoin_1.q.out    |  192 +-
 .../clientpositive/spark/smb_mapjoin_11.q.out   |  210 +-
 .../clientpositive/spark/smb_mapjoin_12.q.out   |  236 +-
 .../clientpositive/spark/smb_mapjoin_13.q.out   |  160 +-
 .../clientpositive/spark/smb_mapjoin_14.q.out   |  308 +-
 .../clientpositive/spark/smb_mapjoin_15.q.out   |  324 +-
 .../clientpositive/spark/smb_mapjoin_16.q.out   |   56 +-
 .../clientpositive/spark/smb_mapjoin_17.q.out   |  224 +-
 .../clientpositive/spark/smb_mapjoin_18.q.out   |  344 +-
 .../clientpositive/spark/smb_mapjoin_19.q.out   |  224 +-
 .../clientpositive/spark/smb_mapjoin_2.q.out    |  176 +-
 .../clientpositive/spark/smb_mapjoin_21.q.out   |  200 +-
 .../clientpositive/spark/smb_mapjoin_22.q.out   |  212 +-
 .../clientpositive/spark/smb_mapjoin_25.q.out   |   72 +-
 .../clientpositive/spark/smb_mapjoin_3.q.out    |  176 +-
 .../clientpositive/spark/smb_mapjoin_5.q.out    |  308 +-
 .../clientpositive/spark/smb_mapjoin_6.q.out    |  356 +-
 .../clientpositive/spark/smb_mapjoin_8.q.out    |  388 +-
 .../spark/spark_constprog_dpp.q.out             |   40 +-
 .../spark/spark_dynamic_partition_pruning.q.out |  710 +-
 .../spark_dynamic_partition_pruning_2.q.out     |  370 +-
 .../spark_dynamic_partition_pruning_4.q.out     |  382 +-
 .../spark_dynamic_partition_pruning_5.q.out     |   80 +-
 ...dynamic_partition_pruning_mapjoin_only.q.out |   54 +-
 .../spark/spark_explainuser_1.q.out             |  640 +-
 .../spark_multi_insert_parallel_orderby.q.out   |  202 +-
 ...k_vectorized_dynamic_partition_pruning.q.out |  396 +-
 .../results/clientpositive/spark/stats1.q.out   |   62 +-
 .../results/clientpositive/spark/stats10.q.out  |  126 +-
 .../results/clientpositive/spark/stats12.q.out  |  152 +-
 .../results/clientpositive/spark/stats15.q.out  |  220 +-
 .../results/clientpositive/spark/stats18.q.out  |   60 +-
 .../results/clientpositive/spark/stats3.q.out   |  174 +-
 .../results/clientpositive/spark/stats6.q.out   |  126 +-
 .../results/clientpositive/spark/stats7.q.out   |  100 +-
 .../results/clientpositive/spark/stats8.q.out   |  288 +-
 .../clientpositive/spark/stats_noscan_1.q.out   |  142 +-
 .../results/clientpositive/spark/statsfs.q.out  |  310 +-
 .../clientpositive/spark/subquery_exists.q.out  |  214 +-
 .../clientpositive/spark/subquery_in.q.out      |  218 +-
 .../clientpositive/spark/subquery_notin.q.out   |  292 +-
 .../clientpositive/spark/subquery_scalar.q.out  |  710 +-
 .../clientpositive/spark/subquery_select.q.out  |   94 +-
 .../spark/table_access_keys_stats.q.out         |  328 +-
 .../clientpositive/spark/temp_table.q.out       |  104 +-
 .../clientpositive/spark/temp_table_gb1.q.out   |   42 +-
 .../clientpositive/spark/timestamp_udf.q.out    |  106 +-
 .../clientpositive/spark/uber_reduce.q.out      |   24 +-
 .../results/clientpositive/spark/union10.q.out  |   40 +-
 .../results/clientpositive/spark/union12.q.out  |   40 +-
 .../results/clientpositive/spark/union17.q.out  |   74 +-
 .../results/clientpositive/spark/union18.q.out  |   78 +-
 .../results/clientpositive/spark/union19.q.out  |   76 +-
 .../results/clientpositive/spark/union24.q.out  |  396 +-
 .../results/clientpositive/spark/union27.q.out  |   60 +-
 .../results/clientpositive/spark/union29.q.out  |   40 +-
 .../results/clientpositive/spark/union3.q.out   |   26 +-
 .../results/clientpositive/spark/union30.q.out  |   42 +-
 .../results/clientpositive/spark/union31.q.out  |  384 +-
 .../results/clientpositive/spark/union32.q.out  |  156 +-
 .../results/clientpositive/spark/union33.q.out  |   68 +-
 .../results/clientpositive/spark/union34.q.out  |  160 +-
 .../results/clientpositive/spark/union4.q.out   |   38 +-
 .../results/clientpositive/spark/union6.q.out   |   38 +-
 .../clientpositive/spark/union_remove_10.q.out  |   98 +-
 .../clientpositive/spark/union_remove_11.q.out  |   98 +-
 .../clientpositive/spark/union_remove_12.q.out  |   84 +-
 .../clientpositive/spark/union_remove_13.q.out  |   84 +-
 .../clientpositive/spark/union_remove_14.q.out  |   84 +-
 .../clientpositive/spark/union_remove_15.q.out  |  114 +-
 .../clientpositive/spark/union_remove_16.q.out  |  114 +-
 .../clientpositive/spark/union_remove_17.q.out  |  116 +-
 .../clientpositive/spark/union_remove_18.q.out  |  170 +-
 .../clientpositive/spark/union_remove_19.q.out  |  188 +-
 .../clientpositive/spark/union_remove_2.q.out   |   98 +-
 .../clientpositive/spark/union_remove_20.q.out  |   84 +-
 .../clientpositive/spark/union_remove_21.q.out  |   82 +-
 .../clientpositive/spark/union_remove_22.q.out  |  140 +-
 .../clientpositive/spark/union_remove_23.q.out  |   84 +-
 .../clientpositive/spark/union_remove_24.q.out  |   84 +-
 .../clientpositive/spark/union_remove_25.q.out  |  192 +-
 .../clientpositive/spark/union_remove_3.q.out   |   98 +-
 .../clientpositive/spark/union_remove_4.q.out   |   88 +-
 .../clientpositive/spark/union_remove_5.q.out   |  102 +-
 .../clientpositive/spark/union_remove_6.q.out   |  114 +-
 .../spark/union_remove_6_subq.q.out             |   80 +-
 .../clientpositive/spark/union_remove_7.q.out   |   84 +-
 .../clientpositive/spark/union_remove_8.q.out   |   98 +-
 .../clientpositive/spark/union_remove_9.q.out   |   98 +-
 .../clientpositive/spark/union_view.q.out       |   88 +-
 .../clientpositive/spark/uniquejoin.q.out       |  140 +-
 .../clientpositive/spark/varchar_join1.q.out    |  128 +-
 .../spark/vector_cast_constant.q.out            |   80 +-
 .../spark/vector_data_types.q.out               |  146 +-
 .../spark/vector_decimal_mapjoin.q.out          |  104 +-
 .../spark/vector_distinct_2.q.out               |   76 +-
 .../clientpositive/spark/vector_groupby_3.q.out |   76 +-
 .../clientpositive/spark/vector_orderby_5.q.out |   76 +-
 .../spark/vector_outer_join2.q.out              |  284 +-
 .../spark/vector_outer_join3.q.out              |  340 +-
 .../spark/vector_string_concat.q.out            |   76 +-
 .../clientpositive/spark/vector_varchar_4.q.out |   76 +-
 .../clientpositive/spark/vectorization_0.q.out  |   44 +-
 .../vectorization_input_format_excludes.q.out   |  168 +-
 .../vectorization_parquet_projection.q.out      |   56 +-
 .../spark/vectorization_part.q.out              |  100 +-
 .../clientpositive/spark/vectorized_case.q.out  |  124 +-
 .../clientpositive/spark/vectorized_ptf.q.out   |   28 +-
 .../spark/vectorized_rcfile_columnar.q.out      |   36 +-
 ql/src/test/results/clientpositive/stats1.q.out |   64 +-
 .../test/results/clientpositive/stats10.q.out   |  128 +-
 .../test/results/clientpositive/stats12.q.out   |  152 +-
 .../test/results/clientpositive/stats15.q.out   |  220 +-
 .../test/results/clientpositive/stats18.q.out   |   60 +-
 ql/src/test/results/clientpositive/stats3.q.out |  174 +-
 ql/src/test/results/clientpositive/stats6.q.out |  126 +-
 ql/src/test/results/clientpositive/stats7.q.out |  100 +-
 ql/src/test/results/clientpositive/stats8.q.out |  288 +-
 .../stats_aggregator_error_1.q.out              |   88 +-
 .../clientpositive/stats_empty_dyn_part.q.out   |   28 +-
 .../clientpositive/stats_empty_partition.q.out  |   30 +-
 .../clientpositive/stats_empty_partition2.q.out |   92 +-
 .../results/clientpositive/stats_noscan_1.q.out |  142 +-
 .../test/results/clientpositive/statsfs.q.out   |  310 +-
 .../results/clientpositive/struct_in_view.q.out |  112 +-
 .../test/results/clientpositive/structin.q.out  |   20 +-
 .../clientpositive/subquery_exists.q.out        |  214 +-
 .../clientpositive/subquery_exists_having.q.out |   20 +-
 .../clientpositive/subquery_notin_having.q.out  |  108 +-
 .../subquery_unqualcolumnrefs.q.out             |   22 +-
 .../results/clientpositive/tablevalues.q.out    |  136 +-
 .../results/clientpositive/temp_table_gb1.q.out |   42 +-
 .../temp_table_windowing_expressions.q.out      |   52 +-
 .../clientpositive/testSetQueryString.q.out     |   28 +-
 .../tez/acid_vectorization_original_tez.q.out   |  230 +-
 .../clientpositive/tez/explainanalyze_1.q.out   |   42 +-
 .../clientpositive/tez/explainanalyze_3.q.out   |  410 +-
 .../clientpositive/tez/explainanalyze_5.q.out   |  260 +-
 .../clientpositive/tez/explainuser_3.q.out      |  332 +-
 .../tez/multi_count_distinct.q.out              |   94 +-
 .../results/clientpositive/tez/tez-tag.q.out    |  244 +-
 .../results/clientpositive/timestamp_udf.q.out  |  106 +-
 .../results/clientpositive/timestamptz_3.q.out  |   54 +-
 .../clientpositive/truncate_column.q.out        |  228 +-
 .../truncate_column_list_bucket.q.out           |  116 +-
 .../clientpositive/truncate_column_merge.q.out  |   80 +-
 .../results/clientpositive/tunable_ndv.q.out    |  264 +-
 .../clientpositive/type_change_test_int.q.out   | 1692 ++--
 .../results/clientpositive/type_widening.q.out  |   44 +-
 .../results/clientpositive/typechangetest.q.out | 1396 ++--
 .../udaf_binarysetfunctions.q.out               |  502 +-
 .../udaf_binarysetfunctions_no_cbo.q.out        |  498 +-
 .../clientpositive/udaf_context_ngrams.q.out    |   68 +-
 .../test/results/clientpositive/udaf_corr.q.out |   72 +-
 .../clientpositive/udaf_covar_samp.q.out        |   72 +-
 .../udaf_percentile_approx_23.q.out             |  620 +-
 ql/src/test/results/clientpositive/udf1.q.out   |   78 +-
 ql/src/test/results/clientpositive/udf2.q.out   |   32 +-
 ql/src/test/results/clientpositive/udf3.q.out   |   44 +-
 ql/src/test/results/clientpositive/udf4.q.out   |   32 +-
 ql/src/test/results/clientpositive/udf5.q.out   |   46 +-
 ql/src/test/results/clientpositive/udf6.q.out   |   46 +-
 ql/src/test/results/clientpositive/udf7.q.out   |   32 +-
 ql/src/test/results/clientpositive/udf8.q.out   |   42 +-
 .../results/clientpositive/udf_10_trims.q.out   |   32 +-
 .../clientpositive/udf_character_length.q.out   |  118 +-
 .../clientpositive/udf_concat_insert1.q.out     |   28 +-
 .../clientpositive/udf_concat_insert2.q.out     |   28 +-
 .../results/clientpositive/udf_concat_ws.q.out  |   82 +-
 .../test/results/clientpositive/udf_field.q.out |   48 +-
 .../clientpositive/udf_get_json_object.q.out    |   52 +-
 .../test/results/clientpositive/udf_isops.q.out |  126 +-
 .../results/clientpositive/udf_length.q.out     |   82 +-
 .../clientpositive/udf_octet_length.q.out       |  104 +-
 .../results/clientpositive/udf_printf.q.out     |   40 +-
 .../results/clientpositive/udf_reverse.q.out    |   76 +-
 .../results/clientpositive/udf_round_2.q.out    |   42 +-
 .../results/clientpositive/udf_sort_array.q.out |   24 +-
 .../clientpositive/udf_stddev_samp.q.out        |   46 +-
 .../clientpositive/udf_to_unix_timestamp.q.out  |   48 +-
 .../clientpositive/udf_unix_timestamp.q.out     |   24 +-
 .../results/clientpositive/udf_var_samp.q.out   |   46 +-
 .../clientpositive/udf_width_bucket.q.out       |   84 +-
 .../clientpositive/udtf_json_tuple.q.out        |   34 +-
 .../clientpositive/udtf_replicate_rows.q.out    |   70 +-
 .../test/results/clientpositive/union10.q.out   |   46 +-
 .../test/results/clientpositive/union12.q.out   |   46 +-
 .../test/results/clientpositive/union17.q.out   |   78 +-
 .../test/results/clientpositive/union18.q.out   |   86 +-
 .../test/results/clientpositive/union19.q.out   |   80 +-
 .../test/results/clientpositive/union24.q.out   |  396 +-
 .../test/results/clientpositive/union27.q.out   |   60 +-
 .../test/results/clientpositive/union29.q.out   |   46 +-
 ql/src/test/results/clientpositive/union3.q.out |   26 +-
 .../test/results/clientpositive/union30.q.out   |   48 +-
 .../test/results/clientpositive/union31.q.out   |  392 +-
 .../test/results/clientpositive/union32.q.out   |  156 +-
 .../test/results/clientpositive/union33.q.out   |   80 +-
 .../test/results/clientpositive/union34.q.out   |  164 +-
 ql/src/test/results/clientpositive/union4.q.out |   44 +-
 ql/src/test/results/clientpositive/union6.q.out |   44 +-
 .../results/clientpositive/union_paren.q.out    |   86 +-
 .../clientpositive/union_pos_alias.q.out        | 1718 +++-
 .../clientpositive/union_remove_10.q.out        |   98 +-
 .../clientpositive/union_remove_11.q.out        |   98 +-
 .../clientpositive/union_remove_12.q.out        |   84 +-
 .../clientpositive/union_remove_13.q.out        |   84 +-
 .../clientpositive/union_remove_14.q.out        |   84 +-
 .../clientpositive/union_remove_15.q.out        |  116 +-
 .../clientpositive/union_remove_16.q.out        |  116 +-
 .../clientpositive/union_remove_17.q.out        |  116 +-
 .../clientpositive/union_remove_18.q.out        |  172 +-
 .../clientpositive/union_remove_19.q.out        |  194 +-
 .../results/clientpositive/union_remove_2.q.out |   98 +-
 .../clientpositive/union_remove_20.q.out        |   86 +-
 .../clientpositive/union_remove_21.q.out        |   84 +-
 .../clientpositive/union_remove_22.q.out        |  144 +-
 .../clientpositive/union_remove_23.q.out        |   84 +-
 .../clientpositive/union_remove_24.q.out        |   86 +-
 .../clientpositive/union_remove_25.q.out        |  194 +-
 .../results/clientpositive/union_remove_3.q.out |   98 +-
 .../results/clientpositive/union_remove_4.q.out |   90 +-
 .../results/clientpositive/union_remove_5.q.out |  102 +-
 .../results/clientpositive/union_remove_6.q.out |  116 +-
 .../clientpositive/union_remove_6_subq.q.out    |   82 +-
 .../results/clientpositive/union_remove_7.q.out |   86 +-
 .../results/clientpositive/union_remove_8.q.out |   98 +-
 .../results/clientpositive/union_remove_9.q.out |   98 +-
 .../results/clientpositive/union_view.q.out     |   84 +-
 .../results/clientpositive/uniquejoin.q.out     |  140 +-
 .../clientpositive/updateAccessTime.q.out       |  162 +-
 .../clientpositive/updateBasicStats.q.out       |  230 +-
 .../results/clientpositive/varchar_join1.q.out  |  128 +-
 .../clientpositive/vector_aggregate_9.q.out     |  104 +-
 .../vector_binary_join_groupby.q.out            |   50 +-
 .../clientpositive/vector_cast_constant.q.out   |   80 +-
 .../results/clientpositive/vector_char_2.q.out  |   76 +-
 .../clientpositive/vector_char_cast.q.out       |   34 +-
 .../clientpositive/vector_coalesce_3.q.out      |   76 +-
 .../clientpositive/vector_data_types.q.out      |  146 +-
 .../clientpositive/vector_decimal_3.q.out       |  136 +-
 .../clientpositive/vector_decimal_4.q.out       |  104 +-
 .../vector_decimal_expressions.q.out            |   94 +-
 .../clientpositive/vector_decimal_mapjoin.q.out |  112 +-
 .../vector_decimal_math_funcs.q.out             |   46 +-
 .../clientpositive/vector_decimal_udf2.q.out    |   92 +-
 .../clientpositive/vector_distinct_2.q.out      |   76 +-
 .../clientpositive/vector_groupby4.q.out        |   62 +-
 .../clientpositive/vector_groupby6.q.out        |   62 +-
 .../clientpositive/vector_groupby_3.q.out       |   76 +-
 .../clientpositive/vector_groupby_reduce.q.out  |  144 +-
 .../clientpositive/vector_grouping_sets.q.out   |  100 +-
 .../clientpositive/vector_include_no_sel.q.out  |   88 +-
 .../clientpositive/vector_map_order.q.out       |   30 +-
 .../vector_mr_diff_schema_alias.q.out           |   54 +-
 .../clientpositive/vector_null_projection.q.out |   76 +-
 .../clientpositive/vector_orderby_5.q.out       |   76 +-
 .../clientpositive/vector_outer_join2.q.out     |  284 +-
 .../clientpositive/vector_outer_join3.q.out     |  346 +-
 .../clientpositive/vector_outer_join6.q.out     |   64 +-
 .../results/clientpositive/vector_reduce1.q.out |   76 +-
 .../results/clientpositive/vector_reduce2.q.out |   76 +-
 .../results/clientpositive/vector_reduce3.q.out |   76 +-
 .../vector_reduce_groupby_decimal.q.out         |   46 +-
 .../clientpositive/vector_string_concat.q.out   |   76 +-
 .../clientpositive/vector_struct_in.q.out       |   96 +-
 .../vector_tablesample_rows.q.out               |   46 +-
 .../vector_udf_character_length.q.out           |  142 +-
 .../vector_udf_octet_length.q.out               |  128 +-
 .../clientpositive/vector_varchar_4.q.out       |   76 +-
 .../clientpositive/vector_varchar_simple.q.out  |   64 +-
 .../clientpositive/vector_when_case_null.q.out  |   34 +-
 .../vectorization_parquet_ppd_decimal.q.out     |  440 +-
 .../vectorization_parquet_projection.q.out      |   56 +-
 .../clientpositive/vectorization_part.q.out     |  100 +-
 .../clientpositive/vectorized_case.q.out        |  124 +-
 .../clientpositive/vectorized_date_funcs.q.out  |   28 +-
 .../vectorized_parquet_types.q.out              |  206 +-
 .../vectorized_rcfile_columnar.q.out            |   36 +-
 .../clientpositive/vectorized_timestamp.q.out   |  116 +-
 ql/src/test/results/clientpositive/view.q.out   |  236 +-
 .../results/clientpositive/view_alias.q.out     |  314 +-
 .../view_authorization_sqlstd.q.out             |  182 +-
 .../test/results/clientpositive/view_cbo.q.out  |  284 +-
 .../clientpositive/windowing_duplicate.q.out    |   10 +-
 .../clientpositive/windowing_expressions.q.out  |  108 +-
 .../windowing_multipartitioning.q.out           |   68 +-
 .../clientpositive/windowing_navfn.q.out        |  116 +-
 .../clientpositive/windowing_ntile.q.out        |   52 +-
 .../windowing_range_multiorder.q.out            |  108 +-
 .../results/clientpositive/windowing_rank.q.out |   88 +-
 .../clientpositive/windowing_streaming.q.out    |   88 +-
 .../results/clientpositive/windowing_udaf.q.out |   60 +-
 .../clientpositive/windowing_windowspec.q.out   |  140 +-
 .../clientpositive/windowing_windowspec3.q.out  |   60 +-
 3004 files changed, 207405 insertions(+), 182726 deletions(-)
----------------------------------------------------------------------