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

[hive] branch master updated: HIVE-23217 Move q tests to TestMiniLlapLocal from TestCliDriver where the output is unchanged (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4634cc4  HIVE-23217 Move q tests to TestMiniLlapLocal from TestCliDriver where the output is unchanged (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)
4634cc4 is described below

commit 4634cc479f36681177f7bca085e41738689cc2bb
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Thu Apr 16 02:28:26 2020 +0200

    HIVE-23217 Move q tests to TestMiniLlapLocal from TestCliDriver where the output is unchanged (Miklos Gergely, reviewed by Jesus Camacho Rodriguez)
---
 .../test/resources/testconfiguration.properties    | 914 ++++++++++++++++++++-
 ql/src/test/queries/clientpositive/lock1.q         |   2 +
 ql/src/test/queries/clientpositive/lock2.q         |   2 +
 ql/src/test/queries/clientpositive/lock3.q         |   2 +
 ql/src/test/queries/clientpositive/lock4.q         |   2 +
 .../queries/clientpositive/orc_diff_part_cols.q    |   2 +-
 .../clientpositive/temp_table_orc_diff_part_cols.q |   4 +-
 .../acid_bloom_filter_orc_file_dump.q.out          |   0
 .../{ => llap}/acid_insert_overwrite.q.out         |   0
 .../clientpositive/{ => llap}/acid_join.q.out      |   0
 .../clientpositive/{ => llap}/acid_stats.q.out     |   0
 .../clientpositive/{ => llap}/acid_subquery.q.out  |   0
 .../{ => llap}/acid_table_directories_test.q.out   |   0
 .../{ => llap}/acid_vectorization.q.out            |   0
 .../{ => llap}/acid_vectorization_partition.q.out  |   0
 .../{ => llap}/acid_vectorization_project.q.out    |   0
 .../clientpositive/{ => llap}/add_jar_pfile.q.out  |   0
 .../{ => llap}/add_jar_with_file_removed.q.out     |   0
 .../clientpositive/{ => llap}/add_part_exist.q.out |   0
 .../{ => llap}/add_part_multiple.q.out             |   0
 .../{ => llap}/add_partition_no_whitelist.q.out    |   0
 .../{ => llap}/add_partition_with_whitelist.q.out  |   0
 .../{ => llap}/allow_change_col_type_par.q.out     |   0
 .../results/clientpositive/{ => llap}/alter1.q.out |   0
 .../results/clientpositive/{ => llap}/alter2.q.out |   0
 .../results/clientpositive/{ => llap}/alter3.q.out |   0
 .../results/clientpositive/{ => llap}/alter4.q.out |   0
 .../results/clientpositive/{ => llap}/alter5.q.out |   0
 .../{ => llap}/alterColumnStats.q.out              |   0
 .../clientpositive/{ => llap}/alter_char1.q.out    |   0
 .../clientpositive/{ => llap}/alter_char2.q.out    |   0
 .../{ => llap}/alter_file_format.q.out             |   0
 .../clientpositive/{ => llap}/alter_merge.q.out    |   0
 .../clientpositive/{ => llap}/alter_merge_2.q.out  |   0
 .../clientpositive/{ => llap}/alter_merge_3.q.out  |   0
 .../{ => llap}/alter_merge_stats.q.out             |   0
 .../alter_numbuckets_partitioned_table2_h23.q.out  |   0
 .../alter_numbuckets_partitioned_table_h23.q.out   |   0
 .../alter_partition_clusterby_sortby.q.out         |   0
 .../{ => llap}/alter_partition_format_loc.q.out    |   0
 .../alter_partition_onto_nocurrent_db.q.out        |   0
 .../{ => llap}/alter_partition_update_status.q.out |   0
 .../alter_partition_with_whitelist.q.out           |   0
 .../{ => llap}/alter_rename_partition.q.out        |   0
 .../alter_rename_partition_authorization.q.out     |   0
 .../{ => llap}/alter_rename_table.q.out            |   0
 .../{ => llap}/alter_skewed_table.q.out            |   0
 .../{ => llap}/alter_table_add_partition.q.out     |   0
 .../{ => llap}/alter_table_cascade.q.out           |   0
 .../{ => llap}/alter_table_column_stats.q.out      |   0
 .../{ => llap}/alter_table_location.q.out          |   0
 .../{ => llap}/alter_table_not_sorted.q.out        |   0
 .../{ => llap}/alter_table_partition_drop.q.out    |   0
 .../{ => llap}/alter_table_serde.q.out             |   0
 .../{ => llap}/alter_table_serde2.q.out            |   0
 .../{ => llap}/alter_table_stats_status.q.out      |   0
 .../{ => llap}/alter_table_update_status.q.out     |   0
 ...ter_table_update_status_disable_bitvector.q.out |   0
 .../clientpositive/{ => llap}/alter_varchar1.q.out |   0
 .../clientpositive/{ => llap}/alter_varchar2.q.out |   0
 .../{ => llap}/alter_view_as_select.q.out          |   0
 .../{ => llap}/alter_view_col_type.q.out           |   0
 .../{ => llap}/alter_view_rename.q.out             |   0
 .../{ => llap}/analyze_tbl_part.q.out              |   0
 .../{ => llap}/authorization_1.q.out               |   0
 .../{ => llap}/authorization_1_sql_std.q.out       |   0
 .../{ => llap}/authorization_3.q.out               |   0
 .../{ => llap}/authorization_4.q.out               |   0
 .../{ => llap}/authorization_5.q.out               |   0
 .../{ => llap}/authorization_6.q.out               |   0
 .../{ => llap}/authorization_7.q.out               |   0
 .../{ => llap}/authorization_8.q.out               |   0
 .../{ => llap}/authorization_admin_almighty1.q.out |   0
 .../{ => llap}/authorization_admin_almighty2.q.out |   0
 ...horization_alter_table_exchange_partition.q.out |   0
 .../{ => llap}/authorization_cli_createtab.q.out   |   0
 .../authorization_cli_createtab_noauthzapi.q.out   |   0
 .../{ => llap}/authorization_cli_nonsql.q.out      |   0
 .../authorization_cli_stdconfigauth.q.out          |   0
 .../{ => llap}/authorization_create_func1.q.out    |   0
 .../{ => llap}/authorization_create_macro1.q.out   |   0
 .../authorization_create_table_owner_privs.q.out   |   0
 .../authorization_create_temp_table.q.out          |   0
 ...rization_default_create_table_owner_privs.q.out |   0
 .../{ => llap}/authorization_delete.q.out          |   0
 .../authorization_delete_own_table.q.out           |   0
 .../authorization_grant_option_role.q.out          |   0
 .../authorization_grant_public_role.q.out          |   0
 .../authorization_grant_table_priv.q.out           |   0
 .../{ => llap}/authorization_insert.q.out          |   0
 .../{ => llap}/authorization_load.q.out            |   0
 .../{ => llap}/authorization_non_id.q.out          |   0
 .../{ => llap}/authorization_owner_actions.q.out   |   0
 .../{ => llap}/authorization_parts.q.out           |   0
 .../{ => llap}/authorization_reset.q.out           |   0
 .../authorization_revoke_table_priv.q.out          |   0
 .../{ => llap}/authorization_role_grant1.q.out     |   0
 .../{ => llap}/authorization_role_grant2.q.out     |   0
 .../authorization_set_show_current_role.q.out      |   0
 .../{ => llap}/authorization_show_grant.q.out      |   0
 .../authorization_show_role_principals_v1.q.out    |   0
 .../{ => llap}/authorization_update.q.out          |   0
 .../authorization_update_own_table.q.out           |   0
 .../{ => llap}/authorization_view_2.q.out          |   0
 .../{ => llap}/authorization_view_3.q.out          |   0
 .../{ => llap}/authorization_view_4.q.out          |   0
 .../authorization_view_disable_cbo_2.q.out         |   0
 .../authorization_view_disable_cbo_3.q.out         |   0
 .../authorization_view_disable_cbo_4.q.out         |   0
 .../{ => llap}/authorization_wm.q.out              |   0
 .../{ => llap}/autoColumnStats_3.q.out             |   0
 .../{ => llap}/avro_add_column.q.out               |   0
 .../{ => llap}/avro_add_column2.q.out              |   0
 .../{ => llap}/avro_add_column3.q.out              |   0
 .../{ => llap}/avro_add_column_extschema.q.out     |   0
 .../avro_alter_table_update_columns.q.out          |   0
 .../{ => llap}/avro_change_schema.q.out            |   0
 .../{ => llap}/avro_charvarchar.q.out              |   0
 .../clientpositive/{ => llap}/avro_comments.q.out  |   0
 .../{ => llap}/avro_compression_enabled.q.out      |   0
 .../avro_compression_enabled_native.q.out          |   0
 .../clientpositive/{ => llap}/avro_decimal.q.out   |   0
 .../{ => llap}/avro_decimal_native.q.out           |   0
 .../{ => llap}/avro_decimal_old.q.out              |   0
 .../{ => llap}/avro_deserialize_map_null.q.out     |   0
 .../{ => llap}/avro_evolved_schemas.q.out          |   0
 .../{ => llap}/avro_historical_timestamp.q.out     |   0
 .../clientpositive/{ => llap}/avro_joins.q.out     |   0
 .../{ => llap}/avro_joins_native.q.out             |   0
 .../clientpositive/{ => llap}/avro_native.q.out    |   0
 .../{ => llap}/avro_nullable_fields.q.out          |   0
 .../{ => llap}/avro_nullable_union.q.out           |   0
 .../{ => llap}/avro_partitioned.q.out              |   0
 .../{ => llap}/avro_partitioned_native.q.out       |   0
 .../{ => llap}/avro_sanity_test.q.out              |   0
 .../{ => llap}/avro_schema_literal.q.out           |   0
 .../{ => llap}/avro_tableproperty_optimize.q.out   |   0
 .../{ => llap}/avro_type_evolution.q.out           |   0
 .../{ => llap}/avrocountemptytbl.q.out             |   0
 .../clientpositive/{ => llap}/ba_table1.q.out      |   0
 .../clientpositive/{ => llap}/ba_table2.q.out      |   0
 .../clientpositive/{ => llap}/ba_table3.q.out      |   0
 .../clientpositive/{ => llap}/ba_table_udfs.q.out  |   0
 .../clientpositive/{ => llap}/ba_table_union.q.out |   0
 .../{ => llap}/basicstat_partval.q.out             |   0
 .../{ => llap}/binary_constant.q.out               |   0
 .../{ => llap}/binary_table_bincolserde.q.out      |   0
 .../{ => llap}/binary_table_colserde.q.out         |   0
 .../clientpositive/{ => llap}/bitvector.q.out      |   0
 .../clientpositive/{ => llap}/bool_literal.q.out   |   0
 .../clientpositive/{ => llap}/bucket7.q.out        |   0
 .../{ => llap}/bucket_if_with_path_filter.q.out    |   0
 .../bucketizedhiveinputformat_auto.q.out           |   0
 .../results/clientpositive/{ => llap}/cast2.q.out  |   0
 .../results/clientpositive/{ => llap}/cast3.q.out  |   0
 .../{ => llap}/cast_qualified_types.q.out          |   0
 .../{ => llap}/cast_tinyint_to_double.q.out        |   0
 .../clientpositive/{ => llap}/cast_to_int.q.out    |   0
 .../{ => llap}/cbo_rp_gby_empty.q.out              |   0
 .../clientpositive/{ => llap}/cbo_rp_stats.q.out   |   0
 .../{ => llap}/cbo_rp_udf_percentile.q.out         |   0
 .../{ => llap}/cbo_rp_udf_percentile2.q.out        |   0
 .../clientpositive/{ => llap}/cbo_rp_union.q.out   |   0
 .../{ => llap}/cbo_rp_windowing.q.out              |   0
 .../clientpositive/{ => llap}/cbo_udf_max.q.out    |   0
 .../results/clientpositive/{ => llap}/char_1.q.out |   0
 .../results/clientpositive/{ => llap}/char_2.q.out |   0
 .../clientpositive/{ => llap}/char_cast.q.out      |   0
 .../{ => llap}/char_comparison.q.out               |   0
 .../clientpositive/{ => llap}/char_join1.q.out     |   0
 .../{ => llap}/char_nested_types.q.out             |   0
 .../{ => llap}/char_pad_convert.q.out              |   0
 .../clientpositive/{ => llap}/char_union1.q.out    |   0
 .../{ => llap}/char_varchar_udf.q.out              |   0
 .../{ => llap}/cli_print_escape_crlf.q.out         |   0
 .../{ => llap}/cmdwithcomments.q.out               |   0
 .../clientpositive/{ => llap}/collision.q.out      |   0
 .../{ => llap}/columnstats_infinity.q.out          |   0
 .../clientpositive/{ => llap}/combine1.q.out       |   0
 .../clientpositive/{ => llap}/combine3.q.out       |   0
 .../{ => llap}/comma_in_column_name.q.out          |   0
 .../{ => llap}/compile_processor.q.out             |   0
 .../clientpositive/{ => llap}/compustat_avro.q.out |   0
 .../{ => llap}/compute_stats_binary.q.out          |   0
 .../{ => llap}/compute_stats_boolean.q.out         |   0
 .../{ => llap}/compute_stats_decimal.q.out         | Bin
 .../{ => llap}/compute_stats_double.q.out          | Bin
 .../{ => llap}/compute_stats_empty_table.q.out     |   0
 .../{ => llap}/compute_stats_long.q.out            | Bin
 .../{ => llap}/compute_stats_string.q.out          | Bin
 .../concatenate_inherit_table_location.q.out       |   0
 .../{ => llap}/confirm_initial_tbl_stats.q.out     |   0
 .../{ => llap}/constant_prop_4.q.out               |   0
 .../{ => llap}/convert_enum_to_string.q.out        |   0
 .../clientpositive/{ => llap}/cp_mj_rc.q.out       |   0
 .../clientpositive/{ => llap}/create_1.q.out       |   0
 .../create_alter_list_bucketing_table1.q.out       |   0
 .../{ => llap}/create_big_view.q.out               |   0
 .../{ => llap}/create_default_prop.q.out           |   0
 .../clientpositive/{ => llap}/create_escape.q.out  |   0
 .../clientpositive/{ => llap}/create_func1.q.out   |   0
 .../{ => llap}/create_genericudf.q.out             |   0
 .../{ => llap}/create_insert_outputformat.q.out    |   0
 .../clientpositive/{ => llap}/create_like.q.out    |   0
 .../clientpositive/{ => llap}/create_like2.q.out   |   0
 .../{ => llap}/create_like_tbl_props.q.out         |   0
 .../{ => llap}/create_like_view.q.out              |   0
 .../{ => llap}/create_nested_type.q.out            |   0
 .../{ => llap}/create_or_replace_view.q.out        |   0
 .../{ => llap}/create_skewed_table1.q.out          |   0
 .../{ => llap}/create_struct_table.q.out           |   0
 .../{ => llap}/create_table_like_stats.q.out       |   0
 .../create_transactional_full_acid.q.out           |   0
 .../create_transactional_insert_only.q.out         |   0
 .../{ => llap}/create_union_table.q.out            |   0
 .../{ => llap}/create_view_defaultformats.q.out    |   0
 .../{ => llap}/create_view_partitioned.q.out       |   0
 .../{ => llap}/create_view_translate.q.out         |   0
 .../{ => llap}/create_with_constraints.q.out       |   0
 .../{ => llap}/create_with_constraints2.q.out      |   0
 .../{ => llap}/crtseltbl_serdeprops.q.out          |   0
 .../{ => llap}/ct_case_insensitive.q.out           |   0
 .../clientpositive/{ => llap}/ctas_char.q.out      |   0
 .../clientpositive/{ => llap}/ctas_date.q.out      |   0
 .../{ => llap}/ctas_uses_table_location.q.out      |   0
 .../clientpositive/{ => llap}/ctas_varchar.q.out   |   0
 .../clientpositive/{ => llap}/cteViews.q.out       |   0
 .../results/clientpositive/{ => llap}/cte_7.q.out  |   0
 .../{ => llap}/current_catalog_and_schema.q.out    |   0
 .../clientpositive/{ => llap}/database_drop.q.out  |   0
 .../results/clientpositive/{ => llap}/date_1.q.out |   0
 .../results/clientpositive/{ => llap}/date_3.q.out |   0
 .../results/clientpositive/{ => llap}/date_4.q.out |   0
 .../results/clientpositive/{ => llap}/date_5.q.out |   0
 .../{ => llap}/date_comparison.q.out               |   0
 .../{ => llap}/date_int_operation_test.q.out       |   0
 .../clientpositive/{ => llap}/date_join1.q.out     |   0
 .../{ => llap}/date_timestamp_prec.q.out           |   0
 .../clientpositive/{ => llap}/date_udf.q.out       |   0
 .../clientpositive/{ => llap}/dbtxnmgr_abort.q.out |   0
 .../{ => llap}/dbtxnmgr_compact1.q.out             |   0
 .../{ => llap}/dbtxnmgr_compact2.q.out             |   0
 .../{ => llap}/dbtxnmgr_compact3.q.out             |   0
 .../clientpositive/{ => llap}/dbtxnmgr_ddl1.q.out  |   0
 .../{ => llap}/dbtxnmgr_query1.q.out               |   0
 .../{ => llap}/dbtxnmgr_query2.q.out               |   0
 .../{ => llap}/dbtxnmgr_query3.q.out               |   0
 .../{ => llap}/dbtxnmgr_query4.q.out               |   0
 .../{ => llap}/dbtxnmgr_query5.q.out               |   0
 .../{ => llap}/dbtxnmgr_showlocks.q.out            |   0
 .../clientpositive/{ => llap}/decimal_1.q.out      |   0
 .../clientpositive/{ => llap}/decimal_10_0.q.out   |   0
 .../clientpositive/{ => llap}/decimal_1_1.q.out    |   0
 .../clientpositive/{ => llap}/decimal_2.q.out      |   0
 .../clientpositive/{ => llap}/decimal_3.q.out      |   0
 .../clientpositive/{ => llap}/decimal_4.q.out      |   0
 .../clientpositive/{ => llap}/decimal_5.q.out      |   0
 .../clientpositive/{ => llap}/decimal_6.q.out      |   0
 .../clientpositive/{ => llap}/decimal_join.q.out   |   0
 .../clientpositive/{ => llap}/decimal_serde.q.out  |   0
 .../{ => llap}/decimal_skewjoin.q.out              |   0
 .../{ => llap}/decimal_trailing.q.out              |   0
 .../{ => llap}/default_file_format.q.out           |   0
 .../{ => llap}/default_partition_name.q.out        |   0
 .../clientpositive/{ => llap}/delimiter.q.out      |   0
 .../clientpositive/{ => llap}/desc_function.q.out  |   0
 .../{ => llap}/desc_non_existent_tbl.q.out         |   0
 .../{ => llap}/desc_tbl_part_cols.q.out            |   0
 .../{ => llap}/describe_comment_indent.q.out       |   0
 .../{ => llap}/describe_comment_nonascii.q.out     |   0
 .../{ => llap}/describe_database_json.q.out        |   0
 .../describe_formatted_view_partitioned.q.out      |   0
 .../describe_formatted_view_partitioned_json.q.out |   0
 .../{ => llap}/describe_syntax.q.out               |   0
 .../clientpositive/{ => llap}/describe_table.q.out |   0
 .../{ => llap}/describe_table_json.q.out           |   0
 .../clientpositive/{ => llap}/describe_xpath.q.out |   0
 .../results/clientpositive/{ => llap}/dfscmd.q.out |   0
 .../{ => llap}/diff_part_input_formats.q.out       |   0
 .../{ => llap}/disable_file_format_check.q.out     |   0
 .../disallow_incompatible_type_change_off.q.out    |   0
 .../{ => llap}/driver_conf_isolation.q.out         |   0
 .../clientpositive/{ => llap}/driverhook.q.out     |   0
 .../drop_database_removes_partition_dirs.q.out     |   0
 .../{ => llap}/drop_deleted_partitions.q.out       |   0
 .../clientpositive/{ => llap}/drop_function.q.out  |   0
 .../{ => llap}/drop_multi_partitions.q.out         |   0
 .../{ => llap}/drop_partitions_filter.q.out        |   0
 .../{ => llap}/drop_partitions_filter2.q.out       |   0
 .../{ => llap}/drop_partitions_filter3.q.out       |   0
 .../{ => llap}/drop_partitions_filter4.q.out       |   0
 .../clientpositive/{ => llap}/drop_table.q.out     |   0
 .../clientpositive/{ => llap}/drop_table2.q.out    |   0
 .../{ => llap}/drop_table_purge.q.out              |   0
 .../drop_table_removes_partition_dirs.q.out        |   0
 .../{ => llap}/drop_table_with_stats.q.out         |   0
 .../clientpositive/{ => llap}/drop_udf.q.out       |   0
 .../clientpositive/{ => llap}/drop_view.q.out      |   0
 .../{ => llap}/encoding_nonutf8.q.out              |   0
 .../clientpositive/{ => llap}/equal_ns.q.out       |   0
 .../clientpositive/{ => llap}/escape3.q.out        |   0
 .../clientpositive/{ => llap}/escape_crlf.q.out    |   0
 .../{ => llap}/exchange_partition.q.out            |   0
 .../{ => llap}/exchange_partition2.q.out           |   0
 .../{ => llap}/exchange_partition3.q.out           |   0
 .../{ => llap}/exim_00_nonpart_empty.q.out         |   0
 .../{ => llap}/exim_01_nonpart.q.out               |   0
 .../{ => llap}/exim_02_00_part_empty.q.out         |   0
 .../clientpositive/{ => llap}/exim_02_part.q.out   |   0
 .../{ => llap}/exim_03_nonpart_over_compat.q.out   |   0
 .../{ => llap}/exim_04_all_part.q.out              |   0
 .../{ => llap}/exim_04_evolved_parts.q.out         |   0
 .../{ => llap}/exim_05_some_part.q.out             |   0
 .../{ => llap}/exim_06_one_part.q.out              |   0
 .../exim_07_all_part_over_nonoverlap.q.out         |   0
 .../{ => llap}/exim_08_nonpart_rename.q.out        |   0
 .../{ => llap}/exim_09_part_spec_nonoverlap.q.out  |   0
 .../{ => llap}/exim_10_external_managed.q.out      |   0
 .../{ => llap}/exim_11_managed_external.q.out      |   0
 .../{ => llap}/exim_12_external_location.q.out     |   0
 .../{ => llap}/exim_13_managed_location.q.out      |   0
 .../exim_14_managed_location_over_existing.q.out   |   0
 .../{ => llap}/exim_15_external_part.q.out         |   0
 .../{ => llap}/exim_16_part_external.q.out         |   0
 .../{ => llap}/exim_17_part_managed.q.out          |   0
 .../{ => llap}/exim_18_part_external.q.out         |   0
 .../exim_19_00_part_external_location.q.out        |   0
 .../exim_19_part_external_location.q.out           |   0
 .../{ => llap}/exim_20_part_managed_location.q.out |   0
 .../{ => llap}/exim_21_export_authsuccess.q.out    |   0
 .../exim_22_import_exist_authsuccess.q.out         |   0
 .../exim_23_import_part_authsuccess.q.out          |   0
 .../exim_24_import_nonexist_authsuccess.q.out      |   0
 ...port_parentpath_has_inaccessible_children.q.out |   0
 .../{ => llap}/exim_hidden_files.q.out             |   0
 .../clientpositive/{ => llap}/explain_ast.q.out    |   0
 .../{ => llap}/explain_dependency.q.out            |   0
 .../{ => llap}/explain_dependency2.q.out           |   0
 .../clientpositive/{ => llap}/explain_locks.q.out  |   0
 .../clientpositive/{ => llap}/explode_null.q.out   |   0
 .../clientpositive/{ => llap}/expr_cached.q.out    |   0
 .../{ => llap}/external_insert.q.out               |   0
 .../clientpositive/{ => llap}/fileformat_mix.q.out |   0
 .../{ => llap}/fileformat_sequencefile.q.out       |   0
 .../{ => llap}/fileformat_text.q.out               |   0
 .../clientpositive/{ => llap}/float_equality.q.out |   0
 .../clientpositive/{ => llap}/groupby7.q.out       |   0
 .../{ => llap}/groupby_constcolval.q.out           |   0
 .../clientpositive/{ => llap}/groupby_empty.q.out  |   0
 .../{ => llap}/groupby_grouping_id1.q.out          |   0
 .../groupby_mutli_insert_common_distinct.q.out     |   0
 .../{ => llap}/groupby_neg_float.q.out             |   0
 .../{ => llap}/groupby_nullvalues.q.out            |   0
 .../clientpositive/{ => llap}/hook_order.q.out     |   0
 .../{ => llap}/hypothetical_set_aggregates.q.out   |   0
 .../clientpositive/{ => llap}/init_file.q.out      |   0
 .../clientpositive/{ => llap}/inoutdriver.q.out    |   0
 .../results/clientpositive/{ => llap}/input1.q.out |   0
 .../clientpositive/{ => llap}/input10.q.out        |   0
 .../clientpositive/{ => llap}/input15.q.out        |   0
 .../clientpositive/{ => llap}/input16.q.out        |   0
 .../clientpositive/{ => llap}/input19.q.out        |   0
 .../results/clientpositive/{ => llap}/input2.q.out |   0
 .../clientpositive/{ => llap}/input24.q.out        |   0
 .../clientpositive/{ => llap}/input28.q.out        |   0
 .../results/clientpositive/{ => llap}/input3.q.out |   0
 .../clientpositive/{ => llap}/input40.q.out        |   0
 .../clientpositive/{ => llap}/input41.q.out        |   0
 .../clientpositive/{ => llap}/input43.q.out        |   0
 .../clientpositive/{ => llap}/input45.q.out        |   0
 .../clientpositive/{ => llap}/input46.q.out        |   0
 .../clientpositive/{ => llap}/input49.q.out        |   0
 .../{ => llap}/input4_cb_delim.q.out               |   0
 .../clientpositive/{ => llap}/input_dfs.q.out      |   0
 .../clientpositive/{ => llap}/inputddl1.q.out      |   0
 .../clientpositive/{ => llap}/inputddl2.q.out      |   0
 .../clientpositive/{ => llap}/inputddl3.q.out      |   0
 .../clientpositive/{ => llap}/inputddl4.q.out      |   0
 .../clientpositive/{ => llap}/inputddl5.q.out      |   0
 .../clientpositive/{ => llap}/inputddl6.q.out      |   0
 .../clientpositive/{ => llap}/inputddl7.q.out      |   0
 .../clientpositive/{ => llap}/inputddl8.q.out      |   0
 .../clientpositive/{ => llap}/insert2.q.out        |   0
 .../{ => llap}/insert_acid_dynamic_partition.q.out |   0
 .../{ => llap}/insert_acid_not_bucketed.q.out      |   0
 .../{ => llap}/insert_compressed.q.out             |   0
 .../{ => llap}/insert_into_with_schema2.q.out      |   0
 .../insert_non_utf8_encoding_table.q.out           |   0
 .../{ => llap}/insert_overwrite_directory.q.out    |   0
 .../{ => llap}/insert_overwrite_directory2.q.out   |   0
 .../insert_values_acid_not_bucketed.q.out          |   0
 .../{ => llap}/insert_values_nonascii.q.out        |   0
 .../insert_with_move_files_from_source_dir.q.out   |   0
 .../{ => llap}/insertexternal1.q.out               |   0
 .../{ => llap}/insertvalues_espchars.q.out         |   0
 .../clientpositive/{ => llap}/interval_1.q.out     |   0
 .../clientpositive/{ => llap}/interval_2.q.out     |   0
 .../{ => llap}/interval_comparison.q.out           |   0
 .../clientpositive/{ => llap}/interval_udf.q.out   |   0
 .../results/clientpositive/{ => llap}/join24.q.out |   0
 .../clientpositive/{ => llap}/join_array.q.out     |   0
 .../{ => llap}/join_casesensitive.q.out            |   0
 .../clientpositive/{ => llap}/join_empty.q.out     |   0
 .../clientpositive/{ => llap}/join_literals.q.out  |   0
 .../clientpositive/{ => llap}/json_serde1.q.out    |   0
 .../clientpositive/{ => llap}/json_serde2.q.out    |   0
 .../{ => llap}/json_serde_qualified_types.q.out    |   0
 .../{ => llap}/json_serde_tsformat.q.out           |   0
 .../clientpositive/{ => llap}/keyword_2.q.out      |   0
 .../clientpositive/{ => llap}/keyword_3.q.out      |   0
 .../lateral_view_multi_lateralviews.q.out          |   0
 .../clientpositive/{ => llap}/lb_fs_stats.q.out    |   0
 .../clientpositive/{ => llap}/leadlag.q.out        |   0
 .../results/clientpositive/{ => llap}/limit0.q.out |   0
 .../{ => llap}/load_dyn_part15.q.out               |   0
 .../clientpositive/{ => llap}/load_dyn_part7.q.out |   0
 .../{ => llap}/load_exist_part_authsuccess.q.out   |   0
 .../load_file_with_space_in_the_name.q.out         |   0
 .../clientpositive/{ => llap}/load_fs.q.out        |   0
 .../{ => llap}/load_fs_overwrite.q.out             |   0
 .../{ => llap}/load_local_dir_test.q.out           |   0
 .../{ => llap}/load_non_hdfs_path.q.out            |   0
 .../{ => llap}/load_nonpart_authsuccess.q.out      |   0
 .../clientpositive/{ => llap}/load_orc.q.out       |   0
 .../clientpositive/{ => llap}/load_orc_part.q.out  |   0
 .../clientpositive/{ => llap}/load_overwrite.q.out |   0
 .../{ => llap}/load_part_authsuccess.q.out         |   0
 .../clientpositive/{ => llap}/loadpart1.q.out      |   0
 .../clientpositive/{ => llap}/loadpart2.q.out      |   0
 .../clientpositive/{ => llap}/localtimezone2.q.out |   0
 .../results/clientpositive/{ => llap}/lock1.q.out  |   0
 .../results/clientpositive/{ => llap}/lock2.q.out  |   0
 .../results/clientpositive/{ => llap}/lock3.q.out  |   0
 .../results/clientpositive/{ => llap}/lock4.q.out  |   0
 .../clientpositive/{ => llap}/mapjoin_addjar.q.out |   0
 .../clientpositive/{ => llap}/masking_11.q.out     |   0
 .../clientpositive/{ => llap}/masking_14.q.out     |   0
 .../{ => llap}/masking_acid_no_masking.q.out       |   0
 .../materialized_view_authorization_sqlstd.q.out   |   0
 .../{ => llap}/materialized_view_create_acid.q.out |   0
 .../{ => llap}/metadata_empty_table.q.out          |   0
 .../{ => llap}/metadata_export_drop.q.out          |   0
 .../results/clientpositive/{ => llap}/mi.q.out     |   0
 .../{ => llap}/min_structvalue.q.out               |   0
 .../clientpositive/{ => llap}/misc_json.q.out      |   0
 .../clientpositive/{ => llap}/mm_default.q.out     |   0
 .../{ => llap}/mm_insert_overwrite_aborted.q.out   |   0
 .../clientpositive/{ => llap}/mm_iow_temp.q.out    |   0
 .../clientpositive/{ => llap}/mm_loc_ctas.q.out    |   0
 .../{ => llap}/multi_insert_partitioned.q.out      |   0
 .../{ => llap}/multi_insert_with_join.q.out        |   0
 .../clientpositive/{ => llap}/multi_sahooks.q.out  |   0
 .../clientpositive/{ => llap}/nested_complex.q.out |   0
 .../{ => llap}/nested_complex_additional.q.out     |   0
 .../clientpositive/{ => llap}/nestedvirtual.q.out  |   0
 .../{ => llap}/nomore_ambiguous_table_col.q.out    |   0
 .../{ => llap}/nonReservedKeyWords.q.out           |   0
 .../{ => llap}/non_ascii_literal1.q.out            |   0
 .../{ => llap}/non_ascii_literal2.q.out            |   0
 .../clientpositive/{ => llap}/notable_alias3.q.out |   0
 .../clientpositive/{ => llap}/nullMap.q.out        |   0
 .../clientpositive/{ => llap}/null_column.q.out    |   0
 .../clientpositive/{ => llap}/nullformatdir.q.out  |   0
 .../clientpositive/{ => llap}/nullinput.q.out      |   0
 .../clientpositive/{ => llap}/nullinput2.q.out     |   0
 .../clientpositive/{ => llap}/nullshandling.q.out  |   0
 .../clientpositive/{ => llap}/ops_comparison.q.out |   0
 .../{ => llap}/orc_dictionary_threshold.q.out      |   0
 .../{ => llap}/orc_diff_part_cols.q.out            |   4 +-
 .../{ => llap}/orc_diff_part_cols2.q.out           |   0
 .../{ => llap}/orc_empty_files.q.out               |   0
 .../{ => llap}/orc_empty_strings.q.out             |   0
 .../{ => llap}/orc_empty_table.q.out               |   0
 .../{ => llap}/orc_ends_with_nulls.q.out           |   0
 .../clientpositive/{ => llap}/orc_file_dump.q.out  |   0
 .../clientpositive/{ => llap}/orc_merge13.q.out    |   0
 .../clientpositive/{ => llap}/orc_min_max.q.out    |   0
 .../{ => llap}/orc_mr_pathalias.q.out              |   0
 .../clientpositive/{ => llap}/orc_null_check.q.out |   0
 .../{ => llap}/orc_ppd_boolean.q.out               |   0
 .../clientpositive/{ => llap}/orc_ppd_char.q.out   |   0
 .../{ => llap}/orc_ppd_exception.q.out             |   0
 .../{ => llap}/orc_ppd_is_null.q.out               |   0
 .../orc_ppd_same_table_multiple_aliases.q.out      |   0
 .../{ => llap}/orc_remove_cols.q.out               |   0
 .../{ => llap}/orc_schema_evolution.q.out          |   0
 .../{ => llap}/orc_timestamplocaltz_type.q.out     |   0
 .../clientpositive/{ => llap}/orc_wide_table.q.out |   0
 .../results/clientpositive/{ => llap}/order2.q.out |   0
 .../{ => llap}/order_within_subquery.q.out         |   0
 .../{ => llap}/overridden_confs.q.out              |   0
 .../clientpositive/{ => llap}/parenthese.q.out     |   0
 .../{ => llap}/parquet_analyze.q.out               |   0
 .../parquet_array_map_emptynullvals.q.out          |   0
 .../{ => llap}/parquet_array_null_element.q.out    |   0
 .../parquet_array_of_multi_field_struct.q.out      |   0
 .../parquet_array_of_optional_elements.q.out       |   0
 .../parquet_array_of_required_elements.q.out       |   0
 .../parquet_array_of_single_field_struct.q.out     |   0
 .../{ => llap}/parquet_array_of_structs.q.out      |   0
 .../parquet_array_of_unannotated_groups.q.out      |   0
 .../parquet_array_of_unannotated_primitives.q.out  |   0
 .../parquet_avro_array_of_primitives.q.out         |   0
 ...parquet_avro_array_of_single_field_struct.q.out |   0
 .../{ => llap}/parquet_columnar.q.out              |   0
 .../clientpositive/{ => llap}/parquet_ctas.q.out   |   0
 .../{ => llap}/parquet_decimal.q.out               |   0
 .../{ => llap}/parquet_decimal1.q.out              |   0
 .../{ => llap}/parquet_external_time.q.out         |   0
 .../{ => llap}/parquet_historical_timestamp.q.out  |   0
 .../{ => llap}/parquet_int64_timestamp.q.out       |   0
 .../{ => llap}/parquet_int_decimal.q.out           |   0
 .../clientpositive/{ => llap}/parquet_join2.q.out  |   0
 .../{ => llap}/parquet_map_null.q.out              |   0
 .../{ => llap}/parquet_map_of_arrays_of_ints.q.out |   0
 .../{ => llap}/parquet_map_of_maps.q.out           |   0
 .../{ => llap}/parquet_mixed_case.q.out            |   0
 .../parquet_mixed_partition_formats.q.out          |   0
 .../{ => llap}/parquet_nested_complex.q.out        |   0
 .../{ => llap}/parquet_partitioned.q.out           |   0
 .../clientpositive/{ => llap}/parquet_ppd.q.out    |   0
 .../{ => llap}/parquet_ppd_char2.q.out             |   0
 .../{ => llap}/parquet_ppd_multifiles.q.out        |   0
 .../{ => llap}/parquet_ppd_partition.q.out         |   0
 .../{ => llap}/parquet_predicate_pushdown_2.q.out  |   0
 .../parquet_read_backward_compatible_files.q.out   |   0
 .../clientpositive/{ => llap}/parquet_serde.q.out  |   0
 .../clientpositive/{ => llap}/parquet_stats.q.out  |   0
 .../{ => llap}/parquet_table_with_subschema.q.out  |   0
 ...rquet_thrift_array_of_single_field_struct.q.out |   0
 .../{ => llap}/parquet_type_promotion.q.out        |   0
 .../parquet_vectorization_nested_udf.q.out         |   0
 .../{ => llap}/parquet_vectorization_not.q.out     |   0
 .../{ => llap}/parquet_vectorization_part.q.out    |   0
 .../parquet_vectorization_part_varchar.q.out       |   0
 .../parquet_write_correct_definition_levels.q.out  |   0
 .../clientpositive/{ => llap}/partInit.q.out       |   0
 .../{ => llap}/part_inherit_tbl_props.q.out        |   0
 .../{ => llap}/part_inherit_tbl_props_empty.q.out  |   0
 .../part_inherit_tbl_props_with_star.q.out         |   0
 .../{ => llap}/partition_boolean.q.out             |   0
 .../clientpositive/{ => llap}/partition_char.q.out |   0
 .../{ => llap}/partition_coltype_literals.q.out    |   0
 .../clientpositive/{ => llap}/partition_date.q.out |   0
 .../{ => llap}/partition_date2.q.out               |   0
 .../{ => llap}/partition_decode_name.q.out         |   0
 .../{ => llap}/partition_params_postgres.q.out     |   0
 .../{ => llap}/partition_schema1.q.out             |   0
 .../{ => llap}/partition_serde_format.q.out        |   0
 .../{ => llap}/partition_special_char.q.out        |   0
 .../{ => llap}/partition_timestamp.q.out           |   0
 .../{ => llap}/partition_type_check.q.out          |   0
 .../{ => llap}/partition_type_in_plan.q.out        |   0
 .../{ => llap}/partition_varchar1.q.out            |   0
 .../{ => llap}/partition_varchar2.q.out            |   0
 .../{ => llap}/partition_wise_fileformat.q.out     |   0
 .../{ => llap}/partition_wise_fileformat10.q.out   |   0
 .../{ => llap}/partition_wise_fileformat11.q.out   |   0
 .../{ => llap}/partition_wise_fileformat12.q.out   |   0
 .../{ => llap}/partition_wise_fileformat13.q.out   |   0
 .../{ => llap}/partition_wise_fileformat14.q.out   |   0
 .../{ => llap}/partition_wise_fileformat15.q.out   |   0
 .../{ => llap}/partition_wise_fileformat16.q.out   |   0
 .../{ => llap}/partition_wise_fileformat17.q.out   |   0
 .../{ => llap}/partition_wise_fileformat18.q.out   |   0
 .../{ => llap}/partition_wise_fileformat3.q.out    |   0
 .../{ => llap}/partition_wise_fileformat4.q.out    |   0
 .../{ => llap}/partition_wise_fileformat5.q.out    |   0
 .../{ => llap}/partition_wise_fileformat6.q.out    |   0
 .../{ => llap}/partition_wise_fileformat7.q.out    |   0
 .../{ => llap}/partition_wise_fileformat8.q.out    |   0
 .../{ => llap}/partition_wise_fileformat9.q.out    |   0
 .../{ => llap}/partitioned_table_stats.q.out       |   0
 .../{ => llap}/partitions_filter_default.q.out     |   0
 .../{ => llap}/partitions_json.q.out               |   0
 .../clientpositive/{ => llap}/plan_json.q.out      |   0
 .../{ => llap}/ppd_constant_where.q.out            |   0
 .../{ => llap}/ppd_field_garbage.q.out             |   0
 .../{ => llap}/ppd_like_filter.q.out               |   0
 .../clientpositive/{ => llap}/ppr_pushdown2.q.out  |   0
 .../{ => llap}/primitive_types.q.out               |   0
 .../clientpositive/{ => llap}/progress_1.q.out     |   0
 .../clientpositive/{ => llap}/ptf_decimal.q.out    |   0
 .../{ => llap}/ptf_general_queries.q.out           |   0
 .../clientpositive/{ => llap}/ptf_rcfile.q.out     |   0
 .../{ => llap}/ptf_register_tblfn.q.out            |   0
 .../clientpositive/{ => llap}/ptf_seqfile.q.out    |   0
 .../{ => llap}/query_lifetime_hook.q.out           |   0
 .../{ => llap}/query_properties.q.out              |   0
 .../clientpositive/{ => llap}/quotedid_alter.q.out |   0
 .../clientpositive/{ => llap}/quotedid_stats.q.out |   0
 .../{ => llap}/quotedid_tblproperty.q.out          |   0
 .../{ => llap}/rcfile_columnar.q.out               |   0
 .../{ => llap}/rcfile_default_format.q.out         |   0
 .../{ => llap}/rcfile_lazydecompress.q.out         |   0
 .../{ => llap}/rcfile_toleratecorruptions.q.out    |   0
 .../clientpositive/{ => llap}/rcfile_union.q.out   |   0
 .../{ => llap}/read_uint_parquet.q.out             |   0
 .../{ => llap}/read_uint_parquet_vectorized.q.out  |   0
 .../results/clientpositive/{ => llap}/real.q.out   |   0
 .../clientpositive/{ => llap}/recursive_dir.q.out  |   0
 .../reduce_deduplicate_exclude_gby.q.out           |   0
 .../clientpositive/{ => llap}/rename_column.q.out  |   0
 .../rename_external_partition_location.q.out       |   0
 .../{ => llap}/rename_partition_location.q.out     |   0
 .../{ => llap}/rename_table_location.q.out         |   0
 .../rename_table_update_column_stats.q.out         |   0
 .../clientpositive/{ => llap}/repl_1_drop.q.out    |   0
 .../{ => llap}/repl_2_exim_basic.q.out             |   0
 .../{ => llap}/repl_3_exim_metadata.q.out          |   0
 .../clientpositive/{ => llap}/reset_conf.q.out     |   0
 ...ma_evol_par_vec_table_dictionary_encoding.q.out |   0
 ...vol_par_vec_table_non_dictionary_encoding.q.out |   0
 .../{ => llap}/schemeAuthority3.q.out              |   0
 .../clientpositive/{ => llap}/selectindate.q.out   |   0
 .../clientpositive/{ => llap}/semicolon.q.out      |   0
 .../clientpositive/{ => llap}/serde_opencsv.q.out  |   0
 .../clientpositive/{ => llap}/serde_regex.q.out    |   0
 .../{ => llap}/serde_reported_schema.q.out         |   0
 .../clientpositive/{ => llap}/set_metaconf.q.out   |   0
 .../{ => llap}/set_tblproperties.q.out             |   0
 .../clientpositive/{ => llap}/show_columns.q.out   |   0
 .../clientpositive/{ => llap}/show_conf.q.out      |   0
 .../{ => llap}/show_create_database.q.out          |   0
 .../{ => llap}/show_create_table_alter.q.out       |   0
 .../{ => llap}/show_create_table_partitioned.q.out |   0
 .../{ => llap}/show_create_table_serde.q.out       |   0
 .../{ => llap}/show_create_table_view.q.out        |   0
 .../{ => llap}/show_describe_func_quotes.q.out     |   0
 .../clientpositive/{ => llap}/show_functions.q.out |   0
 .../{ => llap}/show_materialized_views.q.out       |   0
 .../{ => llap}/show_partitions.q.out               |   0
 .../clientpositive/{ => llap}/show_roles.q.out     |   0
 .../clientpositive/{ => llap}/show_tables.q.out    |   0
 .../{ => llap}/show_tablestatus.q.out              |   0
 .../{ => llap}/show_tblproperties.q.out            |   0
 .../clientpositive/{ => llap}/show_views.q.out     |   0
 .../clientpositive/{ => llap}/showparts.q.out      |   0
 .../{ => llap}/singletsinsertorc.q.out             |   0
 .../{ => llap}/smb_join_partition_key.q.out        |   0
 .../clientpositive/{ => llap}/smb_mapjoin_8.q.out  |   0
 .../clientpositive/{ => llap}/smblimit.q.out       |   0
 .../clientpositive/{ => llap}/specialChar.q.out    |   0
 .../results/clientpositive/{ => llap}/split.q.out  |   0
 .../clientpositive/{ => llap}/stats14.q.out        |   0
 .../clientpositive/{ => llap}/stats15.q.out        |   0
 .../clientpositive/{ => llap}/stats16.q.out        |   0
 .../clientpositive/{ => llap}/stats18.q.out        |   0
 .../results/clientpositive/{ => llap}/stats3.q.out |   0
 .../results/clientpositive/{ => llap}/stats6.q.out |   0
 .../{ => llap}/stats_aggregator_error_1.q.out      |   0
 .../{ => llap}/stats_analyze_decimal_compare.q.out |   0
 .../{ => llap}/stats_analyze_empty.q.out           |   0
 .../{ => llap}/stats_invalidation.q.out            |   0
 .../{ => llap}/stats_list_bucket.q.out             |   0
 .../{ => llap}/stats_missing_warning.q.out         |   0
 .../{ => llap}/stats_null_optimizer.q.out          |   0
 .../{ => llap}/stats_publisher_error_1.q.out       |   0
 .../clientpositive/{ => llap}/statsfs.q.out        |   0
 .../clientpositive/{ => llap}/statsoptimizer.q.out |   0
 .../{ => llap}/storage_format_descriptor.q.out     |   0
 .../clientpositive/{ => llap}/struct_in_view.q.out |   0
 .../subquery_exists_explain_rewrite.q.out          |   0
 .../{ => llap}/subquery_in_explain_rewrite.q.out   |   0
 .../{ => llap}/sum_expr_with_order.q.out           |   0
 .../{ => llap}/table_set_owner.q.out               |   0
 .../clientpositive/{ => llap}/table_storage.q.out  |   0
 .../{ => llap}/tablename_with_select.q.out         |   0
 .../{ => llap}/temp_table_add_part_exist.q.out     |   0
 .../temp_table_alter_partition_change_col.q.out    |   0
 ...mp_table_alter_partition_clusterby_sortby.q.out |   0
 ...p_table_alter_partition_onto_nocurrent_db.q.out |   0
 .../temp_table_alter_rename_partition.q.out        |   0
 .../{ => llap}/temp_table_avro_partitioned.q.out   |   0
 .../temp_table_avro_partitioned_native.q.out       |   0
 .../temp_table_default_partition_name.q.out        |   0
 .../temp_table_drop_multi_partitions.q.out         |   0
 .../temp_table_drop_partitions_filter.q.out        |   0
 .../temp_table_drop_partitions_filter2.q.out       |   0
 .../temp_table_drop_partitions_filter3.q.out       |   0
 .../{ => llap}/temp_table_exchange_partition.q.out |   0
 .../temp_table_exchange_partition2.q.out           |   0
 .../temp_table_exchange_partition3.q.out           |   0
 .../{ => llap}/temp_table_exchgpartition2lel.q.out |   0
 .../clientpositive/{ => llap}/temp_table_gb1.q.out |   0
 ...p_table_insert_values_dynamic_partitioned.q.out |   0
 .../temp_table_insert_values_partitioned.q.out     |   0
 ...le_insert_with_move_files_from_source_dir.q.out |   0
 .../{ => llap}/temp_table_loadpart1.q.out          |   0
 .../{ => llap}/temp_table_loadpart2.q.out          |   0
 .../temp_table_multi_insert_partitioned.q.out      |   0
 .../{ => llap}/temp_table_names.q.out              |   0
 .../{ => llap}/temp_table_orc_diff_part_cols.q.out |   8 +-
 .../temp_table_orc_diff_part_cols2.q.out           |   0
 ...emp_table_parquet_mixed_partition_formats.q.out |   0
 .../temp_table_parquet_partitioned.q.out           |   0
 .../temp_table_parquet_ppd_partition.q.out         |   0
 .../{ => llap}/temp_table_partInit.q.out           |   0
 .../{ => llap}/temp_table_partition_boolean.q.out  |   0
 .../{ => llap}/temp_table_partition_char.q.out     |   0
 .../{ => llap}/temp_table_partition_date.q.out     |   0
 .../temp_table_partition_decode_name.q.out         |   0
 .../{ => llap}/temp_table_partition_schema1.q.out  |   0
 .../temp_table_partition_special_char.q.out        |   0
 .../temp_table_partition_timestamp.q.out           |   0
 .../temp_table_partition_type_check.q.out          |   0
 .../temp_table_partition_type_in_plan.q.out        |   0
 .../temp_table_partition_wise_fileformat.q.out     |   0
 .../{ => llap}/temp_table_partitions_json.q.out    |   0
 .../{ => llap}/temp_table_precedence.q.out         |   0
 .../{ => llap}/temp_table_subquery1.q.out          |   0
 .../{ => llap}/temp_table_truncate.q.out           |   0
 .../{ => llap}/testSetQueryString.q.out            |   0
 .../{ => llap}/test_boolean_whereclause.q.out      |   0
 .../clientpositive/{ => llap}/testdataset.q.out    |   0
 .../clientpositive/{ => llap}/testdataset_2.q.out  |   0
 .../clientpositive/{ => llap}/timestamp_1.q.out    |   0
 .../clientpositive/{ => llap}/timestamp_2.q.out    |   0
 .../clientpositive/{ => llap}/timestamp_3.q.out    |   0
 .../{ => llap}/timestamp_comparison.q.out          |   0
 .../{ => llap}/timestamp_comparison2.q.out         |   0
 .../{ => llap}/timestamp_date_only.q.out           |   0
 .../clientpositive/{ => llap}/timestamp_dst.q.out  |   0
 .../{ => llap}/timestamp_formats.q.out             |   0
 .../clientpositive/{ => llap}/timestamp_lazy.q.out |   0
 .../clientpositive/{ => llap}/timestamp_null.q.out |   0
 .../clientpositive/{ => llap}/timestamp_udf.q.out  |   0
 .../clientpositive/{ => llap}/timestamptz_1.q.out  |   0
 .../clientpositive/{ => llap}/timestamptz_3.q.out  |   0
 .../clientpositive/{ => llap}/timestamptz_4.q.out  |   0
 .../results/clientpositive/{ => llap}/topn.q.out   |   0
 .../results/clientpositive/{ => llap}/touch.q.out  |   0
 .../{ => llap}/truncate_column.q.out               |   0
 .../{ => llap}/truncate_column_merge.q.out         |   0
 .../clientpositive/{ => llap}/truncate_table.q.out |   0
 .../{ => llap}/tumbled_window_tests.q.out          |   0
 .../clientpositive/{ => llap}/tunable_ndv.q.out    |   0
 .../{ => llap}/type_change_test_fraction.q.out     |   0
 .../{ => llap}/type_change_test_int.q.out          |   0
 .../{ => llap}/type_conversions_1.q.out            |   0
 .../{ => llap}/udaf_collect_set.q.out              |   0
 .../clientpositive/{ => llap}/udaf_covar_pop.q.out |   0
 .../{ => llap}/udaf_covar_samp.q.out               |   0
 .../clientpositive/{ => llap}/udaf_ngrams.q.out    |   0
 .../{ => llap}/udaf_percentile.q.out               |   0
 .../clientpositive/{ => llap}/udf_acos.q.out       |   0
 .../clientpositive/{ => llap}/udf_add.q.out        |   0
 .../{ => llap}/udf_array_contains.q.out            |   0
 .../clientpositive/{ => llap}/udf_asin.q.out       |   0
 .../clientpositive/{ => llap}/udf_atan.q.out       |   0
 .../clientpositive/{ => llap}/udf_avg.q.out        |   0
 .../clientpositive/{ => llap}/udf_bigint.q.out     |   0
 .../clientpositive/{ => llap}/udf_bin.q.out        |   0
 .../{ => llap}/udf_bitwise_and.q.out               |   0
 .../{ => llap}/udf_bitwise_not.q.out               |   0
 .../clientpositive/{ => llap}/udf_bitwise_or.q.out |   0
 .../{ => llap}/udf_bitwise_xor.q.out               |   0
 .../clientpositive/{ => llap}/udf_boolean.q.out    |   0
 .../clientpositive/{ => llap}/udf_bround.q.out     |   0
 .../clientpositive/{ => llap}/udf_ceil.q.out       |   0
 .../clientpositive/{ => llap}/udf_ceiling.q.out    |   0
 .../clientpositive/{ => llap}/udf_chr.q.out        | Bin
 .../{ => llap}/udf_classloader.q.out               |   0
 ...classloader_dynamic_dependency_resolution.q.out |   0
 .../{ => llap}/udf_compare_java_string.q.out       |   0
 .../clientpositive/{ => llap}/udf_concat.q.out     |   0
 .../{ => llap}/udf_concat_insert2.q.out            |   0
 .../clientpositive/{ => llap}/udf_conv.q.out       |   0
 .../clientpositive/{ => llap}/udf_cos.q.out        |   0
 .../{ => llap}/udf_current_user.q.out              |   0
 .../clientpositive/{ => llap}/udf_date_add.q.out   |   0
 .../clientpositive/{ => llap}/udf_date_sub.q.out   |   0
 .../clientpositive/{ => llap}/udf_datediff.q.out   |   0
 .../clientpositive/{ => llap}/udf_day.q.out        |   0
 .../clientpositive/{ => llap}/udf_dayofmonth.q.out |   0
 .../clientpositive/{ => llap}/udf_div.q.out        |   0
 .../clientpositive/{ => llap}/udf_divide.q.out     |   0
 .../clientpositive/{ => llap}/udf_double.q.out     |   0
 .../clientpositive/{ => llap}/udf_equal.q.out      |   0
 .../clientpositive/{ => llap}/udf_exp.q.out        |   0
 .../clientpositive/{ => llap}/udf_field.q.out      |   0
 .../clientpositive/{ => llap}/udf_float.q.out      |   0
 .../clientpositive/{ => llap}/udf_floor.q.out      |   0
 .../{ => llap}/udf_from_unixtime.q.out             |   0
 .../{ => llap}/udf_greaterthan.q.out               |   0
 .../{ => llap}/udf_greaterthanorequal.q.out        |   0
 .../clientpositive/{ => llap}/udf_hex.q.out        |   0
 .../results/clientpositive/{ => llap}/udf_in.q.out |   0
 .../clientpositive/{ => llap}/udf_index.q.out      |   0
 .../clientpositive/{ => llap}/udf_initcap.q.out    |   0
 .../clientpositive/{ => llap}/udf_int.q.out        |   0
 .../clientpositive/{ => llap}/udf_isnotnull.q.out  |   0
 .../clientpositive/{ => llap}/udf_isnull.q.out     |   0
 .../clientpositive/{ => llap}/udf_isops.q.out      |   0
 .../clientpositive/{ => llap}/udf_json_read.q.out  |   0
 .../clientpositive/{ => llap}/udf_lcase.q.out      |   0
 .../clientpositive/{ => llap}/udf_lessthan.q.out   |   0
 .../{ => llap}/udf_lessthanorequal.q.out           |   0
 .../clientpositive/{ => llap}/udf_likeall.q.out    |   0
 .../clientpositive/{ => llap}/udf_likeany.q.out    |   0
 .../results/clientpositive/{ => llap}/udf_ln.q.out |   0
 .../clientpositive/{ => llap}/udf_log.q.out        |   0
 .../clientpositive/{ => llap}/udf_log10.q.out      |   0
 .../clientpositive/{ => llap}/udf_log2.q.out       |   0
 .../{ => llap}/udf_logged_in_user.q.out            |   0
 .../{ => llap}/udf_logic_java_boolean.q.out        |   0
 .../clientpositive/{ => llap}/udf_ltrim.q.out      |   0
 .../clientpositive/{ => llap}/udf_map_keys.q.out   |   0
 .../clientpositive/{ => llap}/udf_map_values.q.out |   0
 .../clientpositive/{ => llap}/udf_max.q.out        |   0
 .../clientpositive/{ => llap}/udf_mid.q.out        |   0
 .../clientpositive/{ => llap}/udf_min.q.out        |   0
 .../clientpositive/{ => llap}/udf_modulo.q.out     |   0
 .../clientpositive/{ => llap}/udf_month.q.out      |   0
 .../clientpositive/{ => llap}/udf_negative.q.out   |   0
 .../clientpositive/{ => llap}/udf_not.q.out        |   0
 .../clientpositive/{ => llap}/udf_notop.q.out      |   0
 .../results/clientpositive/{ => llap}/udf_or.q.out |   0
 .../clientpositive/{ => llap}/udf_percentile.q.out |   0
 .../clientpositive/{ => llap}/udf_pmod.q.out       |   0
 .../clientpositive/{ => llap}/udf_positive.q.out   |   0
 .../clientpositive/{ => llap}/udf_pow.q.out        |   0
 .../clientpositive/{ => llap}/udf_power.q.out      |   0
 .../clientpositive/{ => llap}/udf_rand.q.out       |   0
 .../clientpositive/{ => llap}/udf_regexp.q.out     |   0
 .../{ => llap}/udf_regexp_extract.q.out            |   0
 .../{ => llap}/udf_regexp_replace.q.out            |   0
 .../clientpositive/{ => llap}/udf_replace.q.out    |   0
 .../clientpositive/{ => llap}/udf_rlike.q.out      |   0
 .../clientpositive/{ => llap}/udf_round.q.out      |   0
 .../clientpositive/{ => llap}/udf_round_2.q.out    |   0
 .../{ => llap}/udf_round_2_auto_stats.q.out        |   0
 .../clientpositive/{ => llap}/udf_round_3.q.out    |   0
 .../clientpositive/{ => llap}/udf_rtrim.q.out      |   0
 .../clientpositive/{ => llap}/udf_sentences.q.out  |   0
 .../clientpositive/{ => llap}/udf_sin.q.out        |   0
 .../clientpositive/{ => llap}/udf_smallint.q.out   |   0
 .../clientpositive/{ => llap}/udf_sqrt.q.out       |   0
 .../clientpositive/{ => llap}/udf_std.q.out        |   0
 .../clientpositive/{ => llap}/udf_stddev.q.out     |   0
 .../clientpositive/{ => llap}/udf_stddev_pop.q.out |   0
 .../{ => llap}/udf_stddev_samp.q.out               |   0
 .../clientpositive/{ => llap}/udf_string.q.out     |   0
 .../clientpositive/{ => llap}/udf_substr.q.out     |   0
 .../clientpositive/{ => llap}/udf_substring.q.out  |   0
 .../clientpositive/{ => llap}/udf_subtract.q.out   |   0
 .../clientpositive/{ => llap}/udf_sum.q.out        |   0
 .../clientpositive/{ => llap}/udf_tan.q.out        |   0
 .../clientpositive/{ => llap}/udf_testlength.q.out |   0
 .../{ => llap}/udf_testlength2.q.out               |   0
 .../clientpositive/{ => llap}/udf_tinyint.q.out    |   0
 .../clientpositive/{ => llap}/udf_to_boolean.q.out |   0
 .../clientpositive/{ => llap}/udf_to_byte.q.out    |   0
 .../clientpositive/{ => llap}/udf_to_date.q.out    |   0
 .../clientpositive/{ => llap}/udf_to_double.q.out  |   0
 .../clientpositive/{ => llap}/udf_to_float.q.out   |   0
 .../clientpositive/{ => llap}/udf_to_long.q.out    |   0
 .../clientpositive/{ => llap}/udf_to_short.q.out   |   0
 .../clientpositive/{ => llap}/udf_to_string.q.out  |   0
 .../clientpositive/{ => llap}/udf_translate.q.out  |   0
 .../clientpositive/{ => llap}/udf_trim.q.out       |   0
 .../clientpositive/{ => llap}/udf_ucase.q.out      |   0
 .../clientpositive/{ => llap}/udf_unhex.q.out      |   0
 .../clientpositive/{ => llap}/udf_upper.q.out      |   0
 .../clientpositive/{ => llap}/udf_var_pop.q.out    |   0
 .../clientpositive/{ => llap}/udf_var_samp.q.out   |   0
 .../clientpositive/{ => llap}/udf_variance.q.out   |   0
 .../clientpositive/{ => llap}/udf_version.q.out    |   0
 .../clientpositive/{ => llap}/udf_weekofyear.q.out |   0
 .../clientpositive/{ => llap}/udf_xpath.q.out      |   0
 .../{ => llap}/udf_xpath_boolean.q.out             |   0
 .../{ => llap}/udf_xpath_double.q.out              |   0
 .../{ => llap}/udf_xpath_float.q.out               |   0
 .../clientpositive/{ => llap}/udf_xpath_int.q.out  |   0
 .../clientpositive/{ => llap}/udf_xpath_long.q.out |   0
 .../{ => llap}/udf_xpath_short.q.out               |   0
 .../{ => llap}/udf_xpath_string.q.out              |   0
 .../clientpositive/{ => llap}/udf_year.q.out       |   0
 .../{ => llap}/udtf_nofetchtask.q.out              |   0
 .../{ => llap}/udtf_posexplode.q.out               |   0
 .../{ => llap}/udtf_replicate_rows.q.out           |   0
 .../{ => llap}/unicode_notation.q.out              |   0
 .../clientpositive/{ => llap}/union36.q.out        |   0
 .../clientpositive/{ => llap}/union38.q.out        |   0
 .../clientpositive/{ => llap}/union_date.q.out     |   0
 .../{ => llap}/union_date_trim.q.out               |   0
 .../clientpositive/{ => llap}/union_null.q.out     |   0
 .../{ => llap}/unionall_join_nullconstant.q.out    |   0
 .../{ => llap}/unionall_lateralview1.q.out         |   0
 .../{ => llap}/unset_table_view_property.q.out     |   0
 .../{ => llap}/updateAccessTime.q.out              |   0
 ...after_multiple_inserts_special_characters.q.out |   0
 .../clientpositive/{ => llap}/varchar_1.q.out      |   0
 .../clientpositive/{ => llap}/varchar_2.q.out      |   0
 .../clientpositive/{ => llap}/varchar_cast.q.out   |   0
 .../{ => llap}/varchar_comparison.q.out            |   0
 .../clientpositive/{ => llap}/varchar_join1.q.out  |   0
 .../{ => llap}/varchar_nested_types.q.out          |   0
 .../clientpositive/{ => llap}/varchar_union1.q.out |   0
 .../clientpositive/{ => llap}/vector_join.q.out    |   0
 .../vector_orc_string_reader_empty_dict.q.out      |   0
 .../{ => llap}/vectorization_escape_crlf.q.out     |   0
 .../results/clientpositive/{ => llap}/view.q.out   |   0
 .../{ => llap}/view_authorization_sqlstd.q.out     |   0
 .../clientpositive/{ => llap}/view_cast.q.out      |   0
 .../clientpositive/{ => llap}/view_inputs.q.out    |   0
 .../clientpositive/{ => llap}/virtual_column.q.out |   0
 .../windowing_adjust_rowcontainer_sz.q.out         |   0
 .../{ => llap}/windowing_columnPruning.q.out       |   0
 .../{ => llap}/windowing_decimal.q.out             |   0
 .../{ => llap}/windowing_distinct.q.out            |   0
 .../{ => llap}/windowing_duplicate.q.out           |   0
 .../{ => llap}/windowing_ntile.q.out               |   0
 .../{ => llap}/windowing_order_null.q.out          |   0
 .../clientpositive/{ => llap}/windowing_rank.q.out |   0
 .../{ => llap}/windowing_udaf2.q.out               |   0
 .../{ => llap}/windowing_windowspec4.q.out         |   0
 .../{ => llap}/zero_rows_single_insert.q.out       |   0
 918 files changed, 929 insertions(+), 11 deletions(-)

diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index e04f7d5..c55f8db 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -1060,8 +1060,918 @@ minillaplocal.query.files=\
   dst.q,\
   q93_with_constraints.q,\
   approx_distinct.q,\
-  ctas_empty_source.q
-  
+  ctas_empty_source.q,\
+  acid_bloom_filter_orc_file_dump.q,\
+  acid_insert_overwrite.q,\
+  acid_join.q,\
+  acid_stats.q,\
+  acid_subquery.q,\
+  acid_table_directories_test.q,\
+  acid_vectorization.q,\
+  acid_vectorization_partition.q,\
+  acid_vectorization_project.q,\
+  add_jar_pfile.q,\
+  add_jar_with_file_removed.q,\
+  add_part_exist.q,\
+  add_part_multiple.q,\
+  add_partition_no_whitelist.q,\
+  add_partition_with_whitelist.q,\
+  allow_change_col_type_par.q,\
+  alter1.q,\
+  alter2.q,\
+  alter3.q,\
+  alter4.q,\
+  alter5.q,\
+  alterColumnStats.q,\
+  alter_char1.q,\
+  alter_char2.q,\
+  alter_file_format.q,\
+  alter_merge.q,\
+  alter_merge_2.q,\
+  alter_merge_3.q,\
+  alter_merge_stats.q,\
+  alter_numbuckets_partitioned_table2_h23.q,\
+  alter_numbuckets_partitioned_table_h23.q,\
+  alter_partition_clusterby_sortby.q,\
+  alter_partition_format_loc.q,\
+  alter_partition_onto_nocurrent_db.q,\
+  alter_partition_update_status.q,\
+  alter_partition_with_whitelist.q,\
+  alter_rename_partition.q,\
+  alter_rename_partition_authorization.q,\
+  alter_rename_table.q,\
+  alter_skewed_table.q,\
+  alter_table_add_partition.q,\
+  alter_table_cascade.q,\
+  alter_table_column_stats.q,\
+  alter_table_location.q,\
+  alter_table_not_sorted.q,\
+  alter_table_partition_drop.q,\
+  alter_table_serde.q,\
+  alter_table_serde2.q,\
+  alter_table_stats_status.q,\
+  alter_table_update_status.q,\
+  alter_table_update_status_disable_bitvector.q,\
+  alter_varchar1.q,\
+  alter_varchar2.q,\
+  alter_view_as_select.q,\
+  alter_view_col_type.q,\
+  alter_view_rename.q,\
+  analyze_tbl_part.q,\
+  authorization_1.q,\
+  authorization_1_sql_std.q,\
+  authorization_3.q,\
+  authorization_4.q,\
+  authorization_5.q,\
+  authorization_6.q,\
+  authorization_7.q,\
+  authorization_8.q,\
+  authorization_admin_almighty1.q,\
+  authorization_admin_almighty2.q,\
+  authorization_alter_table_exchange_partition.q,\
+  authorization_cli_createtab.q,\
+  authorization_cli_createtab_noauthzapi.q,\
+  authorization_cli_nonsql.q,\
+  authorization_cli_stdconfigauth.q,\
+  authorization_create_func1.q,\
+  authorization_create_macro1.q,\
+  authorization_create_table_owner_privs.q,\
+  authorization_create_temp_table.q,\
+  authorization_default_create_table_owner_privs.q,\
+  authorization_delete.q,\
+  authorization_delete_own_table.q,\
+  authorization_grant_option_role.q,\
+  authorization_grant_public_role.q,\
+  authorization_grant_table_priv.q,\
+  authorization_insert.q,\
+  authorization_load.q,\
+  authorization_non_id.q,\
+  authorization_owner_actions.q,\
+  authorization_parts.q,\
+  authorization_reset.q,\
+  authorization_revoke_table_priv.q,\
+  authorization_role_grant1.q,\
+  authorization_role_grant2.q,\
+  authorization_set_show_current_role.q,\
+  authorization_show_grant.q,\
+  authorization_show_role_principals_v1.q,\
+  authorization_update.q,\
+  authorization_update_own_table.q,\
+  authorization_view_2.q,\
+  authorization_view_3.q,\
+  authorization_view_4.q,\
+  authorization_view_disable_cbo_2.q,\
+  authorization_view_disable_cbo_3.q,\
+  authorization_view_disable_cbo_4.q,\
+  authorization_wm.q,\
+  autoColumnStats_3.q,\
+  avro_add_column.q,\
+  avro_add_column2.q,\
+  avro_add_column3.q,\
+  avro_add_column_extschema.q,\
+  avro_alter_table_update_columns.q,\
+  avro_change_schema.q,\
+  avro_charvarchar.q,\
+  avro_comments.q,\
+  avro_compression_enabled.q,\
+  avro_compression_enabled_native.q,\
+  avro_decimal.q,\
+  avro_decimal_native.q,\
+  avro_decimal_old.q,\
+  avro_deserialize_map_null.q,\
+  avro_evolved_schemas.q,\
+  avro_historical_timestamp.q,\
+  avro_joins.q,\
+  avro_joins_native.q,\
+  avro_native.q,\
+  avro_nullable_fields.q,\
+  avro_nullable_union.q,\
+  avro_partitioned.q,\
+  avro_partitioned_native.q,\
+  avro_sanity_test.q,\
+  avro_schema_literal.q,\
+  avro_tableproperty_optimize.q,\
+  avro_type_evolution.q,\
+  avrocountemptytbl.q,\
+  ba_table1.q,\
+  ba_table2.q,\
+  ba_table3.q,\
+  ba_table_udfs.q,\
+  ba_table_union.q,\
+  basicstat_partval.q,\
+  binary_constant.q,\
+  binary_table_bincolserde.q,\
+  binary_table_colserde.q,\
+  bitvector.q,\
+  bool_literal.q,\
+  bucket7.q,\
+  bucket_if_with_path_filter.q,\
+  bucketizedhiveinputformat_auto.q,\
+  cast2.q,\
+  cast3.q,\
+  cast_qualified_types.q,\
+  cast_tinyint_to_double.q,\
+  cast_to_int.q,\
+  cbo_rp_gby_empty.q,\
+  cbo_rp_stats.q,\
+  cbo_rp_udf_percentile.q,\
+  cbo_rp_udf_percentile2.q,\
+  cbo_rp_union.q,\
+  cbo_rp_windowing.q,\
+  cbo_udf_max.q,\
+  char_1.q,\
+  char_2.q,\
+  char_cast.q,\
+  char_comparison.q,\
+  char_join1.q,\
+  char_nested_types.q,\
+  char_pad_convert.q,\
+  char_union1.q,\
+  char_varchar_udf.q,\
+  cli_print_escape_crlf.q,\
+  cmdwithcomments.q,\
+  collision.q,\
+  columnstats_infinity.q,\
+  combine1.q,\
+  combine3.q,\
+  comma_in_column_name.q,\
+  compile_processor.q,\
+  compustat_avro.q,\
+  compute_stats_binary.q,\
+  compute_stats_boolean.q,\
+  compute_stats_decimal.q,\
+  compute_stats_double.q,\
+  compute_stats_empty_table.q,\
+  compute_stats_long.q,\
+  compute_stats_string.q,\
+  concatenate_inherit_table_location.q,\
+  confirm_initial_tbl_stats.q,\
+  constant_prop_4.q,\
+  convert_enum_to_string.q,\
+  cp_mj_rc.q,\
+  create_1.q,\
+  create_alter_list_bucketing_table1.q,\
+  create_big_view.q,\
+  create_default_prop.q,\
+  create_escape.q,\
+  create_func1.q,\
+  create_genericudf.q,\
+  create_insert_outputformat.q,\
+  create_like.q,\
+  create_like2.q,\
+  create_like_tbl_props.q,\
+  create_like_view.q,\
+  create_nested_type.q,\
+  create_or_replace_view.q,\
+  create_skewed_table1.q,\
+  create_struct_table.q,\
+  create_table_like_stats.q,\
+  create_transactional_full_acid.q,\
+  create_transactional_insert_only.q,\
+  create_union_table.q,\
+  create_view_defaultformats.q,\
+  create_view_partitioned.q,\
+  create_view_translate.q,\
+  create_with_constraints.q,\
+  create_with_constraints2.q,\
+  crtseltbl_serdeprops.q,\
+  ct_case_insensitive.q,\
+  ctas_char.q,\
+  ctas_date.q,\
+  ctas_uses_table_location.q,\
+  ctas_varchar.q,\
+  cteViews.q,\
+  cte_7.q,\
+  current_catalog_and_schema.q,\
+  database_drop.q,\
+  date_1.q,\
+  date_3.q,\
+  date_4.q,\
+  date_5.q,\
+  date_comparison.q,\
+  date_int_operation_test.q,\
+  date_join1.q,\
+  date_timestamp_prec.q,\
+  date_udf.q,\
+  dbtxnmgr_abort.q,\
+  dbtxnmgr_compact1.q,\
+  dbtxnmgr_compact2.q,\
+  dbtxnmgr_compact3.q,\
+  dbtxnmgr_ddl1.q,\
+  dbtxnmgr_query1.q,\
+  dbtxnmgr_query2.q,\
+  dbtxnmgr_query3.q,\
+  dbtxnmgr_query4.q,\
+  dbtxnmgr_query5.q,\
+  dbtxnmgr_showlocks.q,\
+  decimal_1.q,\
+  decimal_10_0.q,\
+  decimal_1_1.q,\
+  decimal_2.q,\
+  decimal_3.q,\
+  decimal_4.q,\
+  decimal_5.q,\
+  decimal_6.q,\
+  decimal_join.q,\
+  decimal_serde.q,\
+  decimal_skewjoin.q,\
+  decimal_trailing.q,\
+  default_file_format.q,\
+  default_partition_name.q,\
+  delimiter.q,\
+  desc_function.q,\
+  desc_non_existent_tbl.q,\
+  desc_tbl_part_cols.q,\
+  describe_comment_indent.q,\
+  describe_comment_nonascii.q,\
+  describe_database_json.q,\
+  describe_formatted_view_partitioned.q,\
+  describe_formatted_view_partitioned_json.q,\
+  describe_syntax.q,\
+  describe_table.q,\
+  describe_table_json.q,\
+  describe_xpath.q,\
+  dfscmd.q,\
+  diff_part_input_formats.q,\
+  disable_file_format_check.q,\
+  disallow_incompatible_type_change_off.q,\
+  driver_conf_isolation.q,\
+  driverhook.q,\
+  drop_database_removes_partition_dirs.q,\
+  drop_deleted_partitions.q,\
+  drop_function.q,\
+  drop_multi_partitions.q,\
+  drop_partitions_filter.q,\
+  drop_partitions_filter2.q,\
+  drop_partitions_filter3.q,\
+  drop_partitions_filter4.q,\
+  drop_table.q,\
+  drop_table2.q,\
+  drop_table_purge.q,\
+  drop_table_removes_partition_dirs.q,\
+  drop_table_with_stats.q,\
+  drop_udf.q,\
+  drop_view.q,\
+  encoding_nonutf8.q,\
+  equal_ns.q,\
+  escape3.q,\
+  escape_crlf.q,\
+  exchange_partition.q,\
+  exchange_partition2.q,\
+  exchange_partition3.q,\
+  exim_00_nonpart_empty.q,\
+  exim_01_nonpart.q,\
+  exim_02_00_part_empty.q,\
+  exim_02_part.q,\
+  exim_03_nonpart_over_compat.q,\
+  exim_04_all_part.q,\
+  exim_04_evolved_parts.q,\
+  exim_05_some_part.q,\
+  exim_06_one_part.q,\
+  exim_07_all_part_over_nonoverlap.q,\
+  exim_08_nonpart_rename.q,\
+  exim_09_part_spec_nonoverlap.q,\
+  exim_10_external_managed.q,\
+  exim_11_managed_external.q,\
+  exim_12_external_location.q,\
+  exim_13_managed_location.q,\
+  exim_14_managed_location_over_existing.q,\
+  exim_15_external_part.q,\
+  exim_16_part_external.q,\
+  exim_17_part_managed.q,\
+  exim_18_part_external.q,\
+  exim_19_00_part_external_location.q,\
+  exim_19_part_external_location.q,\
+  exim_20_part_managed_location.q,\
+  exim_21_export_authsuccess.q,\
+  exim_22_import_exist_authsuccess.q,\
+  exim_23_import_part_authsuccess.q,\
+  exim_24_import_nonexist_authsuccess.q,\
+  exim_25_export_parentpath_has_inaccessible_children.q,\
+  exim_hidden_files.q,\
+  explain_ast.q,\
+  explain_dependency.q,\
+  explain_dependency2.q,\
+  explain_locks.q,\
+  explode_null.q,\
+  expr_cached.q,\
+  external_insert.q,\
+  fileformat_mix.q,\
+  fileformat_sequencefile.q,\
+  fileformat_text.q,\
+  float_equality.q,\
+  groupby7.q,\
+  groupby_constcolval.q,\
+  groupby_empty.q,\
+  groupby_grouping_id1.q,\
+  groupby_mutli_insert_common_distinct.q,\
+  groupby_neg_float.q,\
+  groupby_nullvalues.q,\
+  hook_order.q,\
+  hypothetical_set_aggregates.q,\
+  init_file.q,\
+  inoutdriver.q,\
+  input1.q,\
+  input10.q,\
+  input15.q,\
+  input16.q,\
+  input19.q,\
+  input2.q,\
+  input24.q,\
+  input28.q,\
+  input3.q,\
+  input40.q,\
+  input41.q,\
+  input43.q,\
+  input45.q,\
+  input46.q,\
+  input49.q,\
+  input4_cb_delim.q,\
+  input_dfs.q,\
+  inputddl1.q,\
+  inputddl2.q,\
+  inputddl3.q,\
+  inputddl4.q,\
+  inputddl5.q,\
+  inputddl6.q,\
+  inputddl7.q,\
+  inputddl8.q,\
+  insert2.q,\
+  insert_acid_dynamic_partition.q,\
+  insert_acid_not_bucketed.q,\
+  insert_compressed.q,\
+  insert_into_with_schema2.q,\
+  insert_non_utf8_encoding_table.q,\
+  insert_overwrite_directory.q,\
+  insert_overwrite_directory2.q,\
+  insert_values_acid_not_bucketed.q,\
+  insert_values_nonascii.q,\
+  insert_with_move_files_from_source_dir.q,\
+  insertexternal1.q,\
+  insertvalues_espchars.q,\
+  interval_1.q,\
+  interval_2.q,\
+  interval_comparison.q,\
+  interval_udf.q,\
+  join24.q,\
+  join_array.q,\
+  join_casesensitive.q,\
+  join_empty.q,\
+  join_literals.q,\
+  json_serde1.q,\
+  json_serde2.q,\
+  json_serde_qualified_types.q,\
+  json_serde_tsformat.q,\
+  keyword_2.q,\
+  keyword_3.q,\
+  lateral_view_multi_lateralviews.q,\
+  lb_fs_stats.q,\
+  leadlag.q,\
+  limit0.q,\
+  load_dyn_part15.q,\
+  load_dyn_part7.q,\
+  load_exist_part_authsuccess.q,\
+  load_file_with_space_in_the_name.q,\
+  load_fs.q,\
+  load_fs_overwrite.q,\
+  load_local_dir_test.q,\
+  load_non_hdfs_path.q,\
+  load_nonpart_authsuccess.q,\
+  load_orc.q,\
+  load_orc_part.q,\
+  load_overwrite.q,\
+  load_part_authsuccess.q,\
+  loadpart1.q,\
+  loadpart2.q,\
+  localtimezone2.q,\
+  lock1.q,\
+  lock2.q,\
+  lock3.q,\
+  lock4.q,\
+  mapjoin_addjar.q,\
+  masking_11.q,\
+  masking_14.q,\
+  masking_acid_no_masking.q,\
+  materialized_view_authorization_sqlstd.q,\
+  materialized_view_create_acid.q,\
+  metadata_empty_table.q,\
+  metadata_export_drop.q,\
+  mi.q,\
+  min_structvalue.q,\
+  misc_json.q,\
+  mm_default.q,\
+  mm_insert_overwrite_aborted.q,\
+  mm_iow_temp.q,\
+  mm_loc_ctas.q,\
+  multi_insert_partitioned.q,\
+  multi_insert_with_join.q,\
+  multi_sahooks.q,\
+  nested_complex.q,\
+  nested_complex_additional.q,\
+  nestedvirtual.q,\
+  nomore_ambiguous_table_col.q,\
+  nonReservedKeyWords.q,\
+  non_ascii_literal1.q,\
+  non_ascii_literal2.q,\
+  notable_alias3.q,\
+  nullMap.q,\
+  null_column.q,\
+  nullformatdir.q,\
+  nullinput.q,\
+  nullinput2.q,\
+  nullshandling.q,\
+  ops_comparison.q,\
+  orc_dictionary_threshold.q,\
+  orc_diff_part_cols.q,\
+  orc_diff_part_cols2.q,\
+  orc_empty_files.q,\
+  orc_empty_strings.q,\
+  orc_empty_table.q,\
+  orc_ends_with_nulls.q,\
+  orc_file_dump.q,\
+  orc_merge13.q,\
+  orc_min_max.q,\
+  orc_mr_pathalias.q,\
+  orc_null_check.q,\
+  orc_ppd_boolean.q,\
+  orc_ppd_char.q,\
+  orc_ppd_exception.q,\
+  orc_ppd_is_null.q,\
+  orc_ppd_same_table_multiple_aliases.q,\
+  orc_remove_cols.q,\
+  orc_schema_evolution.q,\
+  orc_timestamplocaltz_type.q,\
+  orc_wide_table.q,\
+  order2.q,\
+  order_within_subquery.q,\
+  overridden_confs.q,\
+  parenthese.q,\
+  parquet_analyze.q,\
+  parquet_array_map_emptynullvals.q,\
+  parquet_array_null_element.q,\
+  parquet_array_of_multi_field_struct.q,\
+  parquet_array_of_optional_elements.q,\
+  parquet_array_of_required_elements.q,\
+  parquet_array_of_single_field_struct.q,\
+  parquet_array_of_structs.q,\
+  parquet_array_of_unannotated_groups.q,\
+  parquet_array_of_unannotated_primitives.q,\
+  parquet_avro_array_of_primitives.q,\
+  parquet_avro_array_of_single_field_struct.q,\
+  parquet_columnar.q,\
+  parquet_ctas.q,\
+  parquet_decimal.q,\
+  parquet_decimal1.q,\
+  parquet_external_time.q,\
+  parquet_historical_timestamp.q,\
+  parquet_int64_timestamp.q,\
+  parquet_int_decimal.q,\
+  parquet_join2.q,\
+  parquet_map_null.q,\
+  parquet_map_of_arrays_of_ints.q,\
+  parquet_map_of_maps.q,\
+  parquet_mixed_case.q,\
+  parquet_mixed_partition_formats.q,\
+  parquet_nested_complex.q,\
+  parquet_partitioned.q,\
+  parquet_ppd.q,\
+  parquet_ppd_char2.q,\
+  parquet_ppd_multifiles.q,\
+  parquet_ppd_partition.q,\
+  parquet_predicate_pushdown_2.q,\
+  parquet_read_backward_compatible_files.q,\
+  parquet_serde.q,\
+  parquet_stats.q,\
+  parquet_table_with_subschema.q,\
+  parquet_thrift_array_of_single_field_struct.q,\
+  parquet_type_promotion.q,\
+  parquet_vectorization_nested_udf.q,\
+  parquet_vectorization_not.q,\
+  parquet_vectorization_part.q,\
+  parquet_vectorization_part_varchar.q,\
+  parquet_write_correct_definition_levels.q,\
+  partInit.q,\
+  part_inherit_tbl_props.q,\
+  part_inherit_tbl_props_empty.q,\
+  part_inherit_tbl_props_with_star.q,\
+  partition_boolean.q,\
+  partition_char.q,\
+  partition_coltype_literals.q,\
+  partition_date.q,\
+  partition_date2.q,\
+  partition_decode_name.q,\
+  partition_params_postgres.q,\
+  partition_schema1.q,\
+  partition_serde_format.q,\
+  partition_special_char.q,\
+  partition_timestamp.q,\
+  partition_type_check.q,\
+  partition_type_in_plan.q,\
+  partition_varchar1.q,\
+  partition_varchar2.q,\
+  partition_wise_fileformat.q,\
+  partition_wise_fileformat10.q,\
+  partition_wise_fileformat11.q,\
+  partition_wise_fileformat12.q,\
+  partition_wise_fileformat13.q,\
+  partition_wise_fileformat14.q,\
+  partition_wise_fileformat15.q,\
+  partition_wise_fileformat16.q,\
+  partition_wise_fileformat17.q,\
+  partition_wise_fileformat18.q,\
+  partition_wise_fileformat3.q,\
+  partition_wise_fileformat4.q,\
+  partition_wise_fileformat5.q,\
+  partition_wise_fileformat6.q,\
+  partition_wise_fileformat7.q,\
+  partition_wise_fileformat8.q,\
+  partition_wise_fileformat9.q,\
+  partitioned_table_stats.q,\
+  partitions_filter_default.q,\
+  partitions_json.q,\
+  plan_json.q,\
+  ppd_constant_where.q,\
+  ppd_field_garbage.q,\
+  ppd_like_filter.q,\
+  ppr_pushdown2.q,\
+  primitive_types.q,\
+  progress_1.q,\
+  ptf_decimal.q,\
+  ptf_general_queries.q,\
+  ptf_rcfile.q,\
+  ptf_register_tblfn.q,\
+  ptf_seqfile.q,\
+  query_lifetime_hook.q,\
+  query_properties.q,\
+  quotedid_alter.q,\
+  quotedid_stats.q,\
+  quotedid_tblproperty.q,\
+  rcfile_columnar.q,\
+  rcfile_default_format.q,\
+  rcfile_lazydecompress.q,\
+  rcfile_toleratecorruptions.q,\
+  rcfile_union.q,\
+  read_uint_parquet.q,\
+  read_uint_parquet_vectorized.q,\
+  real.q,\
+  recursive_dir.q,\
+  reduce_deduplicate_exclude_gby.q,\
+  rename_column.q,\
+  rename_external_partition_location.q,\
+  rename_partition_location.q,\
+  rename_table_location.q,\
+  rename_table_update_column_stats.q,\
+  repl_1_drop.q,\
+  repl_2_exim_basic.q,\
+  repl_3_exim_metadata.q,\
+  reset_conf.q,\
+  schema_evol_par_vec_table_dictionary_encoding.q,\
+  schema_evol_par_vec_table_non_dictionary_encoding.q,\
+  schemeAuthority3.q,\
+  selectindate.q,\
+  semicolon.q,\
+  serde_opencsv.q,\
+  serde_regex.q,\
+  serde_reported_schema.q,\
+  set_metaconf.q,\
+  set_tblproperties.q,\
+  show_columns.q,\
+  show_conf.q,\
+  show_create_database.q,\
+  show_create_table_alter.q,\
+  show_create_table_partitioned.q,\
+  show_create_table_serde.q,\
+  show_create_table_view.q,\
+  show_describe_func_quotes.q,\
+  show_functions.q,\
+  show_materialized_views.q,\
+  show_partitions.q,\
+  show_roles.q,\
+  show_tables.q,\
+  show_tablestatus.q,\
+  show_tblproperties.q,\
+  show_views.q,\
+  showparts.q,\
+  singletsinsertorc.q,\
+  smb_join_partition_key.q,\
+  smb_mapjoin_8.q,\
+  smblimit.q,\
+  specialChar.q,\
+  split.q,\
+  stats14.q,\
+  stats15.q,\
+  stats16.q,\
+  stats18.q,\
+  stats3.q,\
+  stats6.q,\
+  stats_aggregator_error_1.q,\
+  stats_analyze_decimal_compare.q,\
+  stats_analyze_empty.q,\
+  stats_invalidation.q,\
+  stats_list_bucket.q,\
+  stats_missing_warning.q,\
+  stats_null_optimizer.q,\
+  stats_publisher_error_1.q,\
+  statsfs.q,\
+  statsoptimizer.q,\
+  storage_format_descriptor.q,\
+  struct_in_view.q,\
+  subquery_exists_explain_rewrite.q,\
+  subquery_in_explain_rewrite.q,\
+  sum_expr_with_order.q,\
+  table_set_owner.q,\
+  table_storage.q,\
+  tablename_with_select.q,\
+  temp_table_add_part_exist.q,\
+  temp_table_alter_partition_change_col.q,\
+  temp_table_alter_partition_clusterby_sortby.q,\
+  temp_table_alter_partition_onto_nocurrent_db.q,\
+  temp_table_alter_rename_partition.q,\
+  temp_table_avro_partitioned.q,\
+  temp_table_avro_partitioned_native.q,\
+  temp_table_default_partition_name.q,\
+  temp_table_drop_multi_partitions.q,\
+  temp_table_drop_partitions_filter.q,\
+  temp_table_drop_partitions_filter2.q,\
+  temp_table_drop_partitions_filter3.q,\
+  temp_table_exchange_partition.q,\
+  temp_table_exchange_partition2.q,\
+  temp_table_exchange_partition3.q,\
+  temp_table_exchgpartition2lel.q,\
+  temp_table_gb1.q,\
+  temp_table_insert_values_dynamic_partitioned.q,\
+  temp_table_insert_values_partitioned.q,\
+  temp_table_insert_with_move_files_from_source_dir.q,\
+  temp_table_loadpart1.q,\
+  temp_table_loadpart2.q,\
+  temp_table_multi_insert_partitioned.q,\
+  temp_table_names.q,\
+  temp_table_orc_diff_part_cols.q,\
+  temp_table_orc_diff_part_cols2.q,\
+  temp_table_parquet_mixed_partition_formats.q,\
+  temp_table_parquet_partitioned.q,\
+  temp_table_parquet_ppd_partition.q,\
+  temp_table_partInit.q,\
+  temp_table_partition_boolean.q,\
+  temp_table_partition_char.q,\
+  temp_table_partition_date.q,\
+  temp_table_partition_decode_name.q,\
+  temp_table_partition_schema1.q,\
+  temp_table_partition_special_char.q,\
+  temp_table_partition_timestamp.q,\
+  temp_table_partition_type_check.q,\
+  temp_table_partition_type_in_plan.q,\
+  temp_table_partition_wise_fileformat.q,\
+  temp_table_partitions_json.q,\
+  temp_table_precedence.q,\
+  temp_table_subquery1.q,\
+  temp_table_truncate.q,\
+  testSetQueryString.q,\
+  test_boolean_whereclause.q,\
+  testdataset.q,\
+  testdataset_2.q,\
+  timestamp_1.q,\
+  timestamp_2.q,\
+  timestamp_3.q,\
+  timestamp_comparison.q,\
+  timestamp_comparison2.q,\
+  timestamp_date_only.q,\
+  timestamp_dst.q,\
+  timestamp_formats.q,\
+  timestamp_lazy.q,\
+  timestamp_null.q,\
+  timestamp_udf.q,\
+  timestamptz_1.q,\
+  timestamptz_3.q,\
+  timestamptz_4.q,\
+  topn.q,\
+  touch.q,\
+  truncate_column.q,\
+  truncate_column_merge.q,\
+  truncate_table.q,\
+  tumbled_window_tests.q,\
+  tunable_ndv.q,\
+  type_change_test_fraction.q,\
+  type_change_test_int.q,\
+  type_conversions_1.q,\
+  udaf_collect_set.q,\
+  udaf_covar_pop.q,\
+  udaf_covar_samp.q,\
+  udaf_ngrams.q,\
+  udaf_percentile.q,\
+  udf_acos.q,\
+  udf_add.q,\
+  udf_array_contains.q,\
+  udf_asin.q,\
+  udf_atan.q,\
+  udf_avg.q,\
+  udf_bigint.q,\
+  udf_bin.q,\
+  udf_bitwise_and.q,\
+  udf_bitwise_not.q,\
+  udf_bitwise_or.q,\
+  udf_bitwise_xor.q,\
+  udf_boolean.q,\
+  udf_bround.q,\
+  udf_ceil.q,\
+  udf_ceiling.q,\
+  udf_chr.q,\
+  udf_classloader.q,\
+  udf_classloader_dynamic_dependency_resolution.q,\
+  udf_compare_java_string.q,\
+  udf_concat.q,\
+  udf_concat_insert2.q,\
+  udf_conv.q,\
+  udf_cos.q,\
+  udf_current_user.q,\
+  udf_date_add.q,\
+  udf_date_sub.q,\
+  udf_datediff.q,\
+  udf_day.q,\
+  udf_dayofmonth.q,\
+  udf_div.q,\
+  udf_divide.q,\
+  udf_double.q,\
+  udf_equal.q,\
+  udf_exp.q,\
+  udf_field.q,\
+  udf_float.q,\
+  udf_floor.q,\
+  udf_from_unixtime.q,\
+  udf_greaterthan.q,\
+  udf_greaterthanorequal.q,\
+  udf_hex.q,\
+  udf_in.q,\
+  udf_index.q,\
+  udf_initcap.q,\
+  udf_int.q,\
+  udf_isnotnull.q,\
+  udf_isnull.q,\
+  udf_isops.q,\
+  udf_json_read.q,\
+  udf_lcase.q,\
+  udf_lessthan.q,\
+  udf_lessthanorequal.q,\
+  udf_likeall.q,\
+  udf_likeany.q,\
+  udf_ln.q,\
+  udf_log.q,\
+  udf_log10.q,\
+  udf_log2.q,\
+  udf_logged_in_user.q,\
+  udf_logic_java_boolean.q,\
+  udf_ltrim.q,\
+  udf_map_keys.q,\
+  udf_map_values.q,\
+  udf_max.q,\
+  udf_mid.q,\
+  udf_min.q,\
+  udf_modulo.q,\
+  udf_month.q,\
+  udf_negative.q,\
+  udf_not.q,\
+  udf_notop.q,\
+  udf_or.q,\
+  udf_percentile.q,\
+  udf_pmod.q,\
+  udf_positive.q,\
+  udf_pow.q,\
+  udf_power.q,\
+  udf_rand.q,\
+  udf_regexp.q,\
+  udf_regexp_extract.q,\
+  udf_regexp_replace.q,\
+  udf_replace.q,\
+  udf_rlike.q,\
+  udf_round.q,\
+  udf_round_2.q,\
+  udf_round_2_auto_stats.q,\
+  udf_round_3.q,\
+  udf_rtrim.q,\
+  udf_sentences.q,\
+  udf_sin.q,\
+  udf_smallint.q,\
+  udf_sqrt.q,\
+  udf_std.q,\
+  udf_stddev.q,\
+  udf_stddev_pop.q,\
+  udf_stddev_samp.q,\
+  udf_string.q,\
+  udf_substr.q,\
+  udf_substring.q,\
+  udf_subtract.q,\
+  udf_sum.q,\
+  udf_tan.q,\
+  udf_testlength.q,\
+  udf_testlength2.q,\
+  udf_tinyint.q,\
+  udf_to_boolean.q,\
+  udf_to_byte.q,\
+  udf_to_date.q,\
+  udf_to_double.q,\
+  udf_to_float.q,\
+  udf_to_long.q,\
+  udf_to_short.q,\
+  udf_to_string.q,\
+  udf_translate.q,\
+  udf_trim.q,\
+  udf_ucase.q,\
+  udf_unhex.q,\
+  udf_upper.q,\
+  udf_var_pop.q,\
+  udf_var_samp.q,\
+  udf_variance.q,\
+  udf_version.q,\
+  udf_weekofyear.q,\
+  udf_xpath.q,\
+  udf_xpath_boolean.q,\
+  udf_xpath_double.q,\
+  udf_xpath_float.q,\
+  udf_xpath_int.q,\
+  udf_xpath_long.q,\
+  udf_xpath_short.q,\
+  udf_xpath_string.q,\
+  udf_year.q,\
+  udtf_nofetchtask.q,\
+  udtf_posexplode.q,\
+  udtf_replicate_rows.q,\
+  unicode_notation.q,\
+  union36.q,\
+  union38.q,\
+  union_date.q,\
+  union_date_trim.q,\
+  union_null.q,\
+  unionall_join_nullconstant.q,\
+  unionall_lateralview1.q,\
+  unset_table_view_property.q,\
+  updateAccessTime.q,\
+  update_after_multiple_inserts_special_characters.q,\
+  varchar_1.q,\
+  varchar_2.q,\
+  varchar_cast.q,\
+  varchar_comparison.q,\
+  varchar_join1.q,\
+  varchar_nested_types.q,\
+  varchar_union1.q,\
+  vector_join.q,\
+  vector_orc_string_reader_empty_dict.q,\
+  vectorization_escape_crlf.q,\
+  view.q,\
+  view_authorization_sqlstd.q,\
+  view_cast.q,\
+  view_inputs.q,\
+  virtual_column.q,\
+  windowing_adjust_rowcontainer_sz.q,\
+  windowing_columnPruning.q,\
+  windowing_decimal.q,\
+  windowing_distinct.q,\
+  windowing_duplicate.q,\
+  windowing_ntile.q,\
+  windowing_order_null.q,\
+  windowing_rank.q,\
+  windowing_udaf2.q,\
+  windowing_windowspec4.q,\
+  zero_rows_single_insert.q
 
 encrypted.query.files=encryption_join_unencrypted_tbl.q,\
   encryption_insert_partition_static.q,\
diff --git a/ql/src/test/queries/clientpositive/lock1.q b/ql/src/test/queries/clientpositive/lock1.q
index c05a118..867f06c 100644
--- a/ql/src/test/queries/clientpositive/lock1.q
+++ b/ql/src/test/queries/clientpositive/lock1.q
@@ -1,4 +1,6 @@
 --! qt:dataset:src
+set hive.support.concurrency=true;
+
 drop table tstsrc_n1;
 create table tstsrc_n1 like src;
 insert overwrite table tstsrc_n1 select key, value from src;
diff --git a/ql/src/test/queries/clientpositive/lock2.q b/ql/src/test/queries/clientpositive/lock2.q
index 81b995c..4b9fcf1 100644
--- a/ql/src/test/queries/clientpositive/lock2.q
+++ b/ql/src/test/queries/clientpositive/lock2.q
@@ -1,5 +1,7 @@
 --! qt:dataset:srcpart
 --! qt:dataset:src
+set hive.support.concurrency=true;
+
 drop table tstsrc;
 create table tstsrc like src;
 insert overwrite table tstsrc select key, value from src;
diff --git a/ql/src/test/queries/clientpositive/lock3.q b/ql/src/test/queries/clientpositive/lock3.q
index dd5f874..c791c80 100644
--- a/ql/src/test/queries/clientpositive/lock3.q
+++ b/ql/src/test/queries/clientpositive/lock3.q
@@ -1,4 +1,6 @@
 --! qt:dataset:srcpart
+set hive.support.concurrency=true;
+
 drop table tstsrcpart_n4;
 create table tstsrcpart_n4 like srcpart;
 
diff --git a/ql/src/test/queries/clientpositive/lock4.q b/ql/src/test/queries/clientpositive/lock4.q
index cc6fdc4..c466d42 100644
--- a/ql/src/test/queries/clientpositive/lock4.q
+++ b/ql/src/test/queries/clientpositive/lock4.q
@@ -1,4 +1,6 @@
 --! qt:dataset:srcpart
+set hive.support.concurrency=true;
+
 set hive.lock.mapred.only.operation=true;
 drop table tstsrcpart_n3;
 create table tstsrcpart_n3 like srcpart;
diff --git a/ql/src/test/queries/clientpositive/orc_diff_part_cols.q b/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
index ea9623e..918ce8f 100644
--- a/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
+++ b/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
@@ -22,6 +22,6 @@ INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '1') SELECT key FROM src ta
 
 ALTER TABLE test_orc_n0 ADD COLUMNS (cnt INT);
 
-INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key LIMIT 5;
+INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key ORDER BY key LIMIT 5;
 
 SELECT * FROM test_orc_n0;
diff --git a/ql/src/test/queries/clientpositive/temp_table_orc_diff_part_cols.q b/ql/src/test/queries/clientpositive/temp_table_orc_diff_part_cols.q
index 13fd415..a5725c6 100644
--- a/ql/src/test/queries/clientpositive/temp_table_orc_diff_part_cols.q
+++ b/ql/src/test/queries/clientpositive/temp_table_orc_diff_part_cols.q
@@ -18,10 +18,10 @@ set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
 -- to another partition
 -- This can produce unexpected results with CombineHiveInputFormat
 
-INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '1') SELECT key FROM src tablesample (5 rows);
+INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '1') SELECT key FROM src tablesample (5 rows) ORDER BY key;
 
 ALTER TABLE test_orc_n0_temp ADD COLUMNS (cnt INT);
 
-INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key LIMIT 5;
+INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key ORDER BY key LIMIT 5;
 
 SELECT * FROM test_orc_n0_temp;
diff --git a/ql/src/test/results/clientpositive/acid_bloom_filter_orc_file_dump.q.out b/ql/src/test/results/clientpositive/llap/acid_bloom_filter_orc_file_dump.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_bloom_filter_orc_file_dump.q.out
rename to ql/src/test/results/clientpositive/llap/acid_bloom_filter_orc_file_dump.q.out
diff --git a/ql/src/test/results/clientpositive/acid_insert_overwrite.q.out b/ql/src/test/results/clientpositive/llap/acid_insert_overwrite.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_insert_overwrite.q.out
rename to ql/src/test/results/clientpositive/llap/acid_insert_overwrite.q.out
diff --git a/ql/src/test/results/clientpositive/acid_join.q.out b/ql/src/test/results/clientpositive/llap/acid_join.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_join.q.out
rename to ql/src/test/results/clientpositive/llap/acid_join.q.out
diff --git a/ql/src/test/results/clientpositive/acid_stats.q.out b/ql/src/test/results/clientpositive/llap/acid_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_stats.q.out
rename to ql/src/test/results/clientpositive/llap/acid_stats.q.out
diff --git a/ql/src/test/results/clientpositive/acid_subquery.q.out b/ql/src/test/results/clientpositive/llap/acid_subquery.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_subquery.q.out
rename to ql/src/test/results/clientpositive/llap/acid_subquery.q.out
diff --git a/ql/src/test/results/clientpositive/acid_table_directories_test.q.out b/ql/src/test/results/clientpositive/llap/acid_table_directories_test.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_table_directories_test.q.out
rename to ql/src/test/results/clientpositive/llap/acid_table_directories_test.q.out
diff --git a/ql/src/test/results/clientpositive/acid_vectorization.q.out b/ql/src/test/results/clientpositive/llap/acid_vectorization.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_vectorization.q.out
rename to ql/src/test/results/clientpositive/llap/acid_vectorization.q.out
diff --git a/ql/src/test/results/clientpositive/acid_vectorization_partition.q.out b/ql/src/test/results/clientpositive/llap/acid_vectorization_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_vectorization_partition.q.out
rename to ql/src/test/results/clientpositive/llap/acid_vectorization_partition.q.out
diff --git a/ql/src/test/results/clientpositive/acid_vectorization_project.q.out b/ql/src/test/results/clientpositive/llap/acid_vectorization_project.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/acid_vectorization_project.q.out
rename to ql/src/test/results/clientpositive/llap/acid_vectorization_project.q.out
diff --git a/ql/src/test/results/clientpositive/add_jar_pfile.q.out b/ql/src/test/results/clientpositive/llap/add_jar_pfile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/add_jar_pfile.q.out
rename to ql/src/test/results/clientpositive/llap/add_jar_pfile.q.out
diff --git a/ql/src/test/results/clientpositive/add_jar_with_file_removed.q.out b/ql/src/test/results/clientpositive/llap/add_jar_with_file_removed.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/add_jar_with_file_removed.q.out
rename to ql/src/test/results/clientpositive/llap/add_jar_with_file_removed.q.out
diff --git a/ql/src/test/results/clientpositive/add_part_exist.q.out b/ql/src/test/results/clientpositive/llap/add_part_exist.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/add_part_exist.q.out
rename to ql/src/test/results/clientpositive/llap/add_part_exist.q.out
diff --git a/ql/src/test/results/clientpositive/add_part_multiple.q.out b/ql/src/test/results/clientpositive/llap/add_part_multiple.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/add_part_multiple.q.out
rename to ql/src/test/results/clientpositive/llap/add_part_multiple.q.out
diff --git a/ql/src/test/results/clientpositive/add_partition_no_whitelist.q.out b/ql/src/test/results/clientpositive/llap/add_partition_no_whitelist.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/add_partition_no_whitelist.q.out
rename to ql/src/test/results/clientpositive/llap/add_partition_no_whitelist.q.out
diff --git a/ql/src/test/results/clientpositive/add_partition_with_whitelist.q.out b/ql/src/test/results/clientpositive/llap/add_partition_with_whitelist.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/add_partition_with_whitelist.q.out
rename to ql/src/test/results/clientpositive/llap/add_partition_with_whitelist.q.out
diff --git a/ql/src/test/results/clientpositive/allow_change_col_type_par.q.out b/ql/src/test/results/clientpositive/llap/allow_change_col_type_par.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/allow_change_col_type_par.q.out
rename to ql/src/test/results/clientpositive/llap/allow_change_col_type_par.q.out
diff --git a/ql/src/test/results/clientpositive/alter1.q.out b/ql/src/test/results/clientpositive/llap/alter1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter1.q.out
rename to ql/src/test/results/clientpositive/llap/alter1.q.out
diff --git a/ql/src/test/results/clientpositive/alter2.q.out b/ql/src/test/results/clientpositive/llap/alter2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter2.q.out
rename to ql/src/test/results/clientpositive/llap/alter2.q.out
diff --git a/ql/src/test/results/clientpositive/alter3.q.out b/ql/src/test/results/clientpositive/llap/alter3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter3.q.out
rename to ql/src/test/results/clientpositive/llap/alter3.q.out
diff --git a/ql/src/test/results/clientpositive/alter4.q.out b/ql/src/test/results/clientpositive/llap/alter4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter4.q.out
rename to ql/src/test/results/clientpositive/llap/alter4.q.out
diff --git a/ql/src/test/results/clientpositive/alter5.q.out b/ql/src/test/results/clientpositive/llap/alter5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter5.q.out
rename to ql/src/test/results/clientpositive/llap/alter5.q.out
diff --git a/ql/src/test/results/clientpositive/alterColumnStats.q.out b/ql/src/test/results/clientpositive/llap/alterColumnStats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alterColumnStats.q.out
rename to ql/src/test/results/clientpositive/llap/alterColumnStats.q.out
diff --git a/ql/src/test/results/clientpositive/alter_char1.q.out b/ql/src/test/results/clientpositive/llap/alter_char1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_char1.q.out
rename to ql/src/test/results/clientpositive/llap/alter_char1.q.out
diff --git a/ql/src/test/results/clientpositive/alter_char2.q.out b/ql/src/test/results/clientpositive/llap/alter_char2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_char2.q.out
rename to ql/src/test/results/clientpositive/llap/alter_char2.q.out
diff --git a/ql/src/test/results/clientpositive/alter_file_format.q.out b/ql/src/test/results/clientpositive/llap/alter_file_format.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_file_format.q.out
rename to ql/src/test/results/clientpositive/llap/alter_file_format.q.out
diff --git a/ql/src/test/results/clientpositive/alter_merge.q.out b/ql/src/test/results/clientpositive/llap/alter_merge.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_merge.q.out
rename to ql/src/test/results/clientpositive/llap/alter_merge.q.out
diff --git a/ql/src/test/results/clientpositive/alter_merge_2.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_merge_2.q.out
rename to ql/src/test/results/clientpositive/llap/alter_merge_2.q.out
diff --git a/ql/src/test/results/clientpositive/alter_merge_3.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_merge_3.q.out
rename to ql/src/test/results/clientpositive/llap/alter_merge_3.q.out
diff --git a/ql/src/test/results/clientpositive/alter_merge_stats.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_merge_stats.q.out
rename to ql/src/test/results/clientpositive/llap/alter_merge_stats.q.out
diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out b/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table2_h23.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
rename to ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table2_h23.q.out
diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out b/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table_h23.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out
rename to ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table_h23.q.out
diff --git a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_clusterby_sortby.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
rename to ql/src/test/results/clientpositive/llap/alter_partition_clusterby_sortby.q.out
diff --git a/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_format_loc.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
rename to ql/src/test/results/clientpositive/llap/alter_partition_format_loc.q.out
diff --git a/ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_onto_nocurrent_db.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_partition_onto_nocurrent_db.q.out
rename to ql/src/test/results/clientpositive/llap/alter_partition_onto_nocurrent_db.q.out
diff --git a/ql/src/test/results/clientpositive/alter_partition_update_status.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_update_status.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_partition_update_status.q.out
rename to ql/src/test/results/clientpositive/llap/alter_partition_update_status.q.out
diff --git a/ql/src/test/results/clientpositive/alter_partition_with_whitelist.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_with_whitelist.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_partition_with_whitelist.q.out
rename to ql/src/test/results/clientpositive/llap/alter_partition_with_whitelist.q.out
diff --git a/ql/src/test/results/clientpositive/alter_rename_partition.q.out b/ql/src/test/results/clientpositive/llap/alter_rename_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_rename_partition.q.out
rename to ql/src/test/results/clientpositive/llap/alter_rename_partition.q.out
diff --git a/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out b/ql/src/test/results/clientpositive/llap/alter_rename_partition_authorization.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
rename to ql/src/test/results/clientpositive/llap/alter_rename_partition_authorization.q.out
diff --git a/ql/src/test/results/clientpositive/alter_rename_table.q.out b/ql/src/test/results/clientpositive/llap/alter_rename_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_rename_table.q.out
rename to ql/src/test/results/clientpositive/llap/alter_rename_table.q.out
diff --git a/ql/src/test/results/clientpositive/alter_skewed_table.q.out b/ql/src/test/results/clientpositive/llap/alter_skewed_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_skewed_table.q.out
rename to ql/src/test/results/clientpositive/llap/alter_skewed_table.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_add_partition.q.out b/ql/src/test/results/clientpositive/llap/alter_table_add_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_add_partition.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_add_partition.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_cascade.q.out b/ql/src/test/results/clientpositive/llap/alter_table_cascade.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_cascade.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_cascade.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out b/ql/src/test/results/clientpositive/llap/alter_table_column_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_column_stats.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_column_stats.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_location.q.out b/ql/src/test/results/clientpositive/llap/alter_table_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_location.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_location.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out b/ql/src/test/results/clientpositive/llap/alter_table_not_sorted.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_not_sorted.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_partition_drop.q.out b/ql/src/test/results/clientpositive/llap/alter_table_partition_drop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_partition_drop.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_partition_drop.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_serde.q.out b/ql/src/test/results/clientpositive/llap/alter_table_serde.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_serde.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_serde.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_serde2.q.out b/ql/src/test/results/clientpositive/llap/alter_table_serde2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_serde2.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_serde2.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_stats_status.q.out b/ql/src/test/results/clientpositive/llap/alter_table_stats_status.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_stats_status.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_stats_status.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_update_status.q.out b/ql/src/test/results/clientpositive/llap/alter_table_update_status.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_update_status.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_update_status.q.out
diff --git a/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out b/ql/src/test/results/clientpositive/llap/alter_table_update_status_disable_bitvector.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
rename to ql/src/test/results/clientpositive/llap/alter_table_update_status_disable_bitvector.q.out
diff --git a/ql/src/test/results/clientpositive/alter_varchar1.q.out b/ql/src/test/results/clientpositive/llap/alter_varchar1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_varchar1.q.out
rename to ql/src/test/results/clientpositive/llap/alter_varchar1.q.out
diff --git a/ql/src/test/results/clientpositive/alter_varchar2.q.out b/ql/src/test/results/clientpositive/llap/alter_varchar2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_varchar2.q.out
rename to ql/src/test/results/clientpositive/llap/alter_varchar2.q.out
diff --git a/ql/src/test/results/clientpositive/alter_view_as_select.q.out b/ql/src/test/results/clientpositive/llap/alter_view_as_select.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_view_as_select.q.out
rename to ql/src/test/results/clientpositive/llap/alter_view_as_select.q.out
diff --git a/ql/src/test/results/clientpositive/alter_view_col_type.q.out b/ql/src/test/results/clientpositive/llap/alter_view_col_type.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_view_col_type.q.out
rename to ql/src/test/results/clientpositive/llap/alter_view_col_type.q.out
diff --git a/ql/src/test/results/clientpositive/alter_view_rename.q.out b/ql/src/test/results/clientpositive/llap/alter_view_rename.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/alter_view_rename.q.out
rename to ql/src/test/results/clientpositive/llap/alter_view_rename.q.out
diff --git a/ql/src/test/results/clientpositive/analyze_tbl_part.q.out b/ql/src/test/results/clientpositive/llap/analyze_tbl_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/analyze_tbl_part.q.out
rename to ql/src/test/results/clientpositive/llap/analyze_tbl_part.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_1.q.out b/ql/src/test/results/clientpositive/llap/authorization_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_1.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_1.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_1_sql_std.q.out b/ql/src/test/results/clientpositive/llap/authorization_1_sql_std.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_1_sql_std.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_1_sql_std.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_3.q.out b/ql/src/test/results/clientpositive/llap/authorization_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_3.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_3.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_4.q.out b/ql/src/test/results/clientpositive/llap/authorization_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_4.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_4.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_5.q.out b/ql/src/test/results/clientpositive/llap/authorization_5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_5.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_5.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_6.q.out b/ql/src/test/results/clientpositive/llap/authorization_6.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_6.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_6.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_7.q.out b/ql/src/test/results/clientpositive/llap/authorization_7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_7.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_7.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_8.q.out b/ql/src/test/results/clientpositive/llap/authorization_8.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_8.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_8.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out b/ql/src/test/results/clientpositive/llap/authorization_admin_almighty1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_admin_almighty1.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out b/ql/src/test/results/clientpositive/llap/authorization_admin_almighty2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_admin_almighty2.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out b/ql/src/test/results/clientpositive/llap/authorization_alter_table_exchange_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_alter_table_exchange_partition.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_alter_table_exchange_partition.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_cli_createtab.q.out b/ql/src/test/results/clientpositive/llap/authorization_cli_createtab.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_cli_createtab.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_cli_createtab.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_cli_createtab_noauthzapi.q.out b/ql/src/test/results/clientpositive/llap/authorization_cli_createtab_noauthzapi.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_cli_createtab_noauthzapi.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_cli_createtab_noauthzapi.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_cli_nonsql.q.out b/ql/src/test/results/clientpositive/llap/authorization_cli_nonsql.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_cli_nonsql.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_cli_nonsql.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_cli_stdconfigauth.q.out b/ql/src/test/results/clientpositive/llap/authorization_cli_stdconfigauth.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_cli_stdconfigauth.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_cli_stdconfigauth.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_create_func1.q.out b/ql/src/test/results/clientpositive/llap/authorization_create_func1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_create_func1.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_create_func1.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_create_macro1.q.out b/ql/src/test/results/clientpositive/llap/authorization_create_macro1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_create_macro1.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_create_macro1.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out b/ql/src/test/results/clientpositive/llap/authorization_create_table_owner_privs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_create_table_owner_privs.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_create_table_owner_privs.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_create_temp_table.q.out b/ql/src/test/results/clientpositive/llap/authorization_create_temp_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_create_temp_table.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_create_temp_table.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out b/ql/src/test/results/clientpositive/llap/authorization_default_create_table_owner_privs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_default_create_table_owner_privs.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_delete.q.out b/ql/src/test/results/clientpositive/llap/authorization_delete.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_delete.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_delete.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_delete_own_table.q.out b/ql/src/test/results/clientpositive/llap/authorization_delete_own_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_delete_own_table.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_delete_own_table.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_grant_option_role.q.out b/ql/src/test/results/clientpositive/llap/authorization_grant_option_role.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_grant_option_role.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_grant_option_role.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out b/ql/src/test/results/clientpositive/llap/authorization_grant_public_role.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_grant_public_role.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_grant_public_role.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out b/ql/src/test/results/clientpositive/llap/authorization_grant_table_priv.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_grant_table_priv.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_insert.q.out b/ql/src/test/results/clientpositive/llap/authorization_insert.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_insert.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_insert.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_load.q.out b/ql/src/test/results/clientpositive/llap/authorization_load.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_load.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_load.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_non_id.q.out b/ql/src/test/results/clientpositive/llap/authorization_non_id.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_non_id.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_non_id.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_owner_actions.q.out b/ql/src/test/results/clientpositive/llap/authorization_owner_actions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_owner_actions.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_owner_actions.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_parts.q.out b/ql/src/test/results/clientpositive/llap/authorization_parts.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_parts.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_parts.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_reset.q.out b/ql/src/test/results/clientpositive/llap/authorization_reset.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_reset.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_reset.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out b/ql/src/test/results/clientpositive/llap/authorization_revoke_table_priv.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_revoke_table_priv.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_role_grant1.q.out b/ql/src/test/results/clientpositive/llap/authorization_role_grant1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_role_grant1.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_role_grant1.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_role_grant2.q.out b/ql/src/test/results/clientpositive/llap/authorization_role_grant2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_role_grant2.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_role_grant2.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out b/ql/src/test/results/clientpositive/llap/authorization_set_show_current_role.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_set_show_current_role.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_show_grant.q.out b/ql/src/test/results/clientpositive/llap/authorization_show_grant.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_show_grant.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_show_grant.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out b/ql/src/test/results/clientpositive/llap/authorization_show_role_principals_v1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_show_role_principals_v1.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_update.q.out b/ql/src/test/results/clientpositive/llap/authorization_update.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_update.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_update.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_update_own_table.q.out b/ql/src/test/results/clientpositive/llap/authorization_update_own_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_update_own_table.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_update_own_table.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_view_2.q.out b/ql/src/test/results/clientpositive/llap/authorization_view_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_view_2.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_view_2.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_view_3.q.out b/ql/src/test/results/clientpositive/llap/authorization_view_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_view_3.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_view_3.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_view_4.q.out b/ql/src/test/results/clientpositive/llap/authorization_view_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_view_4.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_view_4.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_view_disable_cbo_2.q.out b/ql/src/test/results/clientpositive/llap/authorization_view_disable_cbo_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_view_disable_cbo_2.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_view_disable_cbo_2.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_view_disable_cbo_3.q.out b/ql/src/test/results/clientpositive/llap/authorization_view_disable_cbo_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_view_disable_cbo_3.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_view_disable_cbo_3.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_view_disable_cbo_4.q.out b/ql/src/test/results/clientpositive/llap/authorization_view_disable_cbo_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_view_disable_cbo_4.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_view_disable_cbo_4.q.out
diff --git a/ql/src/test/results/clientpositive/authorization_wm.q.out b/ql/src/test/results/clientpositive/llap/authorization_wm.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/authorization_wm.q.out
rename to ql/src/test/results/clientpositive/llap/authorization_wm.q.out
diff --git a/ql/src/test/results/clientpositive/autoColumnStats_3.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/autoColumnStats_3.q.out
rename to ql/src/test/results/clientpositive/llap/autoColumnStats_3.q.out
diff --git a/ql/src/test/results/clientpositive/avro_add_column.q.out b/ql/src/test/results/clientpositive/llap/avro_add_column.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_add_column.q.out
rename to ql/src/test/results/clientpositive/llap/avro_add_column.q.out
diff --git a/ql/src/test/results/clientpositive/avro_add_column2.q.out b/ql/src/test/results/clientpositive/llap/avro_add_column2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_add_column2.q.out
rename to ql/src/test/results/clientpositive/llap/avro_add_column2.q.out
diff --git a/ql/src/test/results/clientpositive/avro_add_column3.q.out b/ql/src/test/results/clientpositive/llap/avro_add_column3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_add_column3.q.out
rename to ql/src/test/results/clientpositive/llap/avro_add_column3.q.out
diff --git a/ql/src/test/results/clientpositive/avro_add_column_extschema.q.out b/ql/src/test/results/clientpositive/llap/avro_add_column_extschema.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_add_column_extschema.q.out
rename to ql/src/test/results/clientpositive/llap/avro_add_column_extschema.q.out
diff --git a/ql/src/test/results/clientpositive/avro_alter_table_update_columns.q.out b/ql/src/test/results/clientpositive/llap/avro_alter_table_update_columns.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_alter_table_update_columns.q.out
rename to ql/src/test/results/clientpositive/llap/avro_alter_table_update_columns.q.out
diff --git a/ql/src/test/results/clientpositive/avro_change_schema.q.out b/ql/src/test/results/clientpositive/llap/avro_change_schema.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_change_schema.q.out
rename to ql/src/test/results/clientpositive/llap/avro_change_schema.q.out
diff --git a/ql/src/test/results/clientpositive/avro_charvarchar.q.out b/ql/src/test/results/clientpositive/llap/avro_charvarchar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_charvarchar.q.out
rename to ql/src/test/results/clientpositive/llap/avro_charvarchar.q.out
diff --git a/ql/src/test/results/clientpositive/avro_comments.q.out b/ql/src/test/results/clientpositive/llap/avro_comments.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_comments.q.out
rename to ql/src/test/results/clientpositive/llap/avro_comments.q.out
diff --git a/ql/src/test/results/clientpositive/avro_compression_enabled.q.out b/ql/src/test/results/clientpositive/llap/avro_compression_enabled.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_compression_enabled.q.out
rename to ql/src/test/results/clientpositive/llap/avro_compression_enabled.q.out
diff --git a/ql/src/test/results/clientpositive/avro_compression_enabled_native.q.out b/ql/src/test/results/clientpositive/llap/avro_compression_enabled_native.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_compression_enabled_native.q.out
rename to ql/src/test/results/clientpositive/llap/avro_compression_enabled_native.q.out
diff --git a/ql/src/test/results/clientpositive/avro_decimal.q.out b/ql/src/test/results/clientpositive/llap/avro_decimal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_decimal.q.out
rename to ql/src/test/results/clientpositive/llap/avro_decimal.q.out
diff --git a/ql/src/test/results/clientpositive/avro_decimal_native.q.out b/ql/src/test/results/clientpositive/llap/avro_decimal_native.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_decimal_native.q.out
rename to ql/src/test/results/clientpositive/llap/avro_decimal_native.q.out
diff --git a/ql/src/test/results/clientpositive/avro_decimal_old.q.out b/ql/src/test/results/clientpositive/llap/avro_decimal_old.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_decimal_old.q.out
rename to ql/src/test/results/clientpositive/llap/avro_decimal_old.q.out
diff --git a/ql/src/test/results/clientpositive/avro_deserialize_map_null.q.out b/ql/src/test/results/clientpositive/llap/avro_deserialize_map_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_deserialize_map_null.q.out
rename to ql/src/test/results/clientpositive/llap/avro_deserialize_map_null.q.out
diff --git a/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out b/ql/src/test/results/clientpositive/llap/avro_evolved_schemas.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
rename to ql/src/test/results/clientpositive/llap/avro_evolved_schemas.q.out
diff --git a/ql/src/test/results/clientpositive/avro_historical_timestamp.q.out b/ql/src/test/results/clientpositive/llap/avro_historical_timestamp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_historical_timestamp.q.out
rename to ql/src/test/results/clientpositive/llap/avro_historical_timestamp.q.out
diff --git a/ql/src/test/results/clientpositive/avro_joins.q.out b/ql/src/test/results/clientpositive/llap/avro_joins.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_joins.q.out
rename to ql/src/test/results/clientpositive/llap/avro_joins.q.out
diff --git a/ql/src/test/results/clientpositive/avro_joins_native.q.out b/ql/src/test/results/clientpositive/llap/avro_joins_native.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_joins_native.q.out
rename to ql/src/test/results/clientpositive/llap/avro_joins_native.q.out
diff --git a/ql/src/test/results/clientpositive/avro_native.q.out b/ql/src/test/results/clientpositive/llap/avro_native.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_native.q.out
rename to ql/src/test/results/clientpositive/llap/avro_native.q.out
diff --git a/ql/src/test/results/clientpositive/avro_nullable_fields.q.out b/ql/src/test/results/clientpositive/llap/avro_nullable_fields.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_nullable_fields.q.out
rename to ql/src/test/results/clientpositive/llap/avro_nullable_fields.q.out
diff --git a/ql/src/test/results/clientpositive/avro_nullable_union.q.out b/ql/src/test/results/clientpositive/llap/avro_nullable_union.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_nullable_union.q.out
rename to ql/src/test/results/clientpositive/llap/avro_nullable_union.q.out
diff --git a/ql/src/test/results/clientpositive/avro_partitioned.q.out b/ql/src/test/results/clientpositive/llap/avro_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/avro_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/avro_partitioned_native.q.out b/ql/src/test/results/clientpositive/llap/avro_partitioned_native.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_partitioned_native.q.out
rename to ql/src/test/results/clientpositive/llap/avro_partitioned_native.q.out
diff --git a/ql/src/test/results/clientpositive/avro_sanity_test.q.out b/ql/src/test/results/clientpositive/llap/avro_sanity_test.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_sanity_test.q.out
rename to ql/src/test/results/clientpositive/llap/avro_sanity_test.q.out
diff --git a/ql/src/test/results/clientpositive/avro_schema_literal.q.out b/ql/src/test/results/clientpositive/llap/avro_schema_literal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_schema_literal.q.out
rename to ql/src/test/results/clientpositive/llap/avro_schema_literal.q.out
diff --git a/ql/src/test/results/clientpositive/avro_tableproperty_optimize.q.out b/ql/src/test/results/clientpositive/llap/avro_tableproperty_optimize.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_tableproperty_optimize.q.out
rename to ql/src/test/results/clientpositive/llap/avro_tableproperty_optimize.q.out
diff --git a/ql/src/test/results/clientpositive/avro_type_evolution.q.out b/ql/src/test/results/clientpositive/llap/avro_type_evolution.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avro_type_evolution.q.out
rename to ql/src/test/results/clientpositive/llap/avro_type_evolution.q.out
diff --git a/ql/src/test/results/clientpositive/avrocountemptytbl.q.out b/ql/src/test/results/clientpositive/llap/avrocountemptytbl.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/avrocountemptytbl.q.out
rename to ql/src/test/results/clientpositive/llap/avrocountemptytbl.q.out
diff --git a/ql/src/test/results/clientpositive/ba_table1.q.out b/ql/src/test/results/clientpositive/llap/ba_table1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ba_table1.q.out
rename to ql/src/test/results/clientpositive/llap/ba_table1.q.out
diff --git a/ql/src/test/results/clientpositive/ba_table2.q.out b/ql/src/test/results/clientpositive/llap/ba_table2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ba_table2.q.out
rename to ql/src/test/results/clientpositive/llap/ba_table2.q.out
diff --git a/ql/src/test/results/clientpositive/ba_table3.q.out b/ql/src/test/results/clientpositive/llap/ba_table3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ba_table3.q.out
rename to ql/src/test/results/clientpositive/llap/ba_table3.q.out
diff --git a/ql/src/test/results/clientpositive/ba_table_udfs.q.out b/ql/src/test/results/clientpositive/llap/ba_table_udfs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ba_table_udfs.q.out
rename to ql/src/test/results/clientpositive/llap/ba_table_udfs.q.out
diff --git a/ql/src/test/results/clientpositive/ba_table_union.q.out b/ql/src/test/results/clientpositive/llap/ba_table_union.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ba_table_union.q.out
rename to ql/src/test/results/clientpositive/llap/ba_table_union.q.out
diff --git a/ql/src/test/results/clientpositive/basicstat_partval.q.out b/ql/src/test/results/clientpositive/llap/basicstat_partval.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/basicstat_partval.q.out
rename to ql/src/test/results/clientpositive/llap/basicstat_partval.q.out
diff --git a/ql/src/test/results/clientpositive/binary_constant.q.out b/ql/src/test/results/clientpositive/llap/binary_constant.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/binary_constant.q.out
rename to ql/src/test/results/clientpositive/llap/binary_constant.q.out
diff --git a/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out b/ql/src/test/results/clientpositive/llap/binary_table_bincolserde.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/binary_table_bincolserde.q.out
rename to ql/src/test/results/clientpositive/llap/binary_table_bincolserde.q.out
diff --git a/ql/src/test/results/clientpositive/binary_table_colserde.q.out b/ql/src/test/results/clientpositive/llap/binary_table_colserde.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/binary_table_colserde.q.out
rename to ql/src/test/results/clientpositive/llap/binary_table_colserde.q.out
diff --git a/ql/src/test/results/clientpositive/bitvector.q.out b/ql/src/test/results/clientpositive/llap/bitvector.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/bitvector.q.out
rename to ql/src/test/results/clientpositive/llap/bitvector.q.out
diff --git a/ql/src/test/results/clientpositive/bool_literal.q.out b/ql/src/test/results/clientpositive/llap/bool_literal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/bool_literal.q.out
rename to ql/src/test/results/clientpositive/llap/bool_literal.q.out
diff --git a/ql/src/test/results/clientpositive/bucket7.q.out b/ql/src/test/results/clientpositive/llap/bucket7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/bucket7.q.out
rename to ql/src/test/results/clientpositive/llap/bucket7.q.out
diff --git a/ql/src/test/results/clientpositive/bucket_if_with_path_filter.q.out b/ql/src/test/results/clientpositive/llap/bucket_if_with_path_filter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/bucket_if_with_path_filter.q.out
rename to ql/src/test/results/clientpositive/llap/bucket_if_with_path_filter.q.out
diff --git a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out b/ql/src/test/results/clientpositive/llap/bucketizedhiveinputformat_auto.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
rename to ql/src/test/results/clientpositive/llap/bucketizedhiveinputformat_auto.q.out
diff --git a/ql/src/test/results/clientpositive/cast2.q.out b/ql/src/test/results/clientpositive/llap/cast2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cast2.q.out
rename to ql/src/test/results/clientpositive/llap/cast2.q.out
diff --git a/ql/src/test/results/clientpositive/cast3.q.out b/ql/src/test/results/clientpositive/llap/cast3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cast3.q.out
rename to ql/src/test/results/clientpositive/llap/cast3.q.out
diff --git a/ql/src/test/results/clientpositive/cast_qualified_types.q.out b/ql/src/test/results/clientpositive/llap/cast_qualified_types.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cast_qualified_types.q.out
rename to ql/src/test/results/clientpositive/llap/cast_qualified_types.q.out
diff --git a/ql/src/test/results/clientpositive/cast_tinyint_to_double.q.out b/ql/src/test/results/clientpositive/llap/cast_tinyint_to_double.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cast_tinyint_to_double.q.out
rename to ql/src/test/results/clientpositive/llap/cast_tinyint_to_double.q.out
diff --git a/ql/src/test/results/clientpositive/cast_to_int.q.out b/ql/src/test/results/clientpositive/llap/cast_to_int.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cast_to_int.q.out
rename to ql/src/test/results/clientpositive/llap/cast_to_int.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_rp_gby_empty.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_gby_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_rp_gby_empty.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_rp_gby_empty.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_rp_stats.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_rp_stats.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_rp_stats.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_udf_percentile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_rp_udf_percentile.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_rp_udf_percentile.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_udf_percentile2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_rp_udf_percentile2.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_rp_udf_percentile2.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_rp_union.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_union.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_rp_union.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_rp_union.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_rp_windowing.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_windowing.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_rp_windowing.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_rp_windowing.q.out
diff --git a/ql/src/test/results/clientpositive/cbo_udf_max.q.out b/ql/src/test/results/clientpositive/llap/cbo_udf_max.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cbo_udf_max.q.out
rename to ql/src/test/results/clientpositive/llap/cbo_udf_max.q.out
diff --git a/ql/src/test/results/clientpositive/char_1.q.out b/ql/src/test/results/clientpositive/llap/char_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_1.q.out
rename to ql/src/test/results/clientpositive/llap/char_1.q.out
diff --git a/ql/src/test/results/clientpositive/char_2.q.out b/ql/src/test/results/clientpositive/llap/char_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_2.q.out
rename to ql/src/test/results/clientpositive/llap/char_2.q.out
diff --git a/ql/src/test/results/clientpositive/char_cast.q.out b/ql/src/test/results/clientpositive/llap/char_cast.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_cast.q.out
rename to ql/src/test/results/clientpositive/llap/char_cast.q.out
diff --git a/ql/src/test/results/clientpositive/char_comparison.q.out b/ql/src/test/results/clientpositive/llap/char_comparison.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_comparison.q.out
rename to ql/src/test/results/clientpositive/llap/char_comparison.q.out
diff --git a/ql/src/test/results/clientpositive/char_join1.q.out b/ql/src/test/results/clientpositive/llap/char_join1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_join1.q.out
rename to ql/src/test/results/clientpositive/llap/char_join1.q.out
diff --git a/ql/src/test/results/clientpositive/char_nested_types.q.out b/ql/src/test/results/clientpositive/llap/char_nested_types.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_nested_types.q.out
rename to ql/src/test/results/clientpositive/llap/char_nested_types.q.out
diff --git a/ql/src/test/results/clientpositive/char_pad_convert.q.out b/ql/src/test/results/clientpositive/llap/char_pad_convert.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_pad_convert.q.out
rename to ql/src/test/results/clientpositive/llap/char_pad_convert.q.out
diff --git a/ql/src/test/results/clientpositive/char_union1.q.out b/ql/src/test/results/clientpositive/llap/char_union1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_union1.q.out
rename to ql/src/test/results/clientpositive/llap/char_union1.q.out
diff --git a/ql/src/test/results/clientpositive/char_varchar_udf.q.out b/ql/src/test/results/clientpositive/llap/char_varchar_udf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/char_varchar_udf.q.out
rename to ql/src/test/results/clientpositive/llap/char_varchar_udf.q.out
diff --git a/ql/src/test/results/clientpositive/cli_print_escape_crlf.q.out b/ql/src/test/results/clientpositive/llap/cli_print_escape_crlf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cli_print_escape_crlf.q.out
rename to ql/src/test/results/clientpositive/llap/cli_print_escape_crlf.q.out
diff --git a/ql/src/test/results/clientpositive/cmdwithcomments.q.out b/ql/src/test/results/clientpositive/llap/cmdwithcomments.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cmdwithcomments.q.out
rename to ql/src/test/results/clientpositive/llap/cmdwithcomments.q.out
diff --git a/ql/src/test/results/clientpositive/collision.q.out b/ql/src/test/results/clientpositive/llap/collision.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/collision.q.out
rename to ql/src/test/results/clientpositive/llap/collision.q.out
diff --git a/ql/src/test/results/clientpositive/columnstats_infinity.q.out b/ql/src/test/results/clientpositive/llap/columnstats_infinity.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/columnstats_infinity.q.out
rename to ql/src/test/results/clientpositive/llap/columnstats_infinity.q.out
diff --git a/ql/src/test/results/clientpositive/combine1.q.out b/ql/src/test/results/clientpositive/llap/combine1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/combine1.q.out
rename to ql/src/test/results/clientpositive/llap/combine1.q.out
diff --git a/ql/src/test/results/clientpositive/combine3.q.out b/ql/src/test/results/clientpositive/llap/combine3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/combine3.q.out
rename to ql/src/test/results/clientpositive/llap/combine3.q.out
diff --git a/ql/src/test/results/clientpositive/comma_in_column_name.q.out b/ql/src/test/results/clientpositive/llap/comma_in_column_name.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/comma_in_column_name.q.out
rename to ql/src/test/results/clientpositive/llap/comma_in_column_name.q.out
diff --git a/ql/src/test/results/clientpositive/compile_processor.q.out b/ql/src/test/results/clientpositive/llap/compile_processor.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compile_processor.q.out
rename to ql/src/test/results/clientpositive/llap/compile_processor.q.out
diff --git a/ql/src/test/results/clientpositive/compustat_avro.q.out b/ql/src/test/results/clientpositive/llap/compustat_avro.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compustat_avro.q.out
rename to ql/src/test/results/clientpositive/llap/compustat_avro.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_binary.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_binary.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_binary.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_binary.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_boolean.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_decimal.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_decimal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_decimal.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_decimal.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_double.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_double.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_double.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_double.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_empty_table.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_empty_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_empty_table.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_empty_table.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_long.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_long.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_long.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_long.q.out
diff --git a/ql/src/test/results/clientpositive/compute_stats_string.q.out b/ql/src/test/results/clientpositive/llap/compute_stats_string.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/compute_stats_string.q.out
rename to ql/src/test/results/clientpositive/llap/compute_stats_string.q.out
diff --git a/ql/src/test/results/clientpositive/concatenate_inherit_table_location.q.out b/ql/src/test/results/clientpositive/llap/concatenate_inherit_table_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/concatenate_inherit_table_location.q.out
rename to ql/src/test/results/clientpositive/llap/concatenate_inherit_table_location.q.out
diff --git a/ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out b/ql/src/test/results/clientpositive/llap/confirm_initial_tbl_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/confirm_initial_tbl_stats.q.out
rename to ql/src/test/results/clientpositive/llap/confirm_initial_tbl_stats.q.out
diff --git a/ql/src/test/results/clientpositive/constant_prop_4.q.out b/ql/src/test/results/clientpositive/llap/constant_prop_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/constant_prop_4.q.out
rename to ql/src/test/results/clientpositive/llap/constant_prop_4.q.out
diff --git a/ql/src/test/results/clientpositive/convert_enum_to_string.q.out b/ql/src/test/results/clientpositive/llap/convert_enum_to_string.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/convert_enum_to_string.q.out
rename to ql/src/test/results/clientpositive/llap/convert_enum_to_string.q.out
diff --git a/ql/src/test/results/clientpositive/cp_mj_rc.q.out b/ql/src/test/results/clientpositive/llap/cp_mj_rc.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cp_mj_rc.q.out
rename to ql/src/test/results/clientpositive/llap/cp_mj_rc.q.out
diff --git a/ql/src/test/results/clientpositive/create_1.q.out b/ql/src/test/results/clientpositive/llap/create_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_1.q.out
rename to ql/src/test/results/clientpositive/llap/create_1.q.out
diff --git a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out b/ql/src/test/results/clientpositive/llap/create_alter_list_bucketing_table1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
rename to ql/src/test/results/clientpositive/llap/create_alter_list_bucketing_table1.q.out
diff --git a/ql/src/test/results/clientpositive/create_big_view.q.out b/ql/src/test/results/clientpositive/llap/create_big_view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_big_view.q.out
rename to ql/src/test/results/clientpositive/llap/create_big_view.q.out
diff --git a/ql/src/test/results/clientpositive/create_default_prop.q.out b/ql/src/test/results/clientpositive/llap/create_default_prop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_default_prop.q.out
rename to ql/src/test/results/clientpositive/llap/create_default_prop.q.out
diff --git a/ql/src/test/results/clientpositive/create_escape.q.out b/ql/src/test/results/clientpositive/llap/create_escape.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_escape.q.out
rename to ql/src/test/results/clientpositive/llap/create_escape.q.out
diff --git a/ql/src/test/results/clientpositive/create_func1.q.out b/ql/src/test/results/clientpositive/llap/create_func1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_func1.q.out
rename to ql/src/test/results/clientpositive/llap/create_func1.q.out
diff --git a/ql/src/test/results/clientpositive/create_genericudf.q.out b/ql/src/test/results/clientpositive/llap/create_genericudf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_genericudf.q.out
rename to ql/src/test/results/clientpositive/llap/create_genericudf.q.out
diff --git a/ql/src/test/results/clientpositive/create_insert_outputformat.q.out b/ql/src/test/results/clientpositive/llap/create_insert_outputformat.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_insert_outputformat.q.out
rename to ql/src/test/results/clientpositive/llap/create_insert_outputformat.q.out
diff --git a/ql/src/test/results/clientpositive/create_like.q.out b/ql/src/test/results/clientpositive/llap/create_like.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_like.q.out
rename to ql/src/test/results/clientpositive/llap/create_like.q.out
diff --git a/ql/src/test/results/clientpositive/create_like2.q.out b/ql/src/test/results/clientpositive/llap/create_like2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_like2.q.out
rename to ql/src/test/results/clientpositive/llap/create_like2.q.out
diff --git a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out b/ql/src/test/results/clientpositive/llap/create_like_tbl_props.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_like_tbl_props.q.out
rename to ql/src/test/results/clientpositive/llap/create_like_tbl_props.q.out
diff --git a/ql/src/test/results/clientpositive/create_like_view.q.out b/ql/src/test/results/clientpositive/llap/create_like_view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_like_view.q.out
rename to ql/src/test/results/clientpositive/llap/create_like_view.q.out
diff --git a/ql/src/test/results/clientpositive/create_nested_type.q.out b/ql/src/test/results/clientpositive/llap/create_nested_type.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_nested_type.q.out
rename to ql/src/test/results/clientpositive/llap/create_nested_type.q.out
diff --git a/ql/src/test/results/clientpositive/create_or_replace_view.q.out b/ql/src/test/results/clientpositive/llap/create_or_replace_view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_or_replace_view.q.out
rename to ql/src/test/results/clientpositive/llap/create_or_replace_view.q.out
diff --git a/ql/src/test/results/clientpositive/create_skewed_table1.q.out b/ql/src/test/results/clientpositive/llap/create_skewed_table1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_skewed_table1.q.out
rename to ql/src/test/results/clientpositive/llap/create_skewed_table1.q.out
diff --git a/ql/src/test/results/clientpositive/create_struct_table.q.out b/ql/src/test/results/clientpositive/llap/create_struct_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_struct_table.q.out
rename to ql/src/test/results/clientpositive/llap/create_struct_table.q.out
diff --git a/ql/src/test/results/clientpositive/create_table_like_stats.q.out b/ql/src/test/results/clientpositive/llap/create_table_like_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_table_like_stats.q.out
rename to ql/src/test/results/clientpositive/llap/create_table_like_stats.q.out
diff --git a/ql/src/test/results/clientpositive/create_transactional_full_acid.q.out b/ql/src/test/results/clientpositive/llap/create_transactional_full_acid.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_transactional_full_acid.q.out
rename to ql/src/test/results/clientpositive/llap/create_transactional_full_acid.q.out
diff --git a/ql/src/test/results/clientpositive/create_transactional_insert_only.q.out b/ql/src/test/results/clientpositive/llap/create_transactional_insert_only.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_transactional_insert_only.q.out
rename to ql/src/test/results/clientpositive/llap/create_transactional_insert_only.q.out
diff --git a/ql/src/test/results/clientpositive/create_union_table.q.out b/ql/src/test/results/clientpositive/llap/create_union_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_union_table.q.out
rename to ql/src/test/results/clientpositive/llap/create_union_table.q.out
diff --git a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out b/ql/src/test/results/clientpositive/llap/create_view_defaultformats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_view_defaultformats.q.out
rename to ql/src/test/results/clientpositive/llap/create_view_defaultformats.q.out
diff --git a/ql/src/test/results/clientpositive/create_view_partitioned.q.out b/ql/src/test/results/clientpositive/llap/create_view_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_view_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/create_view_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/create_view_translate.q.out b/ql/src/test/results/clientpositive/llap/create_view_translate.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_view_translate.q.out
rename to ql/src/test/results/clientpositive/llap/create_view_translate.q.out
diff --git a/ql/src/test/results/clientpositive/create_with_constraints.q.out b/ql/src/test/results/clientpositive/llap/create_with_constraints.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_with_constraints.q.out
rename to ql/src/test/results/clientpositive/llap/create_with_constraints.q.out
diff --git a/ql/src/test/results/clientpositive/create_with_constraints2.q.out b/ql/src/test/results/clientpositive/llap/create_with_constraints2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/create_with_constraints2.q.out
rename to ql/src/test/results/clientpositive/llap/create_with_constraints2.q.out
diff --git a/ql/src/test/results/clientpositive/crtseltbl_serdeprops.q.out b/ql/src/test/results/clientpositive/llap/crtseltbl_serdeprops.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/crtseltbl_serdeprops.q.out
rename to ql/src/test/results/clientpositive/llap/crtseltbl_serdeprops.q.out
diff --git a/ql/src/test/results/clientpositive/ct_case_insensitive.q.out b/ql/src/test/results/clientpositive/llap/ct_case_insensitive.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ct_case_insensitive.q.out
rename to ql/src/test/results/clientpositive/llap/ct_case_insensitive.q.out
diff --git a/ql/src/test/results/clientpositive/ctas_char.q.out b/ql/src/test/results/clientpositive/llap/ctas_char.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ctas_char.q.out
rename to ql/src/test/results/clientpositive/llap/ctas_char.q.out
diff --git a/ql/src/test/results/clientpositive/ctas_date.q.out b/ql/src/test/results/clientpositive/llap/ctas_date.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ctas_date.q.out
rename to ql/src/test/results/clientpositive/llap/ctas_date.q.out
diff --git a/ql/src/test/results/clientpositive/ctas_uses_table_location.q.out b/ql/src/test/results/clientpositive/llap/ctas_uses_table_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ctas_uses_table_location.q.out
rename to ql/src/test/results/clientpositive/llap/ctas_uses_table_location.q.out
diff --git a/ql/src/test/results/clientpositive/ctas_varchar.q.out b/ql/src/test/results/clientpositive/llap/ctas_varchar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ctas_varchar.q.out
rename to ql/src/test/results/clientpositive/llap/ctas_varchar.q.out
diff --git a/ql/src/test/results/clientpositive/cteViews.q.out b/ql/src/test/results/clientpositive/llap/cteViews.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cteViews.q.out
rename to ql/src/test/results/clientpositive/llap/cteViews.q.out
diff --git a/ql/src/test/results/clientpositive/cte_7.q.out b/ql/src/test/results/clientpositive/llap/cte_7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/cte_7.q.out
rename to ql/src/test/results/clientpositive/llap/cte_7.q.out
diff --git a/ql/src/test/results/clientpositive/current_catalog_and_schema.q.out b/ql/src/test/results/clientpositive/llap/current_catalog_and_schema.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/current_catalog_and_schema.q.out
rename to ql/src/test/results/clientpositive/llap/current_catalog_and_schema.q.out
diff --git a/ql/src/test/results/clientpositive/database_drop.q.out b/ql/src/test/results/clientpositive/llap/database_drop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/database_drop.q.out
rename to ql/src/test/results/clientpositive/llap/database_drop.q.out
diff --git a/ql/src/test/results/clientpositive/date_1.q.out b/ql/src/test/results/clientpositive/llap/date_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_1.q.out
rename to ql/src/test/results/clientpositive/llap/date_1.q.out
diff --git a/ql/src/test/results/clientpositive/date_3.q.out b/ql/src/test/results/clientpositive/llap/date_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_3.q.out
rename to ql/src/test/results/clientpositive/llap/date_3.q.out
diff --git a/ql/src/test/results/clientpositive/date_4.q.out b/ql/src/test/results/clientpositive/llap/date_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_4.q.out
rename to ql/src/test/results/clientpositive/llap/date_4.q.out
diff --git a/ql/src/test/results/clientpositive/date_5.q.out b/ql/src/test/results/clientpositive/llap/date_5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_5.q.out
rename to ql/src/test/results/clientpositive/llap/date_5.q.out
diff --git a/ql/src/test/results/clientpositive/date_comparison.q.out b/ql/src/test/results/clientpositive/llap/date_comparison.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_comparison.q.out
rename to ql/src/test/results/clientpositive/llap/date_comparison.q.out
diff --git a/ql/src/test/results/clientpositive/date_int_operation_test.q.out b/ql/src/test/results/clientpositive/llap/date_int_operation_test.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_int_operation_test.q.out
rename to ql/src/test/results/clientpositive/llap/date_int_operation_test.q.out
diff --git a/ql/src/test/results/clientpositive/date_join1.q.out b/ql/src/test/results/clientpositive/llap/date_join1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_join1.q.out
rename to ql/src/test/results/clientpositive/llap/date_join1.q.out
diff --git a/ql/src/test/results/clientpositive/date_timestamp_prec.q.out b/ql/src/test/results/clientpositive/llap/date_timestamp_prec.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_timestamp_prec.q.out
rename to ql/src/test/results/clientpositive/llap/date_timestamp_prec.q.out
diff --git a/ql/src/test/results/clientpositive/date_udf.q.out b/ql/src/test/results/clientpositive/llap/date_udf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/date_udf.q.out
rename to ql/src/test/results/clientpositive/llap/date_udf.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_abort.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_abort.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_abort.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_abort.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_compact1.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_compact1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_compact1.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_compact1.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_compact2.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_compact2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_compact2.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_compact2.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_compact3.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_compact3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_compact3.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_compact3.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_ddl1.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_ddl1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_ddl1.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_ddl1.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_query1.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_query1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_query1.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_query1.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_query2.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_query2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_query2.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_query2.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_query3.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_query3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_query3.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_query3.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_query4.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_query4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_query4.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_query4.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_query5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_query5.q.out
diff --git a/ql/src/test/results/clientpositive/dbtxnmgr_showlocks.q.out b/ql/src/test/results/clientpositive/llap/dbtxnmgr_showlocks.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dbtxnmgr_showlocks.q.out
rename to ql/src/test/results/clientpositive/llap/dbtxnmgr_showlocks.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_1.q.out b/ql/src/test/results/clientpositive/llap/decimal_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_1.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_1.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_10_0.q.out b/ql/src/test/results/clientpositive/llap/decimal_10_0.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_10_0.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_10_0.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_1_1.q.out b/ql/src/test/results/clientpositive/llap/decimal_1_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_1_1.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_1_1.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_2.q.out b/ql/src/test/results/clientpositive/llap/decimal_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_2.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_2.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_3.q.out b/ql/src/test/results/clientpositive/llap/decimal_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_3.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_3.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_4.q.out b/ql/src/test/results/clientpositive/llap/decimal_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_4.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_4.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_5.q.out b/ql/src/test/results/clientpositive/llap/decimal_5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_5.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_5.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_6.q.out b/ql/src/test/results/clientpositive/llap/decimal_6.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_6.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_6.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_join.q.out b/ql/src/test/results/clientpositive/llap/decimal_join.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_join.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_join.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_serde.q.out b/ql/src/test/results/clientpositive/llap/decimal_serde.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_serde.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_serde.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_skewjoin.q.out b/ql/src/test/results/clientpositive/llap/decimal_skewjoin.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_skewjoin.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_skewjoin.q.out
diff --git a/ql/src/test/results/clientpositive/decimal_trailing.q.out b/ql/src/test/results/clientpositive/llap/decimal_trailing.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/decimal_trailing.q.out
rename to ql/src/test/results/clientpositive/llap/decimal_trailing.q.out
diff --git a/ql/src/test/results/clientpositive/default_file_format.q.out b/ql/src/test/results/clientpositive/llap/default_file_format.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/default_file_format.q.out
rename to ql/src/test/results/clientpositive/llap/default_file_format.q.out
diff --git a/ql/src/test/results/clientpositive/default_partition_name.q.out b/ql/src/test/results/clientpositive/llap/default_partition_name.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/default_partition_name.q.out
rename to ql/src/test/results/clientpositive/llap/default_partition_name.q.out
diff --git a/ql/src/test/results/clientpositive/delimiter.q.out b/ql/src/test/results/clientpositive/llap/delimiter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/delimiter.q.out
rename to ql/src/test/results/clientpositive/llap/delimiter.q.out
diff --git a/ql/src/test/results/clientpositive/desc_function.q.out b/ql/src/test/results/clientpositive/llap/desc_function.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/desc_function.q.out
rename to ql/src/test/results/clientpositive/llap/desc_function.q.out
diff --git a/ql/src/test/results/clientpositive/desc_non_existent_tbl.q.out b/ql/src/test/results/clientpositive/llap/desc_non_existent_tbl.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/desc_non_existent_tbl.q.out
rename to ql/src/test/results/clientpositive/llap/desc_non_existent_tbl.q.out
diff --git a/ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out b/ql/src/test/results/clientpositive/llap/desc_tbl_part_cols.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/desc_tbl_part_cols.q.out
rename to ql/src/test/results/clientpositive/llap/desc_tbl_part_cols.q.out
diff --git a/ql/src/test/results/clientpositive/describe_comment_indent.q.out b/ql/src/test/results/clientpositive/llap/describe_comment_indent.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_comment_indent.q.out
rename to ql/src/test/results/clientpositive/llap/describe_comment_indent.q.out
diff --git a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out b/ql/src/test/results/clientpositive/llap/describe_comment_nonascii.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
rename to ql/src/test/results/clientpositive/llap/describe_comment_nonascii.q.out
diff --git a/ql/src/test/results/clientpositive/describe_database_json.q.out b/ql/src/test/results/clientpositive/llap/describe_database_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_database_json.q.out
rename to ql/src/test/results/clientpositive/llap/describe_database_json.q.out
diff --git a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out b/ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out b/ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_formatted_view_partitioned_json.q.out
rename to ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned_json.q.out
diff --git a/ql/src/test/results/clientpositive/describe_syntax.q.out b/ql/src/test/results/clientpositive/llap/describe_syntax.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_syntax.q.out
rename to ql/src/test/results/clientpositive/llap/describe_syntax.q.out
diff --git a/ql/src/test/results/clientpositive/describe_table.q.out b/ql/src/test/results/clientpositive/llap/describe_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_table.q.out
rename to ql/src/test/results/clientpositive/llap/describe_table.q.out
diff --git a/ql/src/test/results/clientpositive/describe_table_json.q.out b/ql/src/test/results/clientpositive/llap/describe_table_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_table_json.q.out
rename to ql/src/test/results/clientpositive/llap/describe_table_json.q.out
diff --git a/ql/src/test/results/clientpositive/describe_xpath.q.out b/ql/src/test/results/clientpositive/llap/describe_xpath.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/describe_xpath.q.out
rename to ql/src/test/results/clientpositive/llap/describe_xpath.q.out
diff --git a/ql/src/test/results/clientpositive/dfscmd.q.out b/ql/src/test/results/clientpositive/llap/dfscmd.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/dfscmd.q.out
rename to ql/src/test/results/clientpositive/llap/dfscmd.q.out
diff --git a/ql/src/test/results/clientpositive/diff_part_input_formats.q.out b/ql/src/test/results/clientpositive/llap/diff_part_input_formats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/diff_part_input_formats.q.out
rename to ql/src/test/results/clientpositive/llap/diff_part_input_formats.q.out
diff --git a/ql/src/test/results/clientpositive/disable_file_format_check.q.out b/ql/src/test/results/clientpositive/llap/disable_file_format_check.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/disable_file_format_check.q.out
rename to ql/src/test/results/clientpositive/llap/disable_file_format_check.q.out
diff --git a/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out b/ql/src/test/results/clientpositive/llap/disallow_incompatible_type_change_off.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out
rename to ql/src/test/results/clientpositive/llap/disallow_incompatible_type_change_off.q.out
diff --git a/ql/src/test/results/clientpositive/driver_conf_isolation.q.out b/ql/src/test/results/clientpositive/llap/driver_conf_isolation.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/driver_conf_isolation.q.out
rename to ql/src/test/results/clientpositive/llap/driver_conf_isolation.q.out
diff --git a/ql/src/test/results/clientpositive/driverhook.q.out b/ql/src/test/results/clientpositive/llap/driverhook.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/driverhook.q.out
rename to ql/src/test/results/clientpositive/llap/driverhook.q.out
diff --git a/ql/src/test/results/clientpositive/drop_database_removes_partition_dirs.q.out b/ql/src/test/results/clientpositive/llap/drop_database_removes_partition_dirs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_database_removes_partition_dirs.q.out
rename to ql/src/test/results/clientpositive/llap/drop_database_removes_partition_dirs.q.out
diff --git a/ql/src/test/results/clientpositive/drop_deleted_partitions.q.out b/ql/src/test/results/clientpositive/llap/drop_deleted_partitions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_deleted_partitions.q.out
rename to ql/src/test/results/clientpositive/llap/drop_deleted_partitions.q.out
diff --git a/ql/src/test/results/clientpositive/drop_function.q.out b/ql/src/test/results/clientpositive/llap/drop_function.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_function.q.out
rename to ql/src/test/results/clientpositive/llap/drop_function.q.out
diff --git a/ql/src/test/results/clientpositive/drop_multi_partitions.q.out b/ql/src/test/results/clientpositive/llap/drop_multi_partitions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_multi_partitions.q.out
rename to ql/src/test/results/clientpositive/llap/drop_multi_partitions.q.out
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter.q.out b/ql/src/test/results/clientpositive/llap/drop_partitions_filter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_partitions_filter.q.out
rename to ql/src/test/results/clientpositive/llap/drop_partitions_filter.q.out
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out b/ql/src/test/results/clientpositive/llap/drop_partitions_filter2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
rename to ql/src/test/results/clientpositive/llap/drop_partitions_filter2.q.out
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out b/ql/src/test/results/clientpositive/llap/drop_partitions_filter3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
rename to ql/src/test/results/clientpositive/llap/drop_partitions_filter3.q.out
diff --git a/ql/src/test/results/clientpositive/drop_partitions_filter4.q.out b/ql/src/test/results/clientpositive/llap/drop_partitions_filter4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_partitions_filter4.q.out
rename to ql/src/test/results/clientpositive/llap/drop_partitions_filter4.q.out
diff --git a/ql/src/test/results/clientpositive/drop_table.q.out b/ql/src/test/results/clientpositive/llap/drop_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_table.q.out
rename to ql/src/test/results/clientpositive/llap/drop_table.q.out
diff --git a/ql/src/test/results/clientpositive/drop_table2.q.out b/ql/src/test/results/clientpositive/llap/drop_table2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_table2.q.out
rename to ql/src/test/results/clientpositive/llap/drop_table2.q.out
diff --git a/ql/src/test/results/clientpositive/drop_table_purge.q.out b/ql/src/test/results/clientpositive/llap/drop_table_purge.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_table_purge.q.out
rename to ql/src/test/results/clientpositive/llap/drop_table_purge.q.out
diff --git a/ql/src/test/results/clientpositive/drop_table_removes_partition_dirs.q.out b/ql/src/test/results/clientpositive/llap/drop_table_removes_partition_dirs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_table_removes_partition_dirs.q.out
rename to ql/src/test/results/clientpositive/llap/drop_table_removes_partition_dirs.q.out
diff --git a/ql/src/test/results/clientpositive/drop_table_with_stats.q.out b/ql/src/test/results/clientpositive/llap/drop_table_with_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_table_with_stats.q.out
rename to ql/src/test/results/clientpositive/llap/drop_table_with_stats.q.out
diff --git a/ql/src/test/results/clientpositive/drop_udf.q.out b/ql/src/test/results/clientpositive/llap/drop_udf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_udf.q.out
rename to ql/src/test/results/clientpositive/llap/drop_udf.q.out
diff --git a/ql/src/test/results/clientpositive/drop_view.q.out b/ql/src/test/results/clientpositive/llap/drop_view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/drop_view.q.out
rename to ql/src/test/results/clientpositive/llap/drop_view.q.out
diff --git a/ql/src/test/results/clientpositive/encoding_nonutf8.q.out b/ql/src/test/results/clientpositive/llap/encoding_nonutf8.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/encoding_nonutf8.q.out
rename to ql/src/test/results/clientpositive/llap/encoding_nonutf8.q.out
diff --git a/ql/src/test/results/clientpositive/equal_ns.q.out b/ql/src/test/results/clientpositive/llap/equal_ns.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/equal_ns.q.out
rename to ql/src/test/results/clientpositive/llap/equal_ns.q.out
diff --git a/ql/src/test/results/clientpositive/escape3.q.out b/ql/src/test/results/clientpositive/llap/escape3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/escape3.q.out
rename to ql/src/test/results/clientpositive/llap/escape3.q.out
diff --git a/ql/src/test/results/clientpositive/escape_crlf.q.out b/ql/src/test/results/clientpositive/llap/escape_crlf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/escape_crlf.q.out
rename to ql/src/test/results/clientpositive/llap/escape_crlf.q.out
diff --git a/ql/src/test/results/clientpositive/exchange_partition.q.out b/ql/src/test/results/clientpositive/llap/exchange_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exchange_partition.q.out
rename to ql/src/test/results/clientpositive/llap/exchange_partition.q.out
diff --git a/ql/src/test/results/clientpositive/exchange_partition2.q.out b/ql/src/test/results/clientpositive/llap/exchange_partition2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exchange_partition2.q.out
rename to ql/src/test/results/clientpositive/llap/exchange_partition2.q.out
diff --git a/ql/src/test/results/clientpositive/exchange_partition3.q.out b/ql/src/test/results/clientpositive/llap/exchange_partition3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exchange_partition3.q.out
rename to ql/src/test/results/clientpositive/llap/exchange_partition3.q.out
diff --git a/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out b/ql/src/test/results/clientpositive/llap/exim_00_nonpart_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out
rename to ql/src/test/results/clientpositive/llap/exim_00_nonpart_empty.q.out
diff --git a/ql/src/test/results/clientpositive/exim_01_nonpart.q.out b/ql/src/test/results/clientpositive/llap/exim_01_nonpart.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_01_nonpart.q.out
rename to ql/src/test/results/clientpositive/llap/exim_01_nonpart.q.out
diff --git a/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out b/ql/src/test/results/clientpositive/llap/exim_02_00_part_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
rename to ql/src/test/results/clientpositive/llap/exim_02_00_part_empty.q.out
diff --git a/ql/src/test/results/clientpositive/exim_02_part.q.out b/ql/src/test/results/clientpositive/llap/exim_02_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_02_part.q.out
rename to ql/src/test/results/clientpositive/llap/exim_02_part.q.out
diff --git a/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out b/ql/src/test/results/clientpositive/llap/exim_03_nonpart_over_compat.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
rename to ql/src/test/results/clientpositive/llap/exim_03_nonpart_over_compat.q.out
diff --git a/ql/src/test/results/clientpositive/exim_04_all_part.q.out b/ql/src/test/results/clientpositive/llap/exim_04_all_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_04_all_part.q.out
rename to ql/src/test/results/clientpositive/llap/exim_04_all_part.q.out
diff --git a/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out b/ql/src/test/results/clientpositive/llap/exim_04_evolved_parts.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
rename to ql/src/test/results/clientpositive/llap/exim_04_evolved_parts.q.out
diff --git a/ql/src/test/results/clientpositive/exim_05_some_part.q.out b/ql/src/test/results/clientpositive/llap/exim_05_some_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_05_some_part.q.out
rename to ql/src/test/results/clientpositive/llap/exim_05_some_part.q.out
diff --git a/ql/src/test/results/clientpositive/exim_06_one_part.q.out b/ql/src/test/results/clientpositive/llap/exim_06_one_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_06_one_part.q.out
rename to ql/src/test/results/clientpositive/llap/exim_06_one_part.q.out
diff --git a/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out b/ql/src/test/results/clientpositive/llap/exim_07_all_part_over_nonoverlap.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
rename to ql/src/test/results/clientpositive/llap/exim_07_all_part_over_nonoverlap.q.out
diff --git a/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out b/ql/src/test/results/clientpositive/llap/exim_08_nonpart_rename.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
rename to ql/src/test/results/clientpositive/llap/exim_08_nonpart_rename.q.out
diff --git a/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out b/ql/src/test/results/clientpositive/llap/exim_09_part_spec_nonoverlap.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
rename to ql/src/test/results/clientpositive/llap/exim_09_part_spec_nonoverlap.q.out
diff --git a/ql/src/test/results/clientpositive/exim_10_external_managed.q.out b/ql/src/test/results/clientpositive/llap/exim_10_external_managed.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_10_external_managed.q.out
rename to ql/src/test/results/clientpositive/llap/exim_10_external_managed.q.out
diff --git a/ql/src/test/results/clientpositive/exim_11_managed_external.q.out b/ql/src/test/results/clientpositive/llap/exim_11_managed_external.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_11_managed_external.q.out
rename to ql/src/test/results/clientpositive/llap/exim_11_managed_external.q.out
diff --git a/ql/src/test/results/clientpositive/exim_12_external_location.q.out b/ql/src/test/results/clientpositive/llap/exim_12_external_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_12_external_location.q.out
rename to ql/src/test/results/clientpositive/llap/exim_12_external_location.q.out
diff --git a/ql/src/test/results/clientpositive/exim_13_managed_location.q.out b/ql/src/test/results/clientpositive/llap/exim_13_managed_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_13_managed_location.q.out
rename to ql/src/test/results/clientpositive/llap/exim_13_managed_location.q.out
diff --git a/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out b/ql/src/test/results/clientpositive/llap/exim_14_managed_location_over_existing.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
rename to ql/src/test/results/clientpositive/llap/exim_14_managed_location_over_existing.q.out
diff --git a/ql/src/test/results/clientpositive/exim_15_external_part.q.out b/ql/src/test/results/clientpositive/llap/exim_15_external_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_15_external_part.q.out
rename to ql/src/test/results/clientpositive/llap/exim_15_external_part.q.out
diff --git a/ql/src/test/results/clientpositive/exim_16_part_external.q.out b/ql/src/test/results/clientpositive/llap/exim_16_part_external.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_16_part_external.q.out
rename to ql/src/test/results/clientpositive/llap/exim_16_part_external.q.out
diff --git a/ql/src/test/results/clientpositive/exim_17_part_managed.q.out b/ql/src/test/results/clientpositive/llap/exim_17_part_managed.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_17_part_managed.q.out
rename to ql/src/test/results/clientpositive/llap/exim_17_part_managed.q.out
diff --git a/ql/src/test/results/clientpositive/exim_18_part_external.q.out b/ql/src/test/results/clientpositive/llap/exim_18_part_external.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_18_part_external.q.out
rename to ql/src/test/results/clientpositive/llap/exim_18_part_external.q.out
diff --git a/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out b/ql/src/test/results/clientpositive/llap/exim_19_00_part_external_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
rename to ql/src/test/results/clientpositive/llap/exim_19_00_part_external_location.q.out
diff --git a/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out b/ql/src/test/results/clientpositive/llap/exim_19_part_external_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
rename to ql/src/test/results/clientpositive/llap/exim_19_part_external_location.q.out
diff --git a/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out b/ql/src/test/results/clientpositive/llap/exim_20_part_managed_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
rename to ql/src/test/results/clientpositive/llap/exim_20_part_managed_location.q.out
diff --git a/ql/src/test/results/clientpositive/exim_21_export_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/exim_21_export_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_21_export_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/exim_21_export_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/exim_22_import_exist_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/exim_22_import_exist_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/exim_23_import_part_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/exim_23_import_part_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/exim_24_import_nonexist_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/exim_24_import_nonexist_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/exim_25_export_parentpath_has_inaccessible_children.q.out b/ql/src/test/results/clientpositive/llap/exim_25_export_parentpath_has_inaccessible_children.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_25_export_parentpath_has_inaccessible_children.q.out
rename to ql/src/test/results/clientpositive/llap/exim_25_export_parentpath_has_inaccessible_children.q.out
diff --git a/ql/src/test/results/clientpositive/exim_hidden_files.q.out b/ql/src/test/results/clientpositive/llap/exim_hidden_files.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/exim_hidden_files.q.out
rename to ql/src/test/results/clientpositive/llap/exim_hidden_files.q.out
diff --git a/ql/src/test/results/clientpositive/explain_ast.q.out b/ql/src/test/results/clientpositive/llap/explain_ast.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/explain_ast.q.out
rename to ql/src/test/results/clientpositive/llap/explain_ast.q.out
diff --git a/ql/src/test/results/clientpositive/explain_dependency.q.out b/ql/src/test/results/clientpositive/llap/explain_dependency.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/explain_dependency.q.out
rename to ql/src/test/results/clientpositive/llap/explain_dependency.q.out
diff --git a/ql/src/test/results/clientpositive/explain_dependency2.q.out b/ql/src/test/results/clientpositive/llap/explain_dependency2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/explain_dependency2.q.out
rename to ql/src/test/results/clientpositive/llap/explain_dependency2.q.out
diff --git a/ql/src/test/results/clientpositive/explain_locks.q.out b/ql/src/test/results/clientpositive/llap/explain_locks.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/explain_locks.q.out
rename to ql/src/test/results/clientpositive/llap/explain_locks.q.out
diff --git a/ql/src/test/results/clientpositive/explode_null.q.out b/ql/src/test/results/clientpositive/llap/explode_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/explode_null.q.out
rename to ql/src/test/results/clientpositive/llap/explode_null.q.out
diff --git a/ql/src/test/results/clientpositive/expr_cached.q.out b/ql/src/test/results/clientpositive/llap/expr_cached.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/expr_cached.q.out
rename to ql/src/test/results/clientpositive/llap/expr_cached.q.out
diff --git a/ql/src/test/results/clientpositive/external_insert.q.out b/ql/src/test/results/clientpositive/llap/external_insert.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/external_insert.q.out
rename to ql/src/test/results/clientpositive/llap/external_insert.q.out
diff --git a/ql/src/test/results/clientpositive/fileformat_mix.q.out b/ql/src/test/results/clientpositive/llap/fileformat_mix.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/fileformat_mix.q.out
rename to ql/src/test/results/clientpositive/llap/fileformat_mix.q.out
diff --git a/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out b/ql/src/test/results/clientpositive/llap/fileformat_sequencefile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
rename to ql/src/test/results/clientpositive/llap/fileformat_sequencefile.q.out
diff --git a/ql/src/test/results/clientpositive/fileformat_text.q.out b/ql/src/test/results/clientpositive/llap/fileformat_text.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/fileformat_text.q.out
rename to ql/src/test/results/clientpositive/llap/fileformat_text.q.out
diff --git a/ql/src/test/results/clientpositive/float_equality.q.out b/ql/src/test/results/clientpositive/llap/float_equality.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/float_equality.q.out
rename to ql/src/test/results/clientpositive/llap/float_equality.q.out
diff --git a/ql/src/test/results/clientpositive/groupby7.q.out b/ql/src/test/results/clientpositive/llap/groupby7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby7.q.out
rename to ql/src/test/results/clientpositive/llap/groupby7.q.out
diff --git a/ql/src/test/results/clientpositive/groupby_constcolval.q.out b/ql/src/test/results/clientpositive/llap/groupby_constcolval.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby_constcolval.q.out
rename to ql/src/test/results/clientpositive/llap/groupby_constcolval.q.out
diff --git a/ql/src/test/results/clientpositive/groupby_empty.q.out b/ql/src/test/results/clientpositive/llap/groupby_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby_empty.q.out
rename to ql/src/test/results/clientpositive/llap/groupby_empty.q.out
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_id1.q.out b/ql/src/test/results/clientpositive/llap/groupby_grouping_id1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby_grouping_id1.q.out
rename to ql/src/test/results/clientpositive/llap/groupby_grouping_id1.q.out
diff --git a/ql/src/test/results/clientpositive/groupby_mutli_insert_common_distinct.q.out b/ql/src/test/results/clientpositive/llap/groupby_mutli_insert_common_distinct.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby_mutli_insert_common_distinct.q.out
rename to ql/src/test/results/clientpositive/llap/groupby_mutli_insert_common_distinct.q.out
diff --git a/ql/src/test/results/clientpositive/groupby_neg_float.q.out b/ql/src/test/results/clientpositive/llap/groupby_neg_float.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby_neg_float.q.out
rename to ql/src/test/results/clientpositive/llap/groupby_neg_float.q.out
diff --git a/ql/src/test/results/clientpositive/groupby_nullvalues.q.out b/ql/src/test/results/clientpositive/llap/groupby_nullvalues.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/groupby_nullvalues.q.out
rename to ql/src/test/results/clientpositive/llap/groupby_nullvalues.q.out
diff --git a/ql/src/test/results/clientpositive/hook_order.q.out b/ql/src/test/results/clientpositive/llap/hook_order.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/hook_order.q.out
rename to ql/src/test/results/clientpositive/llap/hook_order.q.out
diff --git a/ql/src/test/results/clientpositive/hypothetical_set_aggregates.q.out b/ql/src/test/results/clientpositive/llap/hypothetical_set_aggregates.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/hypothetical_set_aggregates.q.out
rename to ql/src/test/results/clientpositive/llap/hypothetical_set_aggregates.q.out
diff --git a/ql/src/test/results/clientpositive/init_file.q.out b/ql/src/test/results/clientpositive/llap/init_file.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/init_file.q.out
rename to ql/src/test/results/clientpositive/llap/init_file.q.out
diff --git a/ql/src/test/results/clientpositive/inoutdriver.q.out b/ql/src/test/results/clientpositive/llap/inoutdriver.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inoutdriver.q.out
rename to ql/src/test/results/clientpositive/llap/inoutdriver.q.out
diff --git a/ql/src/test/results/clientpositive/input1.q.out b/ql/src/test/results/clientpositive/llap/input1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input1.q.out
rename to ql/src/test/results/clientpositive/llap/input1.q.out
diff --git a/ql/src/test/results/clientpositive/input10.q.out b/ql/src/test/results/clientpositive/llap/input10.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input10.q.out
rename to ql/src/test/results/clientpositive/llap/input10.q.out
diff --git a/ql/src/test/results/clientpositive/input15.q.out b/ql/src/test/results/clientpositive/llap/input15.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input15.q.out
rename to ql/src/test/results/clientpositive/llap/input15.q.out
diff --git a/ql/src/test/results/clientpositive/input16.q.out b/ql/src/test/results/clientpositive/llap/input16.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input16.q.out
rename to ql/src/test/results/clientpositive/llap/input16.q.out
diff --git a/ql/src/test/results/clientpositive/input19.q.out b/ql/src/test/results/clientpositive/llap/input19.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input19.q.out
rename to ql/src/test/results/clientpositive/llap/input19.q.out
diff --git a/ql/src/test/results/clientpositive/input2.q.out b/ql/src/test/results/clientpositive/llap/input2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input2.q.out
rename to ql/src/test/results/clientpositive/llap/input2.q.out
diff --git a/ql/src/test/results/clientpositive/input24.q.out b/ql/src/test/results/clientpositive/llap/input24.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input24.q.out
rename to ql/src/test/results/clientpositive/llap/input24.q.out
diff --git a/ql/src/test/results/clientpositive/input28.q.out b/ql/src/test/results/clientpositive/llap/input28.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input28.q.out
rename to ql/src/test/results/clientpositive/llap/input28.q.out
diff --git a/ql/src/test/results/clientpositive/input3.q.out b/ql/src/test/results/clientpositive/llap/input3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input3.q.out
rename to ql/src/test/results/clientpositive/llap/input3.q.out
diff --git a/ql/src/test/results/clientpositive/input40.q.out b/ql/src/test/results/clientpositive/llap/input40.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input40.q.out
rename to ql/src/test/results/clientpositive/llap/input40.q.out
diff --git a/ql/src/test/results/clientpositive/input41.q.out b/ql/src/test/results/clientpositive/llap/input41.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input41.q.out
rename to ql/src/test/results/clientpositive/llap/input41.q.out
diff --git a/ql/src/test/results/clientpositive/input43.q.out b/ql/src/test/results/clientpositive/llap/input43.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input43.q.out
rename to ql/src/test/results/clientpositive/llap/input43.q.out
diff --git a/ql/src/test/results/clientpositive/input45.q.out b/ql/src/test/results/clientpositive/llap/input45.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input45.q.out
rename to ql/src/test/results/clientpositive/llap/input45.q.out
diff --git a/ql/src/test/results/clientpositive/input46.q.out b/ql/src/test/results/clientpositive/llap/input46.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input46.q.out
rename to ql/src/test/results/clientpositive/llap/input46.q.out
diff --git a/ql/src/test/results/clientpositive/input49.q.out b/ql/src/test/results/clientpositive/llap/input49.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input49.q.out
rename to ql/src/test/results/clientpositive/llap/input49.q.out
diff --git a/ql/src/test/results/clientpositive/input4_cb_delim.q.out b/ql/src/test/results/clientpositive/llap/input4_cb_delim.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input4_cb_delim.q.out
rename to ql/src/test/results/clientpositive/llap/input4_cb_delim.q.out
diff --git a/ql/src/test/results/clientpositive/input_dfs.q.out b/ql/src/test/results/clientpositive/llap/input_dfs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/input_dfs.q.out
rename to ql/src/test/results/clientpositive/llap/input_dfs.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl1.q.out b/ql/src/test/results/clientpositive/llap/inputddl1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl1.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl1.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl2.q.out b/ql/src/test/results/clientpositive/llap/inputddl2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl2.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl2.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl3.q.out b/ql/src/test/results/clientpositive/llap/inputddl3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl3.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl3.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl4.q.out b/ql/src/test/results/clientpositive/llap/inputddl4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl4.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl4.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl5.q.out b/ql/src/test/results/clientpositive/llap/inputddl5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl5.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl5.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl6.q.out b/ql/src/test/results/clientpositive/llap/inputddl6.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl6.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl6.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl7.q.out b/ql/src/test/results/clientpositive/llap/inputddl7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl7.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl7.q.out
diff --git a/ql/src/test/results/clientpositive/inputddl8.q.out b/ql/src/test/results/clientpositive/llap/inputddl8.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/inputddl8.q.out
rename to ql/src/test/results/clientpositive/llap/inputddl8.q.out
diff --git a/ql/src/test/results/clientpositive/insert2.q.out b/ql/src/test/results/clientpositive/llap/insert2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert2.q.out
rename to ql/src/test/results/clientpositive/llap/insert2.q.out
diff --git a/ql/src/test/results/clientpositive/insert_acid_dynamic_partition.q.out b/ql/src/test/results/clientpositive/llap/insert_acid_dynamic_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_acid_dynamic_partition.q.out
rename to ql/src/test/results/clientpositive/llap/insert_acid_dynamic_partition.q.out
diff --git a/ql/src/test/results/clientpositive/insert_acid_not_bucketed.q.out b/ql/src/test/results/clientpositive/llap/insert_acid_not_bucketed.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_acid_not_bucketed.q.out
rename to ql/src/test/results/clientpositive/llap/insert_acid_not_bucketed.q.out
diff --git a/ql/src/test/results/clientpositive/insert_compressed.q.out b/ql/src/test/results/clientpositive/llap/insert_compressed.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_compressed.q.out
rename to ql/src/test/results/clientpositive/llap/insert_compressed.q.out
diff --git a/ql/src/test/results/clientpositive/insert_into_with_schema2.q.out b/ql/src/test/results/clientpositive/llap/insert_into_with_schema2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_into_with_schema2.q.out
rename to ql/src/test/results/clientpositive/llap/insert_into_with_schema2.q.out
diff --git a/ql/src/test/results/clientpositive/insert_non_utf8_encoding_table.q.out b/ql/src/test/results/clientpositive/llap/insert_non_utf8_encoding_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_non_utf8_encoding_table.q.out
rename to ql/src/test/results/clientpositive/llap/insert_non_utf8_encoding_table.q.out
diff --git a/ql/src/test/results/clientpositive/insert_overwrite_directory.q.out b/ql/src/test/results/clientpositive/llap/insert_overwrite_directory.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_overwrite_directory.q.out
rename to ql/src/test/results/clientpositive/llap/insert_overwrite_directory.q.out
diff --git a/ql/src/test/results/clientpositive/insert_overwrite_directory2.q.out b/ql/src/test/results/clientpositive/llap/insert_overwrite_directory2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_overwrite_directory2.q.out
rename to ql/src/test/results/clientpositive/llap/insert_overwrite_directory2.q.out
diff --git a/ql/src/test/results/clientpositive/insert_values_acid_not_bucketed.q.out b/ql/src/test/results/clientpositive/llap/insert_values_acid_not_bucketed.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_values_acid_not_bucketed.q.out
rename to ql/src/test/results/clientpositive/llap/insert_values_acid_not_bucketed.q.out
diff --git a/ql/src/test/results/clientpositive/insert_values_nonascii.q.out b/ql/src/test/results/clientpositive/llap/insert_values_nonascii.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_values_nonascii.q.out
rename to ql/src/test/results/clientpositive/llap/insert_values_nonascii.q.out
diff --git a/ql/src/test/results/clientpositive/insert_with_move_files_from_source_dir.q.out b/ql/src/test/results/clientpositive/llap/insert_with_move_files_from_source_dir.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insert_with_move_files_from_source_dir.q.out
rename to ql/src/test/results/clientpositive/llap/insert_with_move_files_from_source_dir.q.out
diff --git a/ql/src/test/results/clientpositive/insertexternal1.q.out b/ql/src/test/results/clientpositive/llap/insertexternal1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insertexternal1.q.out
rename to ql/src/test/results/clientpositive/llap/insertexternal1.q.out
diff --git a/ql/src/test/results/clientpositive/insertvalues_espchars.q.out b/ql/src/test/results/clientpositive/llap/insertvalues_espchars.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/insertvalues_espchars.q.out
rename to ql/src/test/results/clientpositive/llap/insertvalues_espchars.q.out
diff --git a/ql/src/test/results/clientpositive/interval_1.q.out b/ql/src/test/results/clientpositive/llap/interval_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/interval_1.q.out
rename to ql/src/test/results/clientpositive/llap/interval_1.q.out
diff --git a/ql/src/test/results/clientpositive/interval_2.q.out b/ql/src/test/results/clientpositive/llap/interval_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/interval_2.q.out
rename to ql/src/test/results/clientpositive/llap/interval_2.q.out
diff --git a/ql/src/test/results/clientpositive/interval_comparison.q.out b/ql/src/test/results/clientpositive/llap/interval_comparison.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/interval_comparison.q.out
rename to ql/src/test/results/clientpositive/llap/interval_comparison.q.out
diff --git a/ql/src/test/results/clientpositive/interval_udf.q.out b/ql/src/test/results/clientpositive/llap/interval_udf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/interval_udf.q.out
rename to ql/src/test/results/clientpositive/llap/interval_udf.q.out
diff --git a/ql/src/test/results/clientpositive/join24.q.out b/ql/src/test/results/clientpositive/llap/join24.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/join24.q.out
rename to ql/src/test/results/clientpositive/llap/join24.q.out
diff --git a/ql/src/test/results/clientpositive/join_array.q.out b/ql/src/test/results/clientpositive/llap/join_array.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/join_array.q.out
rename to ql/src/test/results/clientpositive/llap/join_array.q.out
diff --git a/ql/src/test/results/clientpositive/join_casesensitive.q.out b/ql/src/test/results/clientpositive/llap/join_casesensitive.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/join_casesensitive.q.out
rename to ql/src/test/results/clientpositive/llap/join_casesensitive.q.out
diff --git a/ql/src/test/results/clientpositive/join_empty.q.out b/ql/src/test/results/clientpositive/llap/join_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/join_empty.q.out
rename to ql/src/test/results/clientpositive/llap/join_empty.q.out
diff --git a/ql/src/test/results/clientpositive/join_literals.q.out b/ql/src/test/results/clientpositive/llap/join_literals.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/join_literals.q.out
rename to ql/src/test/results/clientpositive/llap/join_literals.q.out
diff --git a/ql/src/test/results/clientpositive/json_serde1.q.out b/ql/src/test/results/clientpositive/llap/json_serde1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/json_serde1.q.out
rename to ql/src/test/results/clientpositive/llap/json_serde1.q.out
diff --git a/ql/src/test/results/clientpositive/json_serde2.q.out b/ql/src/test/results/clientpositive/llap/json_serde2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/json_serde2.q.out
rename to ql/src/test/results/clientpositive/llap/json_serde2.q.out
diff --git a/ql/src/test/results/clientpositive/json_serde_qualified_types.q.out b/ql/src/test/results/clientpositive/llap/json_serde_qualified_types.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/json_serde_qualified_types.q.out
rename to ql/src/test/results/clientpositive/llap/json_serde_qualified_types.q.out
diff --git a/ql/src/test/results/clientpositive/json_serde_tsformat.q.out b/ql/src/test/results/clientpositive/llap/json_serde_tsformat.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/json_serde_tsformat.q.out
rename to ql/src/test/results/clientpositive/llap/json_serde_tsformat.q.out
diff --git a/ql/src/test/results/clientpositive/keyword_2.q.out b/ql/src/test/results/clientpositive/llap/keyword_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/keyword_2.q.out
rename to ql/src/test/results/clientpositive/llap/keyword_2.q.out
diff --git a/ql/src/test/results/clientpositive/keyword_3.q.out b/ql/src/test/results/clientpositive/llap/keyword_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/keyword_3.q.out
rename to ql/src/test/results/clientpositive/llap/keyword_3.q.out
diff --git a/ql/src/test/results/clientpositive/lateral_view_multi_lateralviews.q.out b/ql/src/test/results/clientpositive/llap/lateral_view_multi_lateralviews.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/lateral_view_multi_lateralviews.q.out
rename to ql/src/test/results/clientpositive/llap/lateral_view_multi_lateralviews.q.out
diff --git a/ql/src/test/results/clientpositive/lb_fs_stats.q.out b/ql/src/test/results/clientpositive/llap/lb_fs_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/lb_fs_stats.q.out
rename to ql/src/test/results/clientpositive/llap/lb_fs_stats.q.out
diff --git a/ql/src/test/results/clientpositive/leadlag.q.out b/ql/src/test/results/clientpositive/llap/leadlag.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/leadlag.q.out
rename to ql/src/test/results/clientpositive/llap/leadlag.q.out
diff --git a/ql/src/test/results/clientpositive/limit0.q.out b/ql/src/test/results/clientpositive/llap/limit0.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/limit0.q.out
rename to ql/src/test/results/clientpositive/llap/limit0.q.out
diff --git a/ql/src/test/results/clientpositive/load_dyn_part15.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part15.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_dyn_part15.q.out
rename to ql/src/test/results/clientpositive/llap/load_dyn_part15.q.out
diff --git a/ql/src/test/results/clientpositive/load_dyn_part7.q.out b/ql/src/test/results/clientpositive/llap/load_dyn_part7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_dyn_part7.q.out
rename to ql/src/test/results/clientpositive/llap/load_dyn_part7.q.out
diff --git a/ql/src/test/results/clientpositive/load_exist_part_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/load_exist_part_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_exist_part_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/load_exist_part_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out b/ql/src/test/results/clientpositive/llap/load_file_with_space_in_the_name.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_file_with_space_in_the_name.q.out
rename to ql/src/test/results/clientpositive/llap/load_file_with_space_in_the_name.q.out
diff --git a/ql/src/test/results/clientpositive/load_fs.q.out b/ql/src/test/results/clientpositive/llap/load_fs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_fs.q.out
rename to ql/src/test/results/clientpositive/llap/load_fs.q.out
diff --git a/ql/src/test/results/clientpositive/load_fs_overwrite.q.out b/ql/src/test/results/clientpositive/llap/load_fs_overwrite.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_fs_overwrite.q.out
rename to ql/src/test/results/clientpositive/llap/load_fs_overwrite.q.out
diff --git a/ql/src/test/results/clientpositive/load_local_dir_test.q.out b/ql/src/test/results/clientpositive/llap/load_local_dir_test.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_local_dir_test.q.out
rename to ql/src/test/results/clientpositive/llap/load_local_dir_test.q.out
diff --git a/ql/src/test/results/clientpositive/load_non_hdfs_path.q.out b/ql/src/test/results/clientpositive/llap/load_non_hdfs_path.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_non_hdfs_path.q.out
rename to ql/src/test/results/clientpositive/llap/load_non_hdfs_path.q.out
diff --git a/ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/load_nonpart_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_nonpart_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/load_nonpart_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/load_orc.q.out b/ql/src/test/results/clientpositive/llap/load_orc.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_orc.q.out
rename to ql/src/test/results/clientpositive/llap/load_orc.q.out
diff --git a/ql/src/test/results/clientpositive/load_orc_part.q.out b/ql/src/test/results/clientpositive/llap/load_orc_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_orc_part.q.out
rename to ql/src/test/results/clientpositive/llap/load_orc_part.q.out
diff --git a/ql/src/test/results/clientpositive/load_overwrite.q.out b/ql/src/test/results/clientpositive/llap/load_overwrite.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_overwrite.q.out
rename to ql/src/test/results/clientpositive/llap/load_overwrite.q.out
diff --git a/ql/src/test/results/clientpositive/load_part_authsuccess.q.out b/ql/src/test/results/clientpositive/llap/load_part_authsuccess.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/load_part_authsuccess.q.out
rename to ql/src/test/results/clientpositive/llap/load_part_authsuccess.q.out
diff --git a/ql/src/test/results/clientpositive/loadpart1.q.out b/ql/src/test/results/clientpositive/llap/loadpart1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/loadpart1.q.out
rename to ql/src/test/results/clientpositive/llap/loadpart1.q.out
diff --git a/ql/src/test/results/clientpositive/loadpart2.q.out b/ql/src/test/results/clientpositive/llap/loadpart2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/loadpart2.q.out
rename to ql/src/test/results/clientpositive/llap/loadpart2.q.out
diff --git a/ql/src/test/results/clientpositive/localtimezone2.q.out b/ql/src/test/results/clientpositive/llap/localtimezone2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/localtimezone2.q.out
rename to ql/src/test/results/clientpositive/llap/localtimezone2.q.out
diff --git a/ql/src/test/results/clientpositive/lock1.q.out b/ql/src/test/results/clientpositive/llap/lock1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/lock1.q.out
rename to ql/src/test/results/clientpositive/llap/lock1.q.out
diff --git a/ql/src/test/results/clientpositive/lock2.q.out b/ql/src/test/results/clientpositive/llap/lock2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/lock2.q.out
rename to ql/src/test/results/clientpositive/llap/lock2.q.out
diff --git a/ql/src/test/results/clientpositive/lock3.q.out b/ql/src/test/results/clientpositive/llap/lock3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/lock3.q.out
rename to ql/src/test/results/clientpositive/llap/lock3.q.out
diff --git a/ql/src/test/results/clientpositive/lock4.q.out b/ql/src/test/results/clientpositive/llap/lock4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/lock4.q.out
rename to ql/src/test/results/clientpositive/llap/lock4.q.out
diff --git a/ql/src/test/results/clientpositive/mapjoin_addjar.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/mapjoin_addjar.q.out
rename to ql/src/test/results/clientpositive/llap/mapjoin_addjar.q.out
diff --git a/ql/src/test/results/clientpositive/masking_11.q.out b/ql/src/test/results/clientpositive/llap/masking_11.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/masking_11.q.out
rename to ql/src/test/results/clientpositive/llap/masking_11.q.out
diff --git a/ql/src/test/results/clientpositive/masking_14.q.out b/ql/src/test/results/clientpositive/llap/masking_14.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/masking_14.q.out
rename to ql/src/test/results/clientpositive/llap/masking_14.q.out
diff --git a/ql/src/test/results/clientpositive/masking_acid_no_masking.q.out b/ql/src/test/results/clientpositive/llap/masking_acid_no_masking.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/masking_acid_no_masking.q.out
rename to ql/src/test/results/clientpositive/llap/masking_acid_no_masking.q.out
diff --git a/ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_authorization_sqlstd.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/materialized_view_authorization_sqlstd.q.out
rename to ql/src/test/results/clientpositive/llap/materialized_view_authorization_sqlstd.q.out
diff --git a/ql/src/test/results/clientpositive/materialized_view_create_acid.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_acid.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/materialized_view_create_acid.q.out
rename to ql/src/test/results/clientpositive/llap/materialized_view_create_acid.q.out
diff --git a/ql/src/test/results/clientpositive/metadata_empty_table.q.out b/ql/src/test/results/clientpositive/llap/metadata_empty_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/metadata_empty_table.q.out
rename to ql/src/test/results/clientpositive/llap/metadata_empty_table.q.out
diff --git a/ql/src/test/results/clientpositive/metadata_export_drop.q.out b/ql/src/test/results/clientpositive/llap/metadata_export_drop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/metadata_export_drop.q.out
rename to ql/src/test/results/clientpositive/llap/metadata_export_drop.q.out
diff --git a/ql/src/test/results/clientpositive/mi.q.out b/ql/src/test/results/clientpositive/llap/mi.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/mi.q.out
rename to ql/src/test/results/clientpositive/llap/mi.q.out
diff --git a/ql/src/test/results/clientpositive/min_structvalue.q.out b/ql/src/test/results/clientpositive/llap/min_structvalue.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/min_structvalue.q.out
rename to ql/src/test/results/clientpositive/llap/min_structvalue.q.out
diff --git a/ql/src/test/results/clientpositive/misc_json.q.out b/ql/src/test/results/clientpositive/llap/misc_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/misc_json.q.out
rename to ql/src/test/results/clientpositive/llap/misc_json.q.out
diff --git a/ql/src/test/results/clientpositive/mm_default.q.out b/ql/src/test/results/clientpositive/llap/mm_default.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/mm_default.q.out
rename to ql/src/test/results/clientpositive/llap/mm_default.q.out
diff --git a/ql/src/test/results/clientpositive/mm_insert_overwrite_aborted.q.out b/ql/src/test/results/clientpositive/llap/mm_insert_overwrite_aborted.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/mm_insert_overwrite_aborted.q.out
rename to ql/src/test/results/clientpositive/llap/mm_insert_overwrite_aborted.q.out
diff --git a/ql/src/test/results/clientpositive/mm_iow_temp.q.out b/ql/src/test/results/clientpositive/llap/mm_iow_temp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/mm_iow_temp.q.out
rename to ql/src/test/results/clientpositive/llap/mm_iow_temp.q.out
diff --git a/ql/src/test/results/clientpositive/mm_loc_ctas.q.out b/ql/src/test/results/clientpositive/llap/mm_loc_ctas.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/mm_loc_ctas.q.out
rename to ql/src/test/results/clientpositive/llap/mm_loc_ctas.q.out
diff --git a/ql/src/test/results/clientpositive/multi_insert_partitioned.q.out b/ql/src/test/results/clientpositive/llap/multi_insert_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/multi_insert_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/multi_insert_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/multi_insert_with_join.q.out b/ql/src/test/results/clientpositive/llap/multi_insert_with_join.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/multi_insert_with_join.q.out
rename to ql/src/test/results/clientpositive/llap/multi_insert_with_join.q.out
diff --git a/ql/src/test/results/clientpositive/multi_sahooks.q.out b/ql/src/test/results/clientpositive/llap/multi_sahooks.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/multi_sahooks.q.out
rename to ql/src/test/results/clientpositive/llap/multi_sahooks.q.out
diff --git a/ql/src/test/results/clientpositive/nested_complex.q.out b/ql/src/test/results/clientpositive/llap/nested_complex.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nested_complex.q.out
rename to ql/src/test/results/clientpositive/llap/nested_complex.q.out
diff --git a/ql/src/test/results/clientpositive/nested_complex_additional.q.out b/ql/src/test/results/clientpositive/llap/nested_complex_additional.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nested_complex_additional.q.out
rename to ql/src/test/results/clientpositive/llap/nested_complex_additional.q.out
diff --git a/ql/src/test/results/clientpositive/nestedvirtual.q.out b/ql/src/test/results/clientpositive/llap/nestedvirtual.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nestedvirtual.q.out
rename to ql/src/test/results/clientpositive/llap/nestedvirtual.q.out
diff --git a/ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out b/ql/src/test/results/clientpositive/llap/nomore_ambiguous_table_col.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nomore_ambiguous_table_col.q.out
rename to ql/src/test/results/clientpositive/llap/nomore_ambiguous_table_col.q.out
diff --git a/ql/src/test/results/clientpositive/nonReservedKeyWords.q.out b/ql/src/test/results/clientpositive/llap/nonReservedKeyWords.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nonReservedKeyWords.q.out
rename to ql/src/test/results/clientpositive/llap/nonReservedKeyWords.q.out
diff --git a/ql/src/test/results/clientpositive/non_ascii_literal1.q.out b/ql/src/test/results/clientpositive/llap/non_ascii_literal1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/non_ascii_literal1.q.out
rename to ql/src/test/results/clientpositive/llap/non_ascii_literal1.q.out
diff --git a/ql/src/test/results/clientpositive/non_ascii_literal2.q.out b/ql/src/test/results/clientpositive/llap/non_ascii_literal2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/non_ascii_literal2.q.out
rename to ql/src/test/results/clientpositive/llap/non_ascii_literal2.q.out
diff --git a/ql/src/test/results/clientpositive/notable_alias3.q.out b/ql/src/test/results/clientpositive/llap/notable_alias3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/notable_alias3.q.out
rename to ql/src/test/results/clientpositive/llap/notable_alias3.q.out
diff --git a/ql/src/test/results/clientpositive/nullMap.q.out b/ql/src/test/results/clientpositive/llap/nullMap.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nullMap.q.out
rename to ql/src/test/results/clientpositive/llap/nullMap.q.out
diff --git a/ql/src/test/results/clientpositive/null_column.q.out b/ql/src/test/results/clientpositive/llap/null_column.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/null_column.q.out
rename to ql/src/test/results/clientpositive/llap/null_column.q.out
diff --git a/ql/src/test/results/clientpositive/nullformatdir.q.out b/ql/src/test/results/clientpositive/llap/nullformatdir.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nullformatdir.q.out
rename to ql/src/test/results/clientpositive/llap/nullformatdir.q.out
diff --git a/ql/src/test/results/clientpositive/nullinput.q.out b/ql/src/test/results/clientpositive/llap/nullinput.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nullinput.q.out
rename to ql/src/test/results/clientpositive/llap/nullinput.q.out
diff --git a/ql/src/test/results/clientpositive/nullinput2.q.out b/ql/src/test/results/clientpositive/llap/nullinput2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nullinput2.q.out
rename to ql/src/test/results/clientpositive/llap/nullinput2.q.out
diff --git a/ql/src/test/results/clientpositive/nullshandling.q.out b/ql/src/test/results/clientpositive/llap/nullshandling.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/nullshandling.q.out
rename to ql/src/test/results/clientpositive/llap/nullshandling.q.out
diff --git a/ql/src/test/results/clientpositive/ops_comparison.q.out b/ql/src/test/results/clientpositive/llap/ops_comparison.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ops_comparison.q.out
rename to ql/src/test/results/clientpositive/llap/ops_comparison.q.out
diff --git a/ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out b/ql/src/test/results/clientpositive/llap/orc_dictionary_threshold.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_dictionary_threshold.q.out
rename to ql/src/test/results/clientpositive/llap/orc_dictionary_threshold.q.out
diff --git a/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out b/ql/src/test/results/clientpositive/llap/orc_diff_part_cols.q.out
similarity index 94%
rename from ql/src/test/results/clientpositive/orc_diff_part_cols.q.out
rename to ql/src/test/results/clientpositive/llap/orc_diff_part_cols.q.out
index 90ca247..b64c05f 100644
--- a/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_diff_part_cols.q.out
@@ -31,11 +31,11 @@ POSTHOOK: query: ALTER TABLE test_orc_n0 ADD COLUMNS (cnt INT)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@test_orc_n0
 POSTHOOK: Output: default@test_orc_n0
-PREHOOK: query: INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key LIMIT 5
+PREHOOK: query: INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key ORDER BY key LIMIT 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test_orc_n0@part=2
-POSTHOOK: query: INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key LIMIT 5
+POSTHOOK: query: INSERT OVERWRITE TABLE test_orc_n0 PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key ORDER BY key LIMIT 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_orc_n0@part=2
diff --git a/ql/src/test/results/clientpositive/orc_diff_part_cols2.q.out b/ql/src/test/results/clientpositive/llap/orc_diff_part_cols2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_diff_part_cols2.q.out
rename to ql/src/test/results/clientpositive/llap/orc_diff_part_cols2.q.out
diff --git a/ql/src/test/results/clientpositive/orc_empty_files.q.out b/ql/src/test/results/clientpositive/llap/orc_empty_files.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_empty_files.q.out
rename to ql/src/test/results/clientpositive/llap/orc_empty_files.q.out
diff --git a/ql/src/test/results/clientpositive/orc_empty_strings.q.out b/ql/src/test/results/clientpositive/llap/orc_empty_strings.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_empty_strings.q.out
rename to ql/src/test/results/clientpositive/llap/orc_empty_strings.q.out
diff --git a/ql/src/test/results/clientpositive/orc_empty_table.q.out b/ql/src/test/results/clientpositive/llap/orc_empty_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_empty_table.q.out
rename to ql/src/test/results/clientpositive/llap/orc_empty_table.q.out
diff --git a/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out b/ql/src/test/results/clientpositive/llap/orc_ends_with_nulls.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out
rename to ql/src/test/results/clientpositive/llap/orc_ends_with_nulls.q.out
diff --git a/ql/src/test/results/clientpositive/orc_file_dump.q.out b/ql/src/test/results/clientpositive/llap/orc_file_dump.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_file_dump.q.out
rename to ql/src/test/results/clientpositive/llap/orc_file_dump.q.out
diff --git a/ql/src/test/results/clientpositive/orc_merge13.q.out b/ql/src/test/results/clientpositive/llap/orc_merge13.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_merge13.q.out
rename to ql/src/test/results/clientpositive/llap/orc_merge13.q.out
diff --git a/ql/src/test/results/clientpositive/orc_min_max.q.out b/ql/src/test/results/clientpositive/llap/orc_min_max.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_min_max.q.out
rename to ql/src/test/results/clientpositive/llap/orc_min_max.q.out
diff --git a/ql/src/test/results/clientpositive/orc_mr_pathalias.q.out b/ql/src/test/results/clientpositive/llap/orc_mr_pathalias.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_mr_pathalias.q.out
rename to ql/src/test/results/clientpositive/llap/orc_mr_pathalias.q.out
diff --git a/ql/src/test/results/clientpositive/orc_null_check.q.out b/ql/src/test/results/clientpositive/llap/orc_null_check.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_null_check.q.out
rename to ql/src/test/results/clientpositive/llap/orc_null_check.q.out
diff --git a/ql/src/test/results/clientpositive/orc_ppd_boolean.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_ppd_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/orc_ppd_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/orc_ppd_char.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_char.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_ppd_char.q.out
rename to ql/src/test/results/clientpositive/llap/orc_ppd_char.q.out
diff --git a/ql/src/test/results/clientpositive/orc_ppd_exception.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_exception.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_ppd_exception.q.out
rename to ql/src/test/results/clientpositive/llap/orc_ppd_exception.q.out
diff --git a/ql/src/test/results/clientpositive/orc_ppd_is_null.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_is_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_ppd_is_null.q.out
rename to ql/src/test/results/clientpositive/llap/orc_ppd_is_null.q.out
diff --git a/ql/src/test/results/clientpositive/orc_ppd_same_table_multiple_aliases.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_same_table_multiple_aliases.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_ppd_same_table_multiple_aliases.q.out
rename to ql/src/test/results/clientpositive/llap/orc_ppd_same_table_multiple_aliases.q.out
diff --git a/ql/src/test/results/clientpositive/orc_remove_cols.q.out b/ql/src/test/results/clientpositive/llap/orc_remove_cols.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_remove_cols.q.out
rename to ql/src/test/results/clientpositive/llap/orc_remove_cols.q.out
diff --git a/ql/src/test/results/clientpositive/orc_schema_evolution.q.out b/ql/src/test/results/clientpositive/llap/orc_schema_evolution.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_schema_evolution.q.out
rename to ql/src/test/results/clientpositive/llap/orc_schema_evolution.q.out
diff --git a/ql/src/test/results/clientpositive/orc_timestamplocaltz_type.q.out b/ql/src/test/results/clientpositive/llap/orc_timestamplocaltz_type.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_timestamplocaltz_type.q.out
rename to ql/src/test/results/clientpositive/llap/orc_timestamplocaltz_type.q.out
diff --git a/ql/src/test/results/clientpositive/orc_wide_table.q.out b/ql/src/test/results/clientpositive/llap/orc_wide_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/orc_wide_table.q.out
rename to ql/src/test/results/clientpositive/llap/orc_wide_table.q.out
diff --git a/ql/src/test/results/clientpositive/order2.q.out b/ql/src/test/results/clientpositive/llap/order2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/order2.q.out
rename to ql/src/test/results/clientpositive/llap/order2.q.out
diff --git a/ql/src/test/results/clientpositive/order_within_subquery.q.out b/ql/src/test/results/clientpositive/llap/order_within_subquery.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/order_within_subquery.q.out
rename to ql/src/test/results/clientpositive/llap/order_within_subquery.q.out
diff --git a/ql/src/test/results/clientpositive/overridden_confs.q.out b/ql/src/test/results/clientpositive/llap/overridden_confs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/overridden_confs.q.out
rename to ql/src/test/results/clientpositive/llap/overridden_confs.q.out
diff --git a/ql/src/test/results/clientpositive/parenthese.q.out b/ql/src/test/results/clientpositive/llap/parenthese.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parenthese.q.out
rename to ql/src/test/results/clientpositive/llap/parenthese.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_analyze.q.out b/ql/src/test/results/clientpositive/llap/parquet_analyze.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_analyze.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_analyze.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_map_emptynullvals.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_map_emptynullvals.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_map_emptynullvals.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_map_emptynullvals.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_null_element.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_null_element.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_null_element.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_null_element.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_multi_field_struct.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_multi_field_struct.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_multi_field_struct.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_multi_field_struct.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_optional_elements.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_optional_elements.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_optional_elements.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_optional_elements.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_required_elements.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_required_elements.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_required_elements.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_required_elements.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_single_field_struct.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_single_field_struct.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_single_field_struct.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_single_field_struct.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_structs.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_structs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_structs.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_structs.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_unannotated_groups.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_unannotated_groups.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_unannotated_groups.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_unannotated_groups.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_array_of_unannotated_primitives.q.out b/ql/src/test/results/clientpositive/llap/parquet_array_of_unannotated_primitives.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_array_of_unannotated_primitives.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_array_of_unannotated_primitives.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_avro_array_of_primitives.q.out b/ql/src/test/results/clientpositive/llap/parquet_avro_array_of_primitives.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_avro_array_of_primitives.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_avro_array_of_primitives.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_avro_array_of_single_field_struct.q.out b/ql/src/test/results/clientpositive/llap/parquet_avro_array_of_single_field_struct.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_avro_array_of_single_field_struct.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_avro_array_of_single_field_struct.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_columnar.q.out b/ql/src/test/results/clientpositive/llap/parquet_columnar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_columnar.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_columnar.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_ctas.q.out b/ql/src/test/results/clientpositive/llap/parquet_ctas.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_ctas.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_ctas.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_decimal.q.out b/ql/src/test/results/clientpositive/llap/parquet_decimal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_decimal.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_decimal.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_decimal1.q.out b/ql/src/test/results/clientpositive/llap/parquet_decimal1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_decimal1.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_decimal1.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_external_time.q.out b/ql/src/test/results/clientpositive/llap/parquet_external_time.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_external_time.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_external_time.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_historical_timestamp.q.out b/ql/src/test/results/clientpositive/llap/parquet_historical_timestamp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_historical_timestamp.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_historical_timestamp.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_int64_timestamp.q.out b/ql/src/test/results/clientpositive/llap/parquet_int64_timestamp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_int64_timestamp.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_int64_timestamp.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_int_decimal.q.out b/ql/src/test/results/clientpositive/llap/parquet_int_decimal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_int_decimal.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_int_decimal.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_join2.q.out b/ql/src/test/results/clientpositive/llap/parquet_join2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_join2.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_join2.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_map_null.q.out b/ql/src/test/results/clientpositive/llap/parquet_map_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_map_null.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_map_null.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_map_of_arrays_of_ints.q.out b/ql/src/test/results/clientpositive/llap/parquet_map_of_arrays_of_ints.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_map_of_arrays_of_ints.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_map_of_arrays_of_ints.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_map_of_maps.q.out b/ql/src/test/results/clientpositive/llap/parquet_map_of_maps.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_map_of_maps.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_map_of_maps.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_mixed_case.q.out b/ql/src/test/results/clientpositive/llap/parquet_mixed_case.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_mixed_case.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_mixed_case.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out b/ql/src/test/results/clientpositive/llap/parquet_mixed_partition_formats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_mixed_partition_formats.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_nested_complex.q.out b/ql/src/test/results/clientpositive/llap/parquet_nested_complex.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_nested_complex.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_nested_complex.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_partitioned.q.out b/ql/src/test/results/clientpositive/llap/parquet_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_ppd.q.out b/ql/src/test/results/clientpositive/llap/parquet_ppd.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_ppd.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_ppd.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_ppd_char2.q.out b/ql/src/test/results/clientpositive/llap/parquet_ppd_char2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_ppd_char2.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_ppd_char2.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_ppd_multifiles.q.out b/ql/src/test/results/clientpositive/llap/parquet_ppd_multifiles.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_ppd_multifiles.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_ppd_multifiles.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_ppd_partition.q.out b/ql/src/test/results/clientpositive/llap/parquet_ppd_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_ppd_partition.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_ppd_partition.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_predicate_pushdown_2.q.out b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_predicate_pushdown_2.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown_2.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_read_backward_compatible_files.q.out b/ql/src/test/results/clientpositive/llap/parquet_read_backward_compatible_files.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_read_backward_compatible_files.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_read_backward_compatible_files.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_serde.q.out b/ql/src/test/results/clientpositive/llap/parquet_serde.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_serde.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_serde.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_stats.q.out b/ql/src/test/results/clientpositive/llap/parquet_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_stats.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_stats.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_table_with_subschema.q.out b/ql/src/test/results/clientpositive/llap/parquet_table_with_subschema.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_table_with_subschema.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_table_with_subschema.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_thrift_array_of_single_field_struct.q.out b/ql/src/test/results/clientpositive/llap/parquet_thrift_array_of_single_field_struct.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_thrift_array_of_single_field_struct.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_thrift_array_of_single_field_struct.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_type_promotion.q.out b/ql/src/test/results/clientpositive/llap/parquet_type_promotion.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_type_promotion.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_type_promotion.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_nested_udf.q.out b/ql/src/test/results/clientpositive/llap/parquet_vectorization_nested_udf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_vectorization_nested_udf.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_vectorization_nested_udf.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_not.q.out b/ql/src/test/results/clientpositive/llap/parquet_vectorization_not.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_vectorization_not.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_vectorization_not.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_part.q.out b/ql/src/test/results/clientpositive/llap/parquet_vectorization_part.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_vectorization_part.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_vectorization_part.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_part_varchar.q.out b/ql/src/test/results/clientpositive/llap/parquet_vectorization_part_varchar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_vectorization_part_varchar.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_vectorization_part_varchar.q.out
diff --git a/ql/src/test/results/clientpositive/parquet_write_correct_definition_levels.q.out b/ql/src/test/results/clientpositive/llap/parquet_write_correct_definition_levels.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/parquet_write_correct_definition_levels.q.out
rename to ql/src/test/results/clientpositive/llap/parquet_write_correct_definition_levels.q.out
diff --git a/ql/src/test/results/clientpositive/partInit.q.out b/ql/src/test/results/clientpositive/llap/partInit.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partInit.q.out
rename to ql/src/test/results/clientpositive/llap/partInit.q.out
diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out b/ql/src/test/results/clientpositive/llap/part_inherit_tbl_props.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
rename to ql/src/test/results/clientpositive/llap/part_inherit_tbl_props.q.out
diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out b/ql/src/test/results/clientpositive/llap/part_inherit_tbl_props_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
rename to ql/src/test/results/clientpositive/llap/part_inherit_tbl_props_empty.q.out
diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out b/ql/src/test/results/clientpositive/llap/part_inherit_tbl_props_with_star.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
rename to ql/src/test/results/clientpositive/llap/part_inherit_tbl_props_with_star.q.out
diff --git a/ql/src/test/results/clientpositive/partition_boolean.q.out b/ql/src/test/results/clientpositive/llap/partition_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/partition_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/partition_char.q.out b/ql/src/test/results/clientpositive/llap/partition_char.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_char.q.out
rename to ql/src/test/results/clientpositive/llap/partition_char.q.out
diff --git a/ql/src/test/results/clientpositive/partition_coltype_literals.q.out b/ql/src/test/results/clientpositive/llap/partition_coltype_literals.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_coltype_literals.q.out
rename to ql/src/test/results/clientpositive/llap/partition_coltype_literals.q.out
diff --git a/ql/src/test/results/clientpositive/partition_date.q.out b/ql/src/test/results/clientpositive/llap/partition_date.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_date.q.out
rename to ql/src/test/results/clientpositive/llap/partition_date.q.out
diff --git a/ql/src/test/results/clientpositive/partition_date2.q.out b/ql/src/test/results/clientpositive/llap/partition_date2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_date2.q.out
rename to ql/src/test/results/clientpositive/llap/partition_date2.q.out
diff --git a/ql/src/test/results/clientpositive/partition_decode_name.q.out b/ql/src/test/results/clientpositive/llap/partition_decode_name.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_decode_name.q.out
rename to ql/src/test/results/clientpositive/llap/partition_decode_name.q.out
diff --git a/ql/src/test/results/clientpositive/partition_params_postgres.q.out b/ql/src/test/results/clientpositive/llap/partition_params_postgres.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_params_postgres.q.out
rename to ql/src/test/results/clientpositive/llap/partition_params_postgres.q.out
diff --git a/ql/src/test/results/clientpositive/partition_schema1.q.out b/ql/src/test/results/clientpositive/llap/partition_schema1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_schema1.q.out
rename to ql/src/test/results/clientpositive/llap/partition_schema1.q.out
diff --git a/ql/src/test/results/clientpositive/partition_serde_format.q.out b/ql/src/test/results/clientpositive/llap/partition_serde_format.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_serde_format.q.out
rename to ql/src/test/results/clientpositive/llap/partition_serde_format.q.out
diff --git a/ql/src/test/results/clientpositive/partition_special_char.q.out b/ql/src/test/results/clientpositive/llap/partition_special_char.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_special_char.q.out
rename to ql/src/test/results/clientpositive/llap/partition_special_char.q.out
diff --git a/ql/src/test/results/clientpositive/partition_timestamp.q.out b/ql/src/test/results/clientpositive/llap/partition_timestamp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_timestamp.q.out
rename to ql/src/test/results/clientpositive/llap/partition_timestamp.q.out
diff --git a/ql/src/test/results/clientpositive/partition_type_check.q.out b/ql/src/test/results/clientpositive/llap/partition_type_check.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_type_check.q.out
rename to ql/src/test/results/clientpositive/llap/partition_type_check.q.out
diff --git a/ql/src/test/results/clientpositive/partition_type_in_plan.q.out b/ql/src/test/results/clientpositive/llap/partition_type_in_plan.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_type_in_plan.q.out
rename to ql/src/test/results/clientpositive/llap/partition_type_in_plan.q.out
diff --git a/ql/src/test/results/clientpositive/partition_varchar1.q.out b/ql/src/test/results/clientpositive/llap/partition_varchar1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_varchar1.q.out
rename to ql/src/test/results/clientpositive/llap/partition_varchar1.q.out
diff --git a/ql/src/test/results/clientpositive/partition_varchar2.q.out b/ql/src/test/results/clientpositive/llap/partition_varchar2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_varchar2.q.out
rename to ql/src/test/results/clientpositive/llap/partition_varchar2.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat10.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat10.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat10.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat11.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat11.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat11.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat12.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat12.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat12.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat13.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat13.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat13.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat14.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat14.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat14.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat15.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat15.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat15.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat16.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat16.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat16.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat17.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat17.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat17.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat17.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat18.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat18.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat18.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat18.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat3.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat3.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat3.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat4.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat4.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat4.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat5.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat5.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat5.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat6.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat6.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat6.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat7.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat7.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat7.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat8.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat8.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat8.q.out
diff --git a/ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out b/ql/src/test/results/clientpositive/llap/partition_wise_fileformat9.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partition_wise_fileformat9.q.out
rename to ql/src/test/results/clientpositive/llap/partition_wise_fileformat9.q.out
diff --git a/ql/src/test/results/clientpositive/partitioned_table_stats.q.out b/ql/src/test/results/clientpositive/llap/partitioned_table_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partitioned_table_stats.q.out
rename to ql/src/test/results/clientpositive/llap/partitioned_table_stats.q.out
diff --git a/ql/src/test/results/clientpositive/partitions_filter_default.q.out b/ql/src/test/results/clientpositive/llap/partitions_filter_default.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partitions_filter_default.q.out
rename to ql/src/test/results/clientpositive/llap/partitions_filter_default.q.out
diff --git a/ql/src/test/results/clientpositive/partitions_json.q.out b/ql/src/test/results/clientpositive/llap/partitions_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/partitions_json.q.out
rename to ql/src/test/results/clientpositive/llap/partitions_json.q.out
diff --git a/ql/src/test/results/clientpositive/plan_json.q.out b/ql/src/test/results/clientpositive/llap/plan_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/plan_json.q.out
rename to ql/src/test/results/clientpositive/llap/plan_json.q.out
diff --git a/ql/src/test/results/clientpositive/ppd_constant_where.q.out b/ql/src/test/results/clientpositive/llap/ppd_constant_where.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ppd_constant_where.q.out
rename to ql/src/test/results/clientpositive/llap/ppd_constant_where.q.out
diff --git a/ql/src/test/results/clientpositive/ppd_field_garbage.q.out b/ql/src/test/results/clientpositive/llap/ppd_field_garbage.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ppd_field_garbage.q.out
rename to ql/src/test/results/clientpositive/llap/ppd_field_garbage.q.out
diff --git a/ql/src/test/results/clientpositive/ppd_like_filter.q.out b/ql/src/test/results/clientpositive/llap/ppd_like_filter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ppd_like_filter.q.out
rename to ql/src/test/results/clientpositive/llap/ppd_like_filter.q.out
diff --git a/ql/src/test/results/clientpositive/ppr_pushdown2.q.out b/ql/src/test/results/clientpositive/llap/ppr_pushdown2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ppr_pushdown2.q.out
rename to ql/src/test/results/clientpositive/llap/ppr_pushdown2.q.out
diff --git a/ql/src/test/results/clientpositive/primitive_types.q.out b/ql/src/test/results/clientpositive/llap/primitive_types.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/primitive_types.q.out
rename to ql/src/test/results/clientpositive/llap/primitive_types.q.out
diff --git a/ql/src/test/results/clientpositive/progress_1.q.out b/ql/src/test/results/clientpositive/llap/progress_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/progress_1.q.out
rename to ql/src/test/results/clientpositive/llap/progress_1.q.out
diff --git a/ql/src/test/results/clientpositive/ptf_decimal.q.out b/ql/src/test/results/clientpositive/llap/ptf_decimal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ptf_decimal.q.out
rename to ql/src/test/results/clientpositive/llap/ptf_decimal.q.out
diff --git a/ql/src/test/results/clientpositive/ptf_general_queries.q.out b/ql/src/test/results/clientpositive/llap/ptf_general_queries.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ptf_general_queries.q.out
rename to ql/src/test/results/clientpositive/llap/ptf_general_queries.q.out
diff --git a/ql/src/test/results/clientpositive/ptf_rcfile.q.out b/ql/src/test/results/clientpositive/llap/ptf_rcfile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ptf_rcfile.q.out
rename to ql/src/test/results/clientpositive/llap/ptf_rcfile.q.out
diff --git a/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out b/ql/src/test/results/clientpositive/llap/ptf_register_tblfn.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ptf_register_tblfn.q.out
rename to ql/src/test/results/clientpositive/llap/ptf_register_tblfn.q.out
diff --git a/ql/src/test/results/clientpositive/ptf_seqfile.q.out b/ql/src/test/results/clientpositive/llap/ptf_seqfile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/ptf_seqfile.q.out
rename to ql/src/test/results/clientpositive/llap/ptf_seqfile.q.out
diff --git a/ql/src/test/results/clientpositive/query_lifetime_hook.q.out b/ql/src/test/results/clientpositive/llap/query_lifetime_hook.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/query_lifetime_hook.q.out
rename to ql/src/test/results/clientpositive/llap/query_lifetime_hook.q.out
diff --git a/ql/src/test/results/clientpositive/query_properties.q.out b/ql/src/test/results/clientpositive/llap/query_properties.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/query_properties.q.out
rename to ql/src/test/results/clientpositive/llap/query_properties.q.out
diff --git a/ql/src/test/results/clientpositive/quotedid_alter.q.out b/ql/src/test/results/clientpositive/llap/quotedid_alter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/quotedid_alter.q.out
rename to ql/src/test/results/clientpositive/llap/quotedid_alter.q.out
diff --git a/ql/src/test/results/clientpositive/quotedid_stats.q.out b/ql/src/test/results/clientpositive/llap/quotedid_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/quotedid_stats.q.out
rename to ql/src/test/results/clientpositive/llap/quotedid_stats.q.out
diff --git a/ql/src/test/results/clientpositive/quotedid_tblproperty.q.out b/ql/src/test/results/clientpositive/llap/quotedid_tblproperty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/quotedid_tblproperty.q.out
rename to ql/src/test/results/clientpositive/llap/quotedid_tblproperty.q.out
diff --git a/ql/src/test/results/clientpositive/rcfile_columnar.q.out b/ql/src/test/results/clientpositive/llap/rcfile_columnar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rcfile_columnar.q.out
rename to ql/src/test/results/clientpositive/llap/rcfile_columnar.q.out
diff --git a/ql/src/test/results/clientpositive/rcfile_default_format.q.out b/ql/src/test/results/clientpositive/llap/rcfile_default_format.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rcfile_default_format.q.out
rename to ql/src/test/results/clientpositive/llap/rcfile_default_format.q.out
diff --git a/ql/src/test/results/clientpositive/rcfile_lazydecompress.q.out b/ql/src/test/results/clientpositive/llap/rcfile_lazydecompress.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rcfile_lazydecompress.q.out
rename to ql/src/test/results/clientpositive/llap/rcfile_lazydecompress.q.out
diff --git a/ql/src/test/results/clientpositive/rcfile_toleratecorruptions.q.out b/ql/src/test/results/clientpositive/llap/rcfile_toleratecorruptions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rcfile_toleratecorruptions.q.out
rename to ql/src/test/results/clientpositive/llap/rcfile_toleratecorruptions.q.out
diff --git a/ql/src/test/results/clientpositive/rcfile_union.q.out b/ql/src/test/results/clientpositive/llap/rcfile_union.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rcfile_union.q.out
rename to ql/src/test/results/clientpositive/llap/rcfile_union.q.out
diff --git a/ql/src/test/results/clientpositive/read_uint_parquet.q.out b/ql/src/test/results/clientpositive/llap/read_uint_parquet.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/read_uint_parquet.q.out
rename to ql/src/test/results/clientpositive/llap/read_uint_parquet.q.out
diff --git a/ql/src/test/results/clientpositive/read_uint_parquet_vectorized.q.out b/ql/src/test/results/clientpositive/llap/read_uint_parquet_vectorized.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/read_uint_parquet_vectorized.q.out
rename to ql/src/test/results/clientpositive/llap/read_uint_parquet_vectorized.q.out
diff --git a/ql/src/test/results/clientpositive/real.q.out b/ql/src/test/results/clientpositive/llap/real.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/real.q.out
rename to ql/src/test/results/clientpositive/llap/real.q.out
diff --git a/ql/src/test/results/clientpositive/recursive_dir.q.out b/ql/src/test/results/clientpositive/llap/recursive_dir.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/recursive_dir.q.out
rename to ql/src/test/results/clientpositive/llap/recursive_dir.q.out
diff --git a/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_exclude_gby.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out
rename to ql/src/test/results/clientpositive/llap/reduce_deduplicate_exclude_gby.q.out
diff --git a/ql/src/test/results/clientpositive/rename_column.q.out b/ql/src/test/results/clientpositive/llap/rename_column.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rename_column.q.out
rename to ql/src/test/results/clientpositive/llap/rename_column.q.out
diff --git a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out b/ql/src/test/results/clientpositive/llap/rename_external_partition_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rename_external_partition_location.q.out
rename to ql/src/test/results/clientpositive/llap/rename_external_partition_location.q.out
diff --git a/ql/src/test/results/clientpositive/rename_partition_location.q.out b/ql/src/test/results/clientpositive/llap/rename_partition_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rename_partition_location.q.out
rename to ql/src/test/results/clientpositive/llap/rename_partition_location.q.out
diff --git a/ql/src/test/results/clientpositive/rename_table_location.q.out b/ql/src/test/results/clientpositive/llap/rename_table_location.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rename_table_location.q.out
rename to ql/src/test/results/clientpositive/llap/rename_table_location.q.out
diff --git a/ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out b/ql/src/test/results/clientpositive/llap/rename_table_update_column_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/rename_table_update_column_stats.q.out
rename to ql/src/test/results/clientpositive/llap/rename_table_update_column_stats.q.out
diff --git a/ql/src/test/results/clientpositive/repl_1_drop.q.out b/ql/src/test/results/clientpositive/llap/repl_1_drop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/repl_1_drop.q.out
rename to ql/src/test/results/clientpositive/llap/repl_1_drop.q.out
diff --git a/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out b/ql/src/test/results/clientpositive/llap/repl_2_exim_basic.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/repl_2_exim_basic.q.out
rename to ql/src/test/results/clientpositive/llap/repl_2_exim_basic.q.out
diff --git a/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out b/ql/src/test/results/clientpositive/llap/repl_3_exim_metadata.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out
rename to ql/src/test/results/clientpositive/llap/repl_3_exim_metadata.q.out
diff --git a/ql/src/test/results/clientpositive/reset_conf.q.out b/ql/src/test/results/clientpositive/llap/reset_conf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/reset_conf.q.out
rename to ql/src/test/results/clientpositive/llap/reset_conf.q.out
diff --git a/ql/src/test/results/clientpositive/schema_evol_par_vec_table_dictionary_encoding.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_par_vec_table_dictionary_encoding.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/schema_evol_par_vec_table_dictionary_encoding.q.out
rename to ql/src/test/results/clientpositive/llap/schema_evol_par_vec_table_dictionary_encoding.q.out
diff --git a/ql/src/test/results/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_par_vec_table_non_dictionary_encoding.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/schema_evol_par_vec_table_non_dictionary_encoding.q.out
rename to ql/src/test/results/clientpositive/llap/schema_evol_par_vec_table_non_dictionary_encoding.q.out
diff --git a/ql/src/test/results/clientpositive/schemeAuthority3.q.out b/ql/src/test/results/clientpositive/llap/schemeAuthority3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/schemeAuthority3.q.out
rename to ql/src/test/results/clientpositive/llap/schemeAuthority3.q.out
diff --git a/ql/src/test/results/clientpositive/selectindate.q.out b/ql/src/test/results/clientpositive/llap/selectindate.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/selectindate.q.out
rename to ql/src/test/results/clientpositive/llap/selectindate.q.out
diff --git a/ql/src/test/results/clientpositive/semicolon.q.out b/ql/src/test/results/clientpositive/llap/semicolon.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/semicolon.q.out
rename to ql/src/test/results/clientpositive/llap/semicolon.q.out
diff --git a/ql/src/test/results/clientpositive/serde_opencsv.q.out b/ql/src/test/results/clientpositive/llap/serde_opencsv.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/serde_opencsv.q.out
rename to ql/src/test/results/clientpositive/llap/serde_opencsv.q.out
diff --git a/ql/src/test/results/clientpositive/serde_regex.q.out b/ql/src/test/results/clientpositive/llap/serde_regex.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/serde_regex.q.out
rename to ql/src/test/results/clientpositive/llap/serde_regex.q.out
diff --git a/ql/src/test/results/clientpositive/serde_reported_schema.q.out b/ql/src/test/results/clientpositive/llap/serde_reported_schema.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/serde_reported_schema.q.out
rename to ql/src/test/results/clientpositive/llap/serde_reported_schema.q.out
diff --git a/ql/src/test/results/clientpositive/set_metaconf.q.out b/ql/src/test/results/clientpositive/llap/set_metaconf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/set_metaconf.q.out
rename to ql/src/test/results/clientpositive/llap/set_metaconf.q.out
diff --git a/ql/src/test/results/clientpositive/set_tblproperties.q.out b/ql/src/test/results/clientpositive/llap/set_tblproperties.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/set_tblproperties.q.out
rename to ql/src/test/results/clientpositive/llap/set_tblproperties.q.out
diff --git a/ql/src/test/results/clientpositive/show_columns.q.out b/ql/src/test/results/clientpositive/llap/show_columns.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_columns.q.out
rename to ql/src/test/results/clientpositive/llap/show_columns.q.out
diff --git a/ql/src/test/results/clientpositive/show_conf.q.out b/ql/src/test/results/clientpositive/llap/show_conf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_conf.q.out
rename to ql/src/test/results/clientpositive/llap/show_conf.q.out
diff --git a/ql/src/test/results/clientpositive/show_create_database.q.out b/ql/src/test/results/clientpositive/llap/show_create_database.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_create_database.q.out
rename to ql/src/test/results/clientpositive/llap/show_create_database.q.out
diff --git a/ql/src/test/results/clientpositive/show_create_table_alter.q.out b/ql/src/test/results/clientpositive/llap/show_create_table_alter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_create_table_alter.q.out
rename to ql/src/test/results/clientpositive/llap/show_create_table_alter.q.out
diff --git a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out b/ql/src/test/results/clientpositive/llap/show_create_table_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/show_create_table_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/show_create_table_serde.q.out b/ql/src/test/results/clientpositive/llap/show_create_table_serde.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_create_table_serde.q.out
rename to ql/src/test/results/clientpositive/llap/show_create_table_serde.q.out
diff --git a/ql/src/test/results/clientpositive/show_create_table_view.q.out b/ql/src/test/results/clientpositive/llap/show_create_table_view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_create_table_view.q.out
rename to ql/src/test/results/clientpositive/llap/show_create_table_view.q.out
diff --git a/ql/src/test/results/clientpositive/show_describe_func_quotes.q.out b/ql/src/test/results/clientpositive/llap/show_describe_func_quotes.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_describe_func_quotes.q.out
rename to ql/src/test/results/clientpositive/llap/show_describe_func_quotes.q.out
diff --git a/ql/src/test/results/clientpositive/show_functions.q.out b/ql/src/test/results/clientpositive/llap/show_functions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_functions.q.out
rename to ql/src/test/results/clientpositive/llap/show_functions.q.out
diff --git a/ql/src/test/results/clientpositive/show_materialized_views.q.out b/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_materialized_views.q.out
rename to ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
diff --git a/ql/src/test/results/clientpositive/show_partitions.q.out b/ql/src/test/results/clientpositive/llap/show_partitions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_partitions.q.out
rename to ql/src/test/results/clientpositive/llap/show_partitions.q.out
diff --git a/ql/src/test/results/clientpositive/show_roles.q.out b/ql/src/test/results/clientpositive/llap/show_roles.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_roles.q.out
rename to ql/src/test/results/clientpositive/llap/show_roles.q.out
diff --git a/ql/src/test/results/clientpositive/show_tables.q.out b/ql/src/test/results/clientpositive/llap/show_tables.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_tables.q.out
rename to ql/src/test/results/clientpositive/llap/show_tables.q.out
diff --git a/ql/src/test/results/clientpositive/show_tablestatus.q.out b/ql/src/test/results/clientpositive/llap/show_tablestatus.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_tablestatus.q.out
rename to ql/src/test/results/clientpositive/llap/show_tablestatus.q.out
diff --git a/ql/src/test/results/clientpositive/show_tblproperties.q.out b/ql/src/test/results/clientpositive/llap/show_tblproperties.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_tblproperties.q.out
rename to ql/src/test/results/clientpositive/llap/show_tblproperties.q.out
diff --git a/ql/src/test/results/clientpositive/show_views.q.out b/ql/src/test/results/clientpositive/llap/show_views.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/show_views.q.out
rename to ql/src/test/results/clientpositive/llap/show_views.q.out
diff --git a/ql/src/test/results/clientpositive/showparts.q.out b/ql/src/test/results/clientpositive/llap/showparts.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/showparts.q.out
rename to ql/src/test/results/clientpositive/llap/showparts.q.out
diff --git a/ql/src/test/results/clientpositive/singletsinsertorc.q.out b/ql/src/test/results/clientpositive/llap/singletsinsertorc.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/singletsinsertorc.q.out
rename to ql/src/test/results/clientpositive/llap/singletsinsertorc.q.out
diff --git a/ql/src/test/results/clientpositive/smb_join_partition_key.q.out b/ql/src/test/results/clientpositive/llap/smb_join_partition_key.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/smb_join_partition_key.q.out
rename to ql/src/test/results/clientpositive/llap/smb_join_partition_key.q.out
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_8.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_8.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/smb_mapjoin_8.q.out
rename to ql/src/test/results/clientpositive/llap/smb_mapjoin_8.q.out
diff --git a/ql/src/test/results/clientpositive/smblimit.q.out b/ql/src/test/results/clientpositive/llap/smblimit.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/smblimit.q.out
rename to ql/src/test/results/clientpositive/llap/smblimit.q.out
diff --git a/ql/src/test/results/clientpositive/specialChar.q.out b/ql/src/test/results/clientpositive/llap/specialChar.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/specialChar.q.out
rename to ql/src/test/results/clientpositive/llap/specialChar.q.out
diff --git a/ql/src/test/results/clientpositive/split.q.out b/ql/src/test/results/clientpositive/llap/split.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/split.q.out
rename to ql/src/test/results/clientpositive/llap/split.q.out
diff --git a/ql/src/test/results/clientpositive/stats14.q.out b/ql/src/test/results/clientpositive/llap/stats14.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats14.q.out
rename to ql/src/test/results/clientpositive/llap/stats14.q.out
diff --git a/ql/src/test/results/clientpositive/stats15.q.out b/ql/src/test/results/clientpositive/llap/stats15.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats15.q.out
rename to ql/src/test/results/clientpositive/llap/stats15.q.out
diff --git a/ql/src/test/results/clientpositive/stats16.q.out b/ql/src/test/results/clientpositive/llap/stats16.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats16.q.out
rename to ql/src/test/results/clientpositive/llap/stats16.q.out
diff --git a/ql/src/test/results/clientpositive/stats18.q.out b/ql/src/test/results/clientpositive/llap/stats18.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats18.q.out
rename to ql/src/test/results/clientpositive/llap/stats18.q.out
diff --git a/ql/src/test/results/clientpositive/stats3.q.out b/ql/src/test/results/clientpositive/llap/stats3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats3.q.out
rename to ql/src/test/results/clientpositive/llap/stats3.q.out
diff --git a/ql/src/test/results/clientpositive/stats6.q.out b/ql/src/test/results/clientpositive/llap/stats6.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats6.q.out
rename to ql/src/test/results/clientpositive/llap/stats6.q.out
diff --git a/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out b/ql/src/test/results/clientpositive/llap/stats_aggregator_error_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out
rename to ql/src/test/results/clientpositive/llap/stats_aggregator_error_1.q.out
diff --git a/ql/src/test/results/clientpositive/stats_analyze_decimal_compare.q.out b/ql/src/test/results/clientpositive/llap/stats_analyze_decimal_compare.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_analyze_decimal_compare.q.out
rename to ql/src/test/results/clientpositive/llap/stats_analyze_decimal_compare.q.out
diff --git a/ql/src/test/results/clientpositive/stats_analyze_empty.q.out b/ql/src/test/results/clientpositive/llap/stats_analyze_empty.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_analyze_empty.q.out
rename to ql/src/test/results/clientpositive/llap/stats_analyze_empty.q.out
diff --git a/ql/src/test/results/clientpositive/stats_invalidation.q.out b/ql/src/test/results/clientpositive/llap/stats_invalidation.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_invalidation.q.out
rename to ql/src/test/results/clientpositive/llap/stats_invalidation.q.out
diff --git a/ql/src/test/results/clientpositive/stats_list_bucket.q.out b/ql/src/test/results/clientpositive/llap/stats_list_bucket.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_list_bucket.q.out
rename to ql/src/test/results/clientpositive/llap/stats_list_bucket.q.out
diff --git a/ql/src/test/results/clientpositive/stats_missing_warning.q.out b/ql/src/test/results/clientpositive/llap/stats_missing_warning.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_missing_warning.q.out
rename to ql/src/test/results/clientpositive/llap/stats_missing_warning.q.out
diff --git a/ql/src/test/results/clientpositive/stats_null_optimizer.q.out b/ql/src/test/results/clientpositive/llap/stats_null_optimizer.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_null_optimizer.q.out
rename to ql/src/test/results/clientpositive/llap/stats_null_optimizer.q.out
diff --git a/ql/src/test/results/clientpositive/stats_publisher_error_1.q.out b/ql/src/test/results/clientpositive/llap/stats_publisher_error_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/stats_publisher_error_1.q.out
rename to ql/src/test/results/clientpositive/llap/stats_publisher_error_1.q.out
diff --git a/ql/src/test/results/clientpositive/statsfs.q.out b/ql/src/test/results/clientpositive/llap/statsfs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/statsfs.q.out
rename to ql/src/test/results/clientpositive/llap/statsfs.q.out
diff --git a/ql/src/test/results/clientpositive/statsoptimizer.q.out b/ql/src/test/results/clientpositive/llap/statsoptimizer.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/statsoptimizer.q.out
rename to ql/src/test/results/clientpositive/llap/statsoptimizer.q.out
diff --git a/ql/src/test/results/clientpositive/storage_format_descriptor.q.out b/ql/src/test/results/clientpositive/llap/storage_format_descriptor.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/storage_format_descriptor.q.out
rename to ql/src/test/results/clientpositive/llap/storage_format_descriptor.q.out
diff --git a/ql/src/test/results/clientpositive/struct_in_view.q.out b/ql/src/test/results/clientpositive/llap/struct_in_view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/struct_in_view.q.out
rename to ql/src/test/results/clientpositive/llap/struct_in_view.q.out
diff --git a/ql/src/test/results/clientpositive/subquery_exists_explain_rewrite.q.out b/ql/src/test/results/clientpositive/llap/subquery_exists_explain_rewrite.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/subquery_exists_explain_rewrite.q.out
rename to ql/src/test/results/clientpositive/llap/subquery_exists_explain_rewrite.q.out
diff --git a/ql/src/test/results/clientpositive/subquery_in_explain_rewrite.q.out b/ql/src/test/results/clientpositive/llap/subquery_in_explain_rewrite.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/subquery_in_explain_rewrite.q.out
rename to ql/src/test/results/clientpositive/llap/subquery_in_explain_rewrite.q.out
diff --git a/ql/src/test/results/clientpositive/sum_expr_with_order.q.out b/ql/src/test/results/clientpositive/llap/sum_expr_with_order.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/sum_expr_with_order.q.out
rename to ql/src/test/results/clientpositive/llap/sum_expr_with_order.q.out
diff --git a/ql/src/test/results/clientpositive/table_set_owner.q.out b/ql/src/test/results/clientpositive/llap/table_set_owner.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/table_set_owner.q.out
rename to ql/src/test/results/clientpositive/llap/table_set_owner.q.out
diff --git a/ql/src/test/results/clientpositive/table_storage.q.out b/ql/src/test/results/clientpositive/llap/table_storage.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/table_storage.q.out
rename to ql/src/test/results/clientpositive/llap/table_storage.q.out
diff --git a/ql/src/test/results/clientpositive/tablename_with_select.q.out b/ql/src/test/results/clientpositive/llap/tablename_with_select.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/tablename_with_select.q.out
rename to ql/src/test/results/clientpositive/llap/tablename_with_select.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_add_part_exist.q.out b/ql/src/test/results/clientpositive/llap/temp_table_add_part_exist.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_add_part_exist.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_add_part_exist.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_alter_partition_change_col.q.out b/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_change_col.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_alter_partition_change_col.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_alter_partition_change_col.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_alter_partition_clusterby_sortby.q.out b/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_clusterby_sortby.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_alter_partition_clusterby_sortby.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_alter_partition_clusterby_sortby.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_alter_partition_onto_nocurrent_db.q.out b/ql/src/test/results/clientpositive/llap/temp_table_alter_partition_onto_nocurrent_db.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_alter_partition_onto_nocurrent_db.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_alter_partition_onto_nocurrent_db.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_alter_rename_partition.q.out b/ql/src/test/results/clientpositive/llap/temp_table_alter_rename_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_alter_rename_partition.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_alter_rename_partition.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_avro_partitioned.q.out b/ql/src/test/results/clientpositive/llap/temp_table_avro_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_avro_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_avro_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_avro_partitioned_native.q.out b/ql/src/test/results/clientpositive/llap/temp_table_avro_partitioned_native.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_avro_partitioned_native.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_avro_partitioned_native.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_default_partition_name.q.out b/ql/src/test/results/clientpositive/llap/temp_table_default_partition_name.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_default_partition_name.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_default_partition_name.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_drop_multi_partitions.q.out b/ql/src/test/results/clientpositive/llap/temp_table_drop_multi_partitions.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_drop_multi_partitions.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_drop_multi_partitions.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_drop_partitions_filter.q.out b/ql/src/test/results/clientpositive/llap/temp_table_drop_partitions_filter.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_drop_partitions_filter.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_drop_partitions_filter.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_drop_partitions_filter2.q.out b/ql/src/test/results/clientpositive/llap/temp_table_drop_partitions_filter2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_drop_partitions_filter2.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_drop_partitions_filter2.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_drop_partitions_filter3.q.out b/ql/src/test/results/clientpositive/llap/temp_table_drop_partitions_filter3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_drop_partitions_filter3.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_drop_partitions_filter3.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_exchange_partition.q.out b/ql/src/test/results/clientpositive/llap/temp_table_exchange_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_exchange_partition.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_exchange_partition.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_exchange_partition2.q.out b/ql/src/test/results/clientpositive/llap/temp_table_exchange_partition2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_exchange_partition2.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_exchange_partition2.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_exchange_partition3.q.out b/ql/src/test/results/clientpositive/llap/temp_table_exchange_partition3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_exchange_partition3.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_exchange_partition3.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_exchgpartition2lel.q.out b/ql/src/test/results/clientpositive/llap/temp_table_exchgpartition2lel.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_exchgpartition2lel.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_exchgpartition2lel.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_gb1.q.out b/ql/src/test/results/clientpositive/llap/temp_table_gb1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_gb1.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_gb1.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_insert_values_dynamic_partitioned.q.out b/ql/src/test/results/clientpositive/llap/temp_table_insert_values_dynamic_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_insert_values_dynamic_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_insert_values_dynamic_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_insert_values_partitioned.q.out b/ql/src/test/results/clientpositive/llap/temp_table_insert_values_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_insert_values_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_insert_values_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_insert_with_move_files_from_source_dir.q.out b/ql/src/test/results/clientpositive/llap/temp_table_insert_with_move_files_from_source_dir.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_insert_with_move_files_from_source_dir.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_insert_with_move_files_from_source_dir.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_loadpart1.q.out b/ql/src/test/results/clientpositive/llap/temp_table_loadpart1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_loadpart1.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_loadpart1.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_loadpart2.q.out b/ql/src/test/results/clientpositive/llap/temp_table_loadpart2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_loadpart2.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_loadpart2.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_multi_insert_partitioned.q.out b/ql/src/test/results/clientpositive/llap/temp_table_multi_insert_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_multi_insert_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_multi_insert_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_names.q.out b/ql/src/test/results/clientpositive/llap/temp_table_names.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_names.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_names.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_orc_diff_part_cols.q.out b/ql/src/test/results/clientpositive/llap/temp_table_orc_diff_part_cols.q.out
similarity index 90%
rename from ql/src/test/results/clientpositive/temp_table_orc_diff_part_cols.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_orc_diff_part_cols.q.out
index 41fd4f8..d45ae78 100644
--- a/ql/src/test/results/clientpositive/temp_table_orc_diff_part_cols.q.out
+++ b/ql/src/test/results/clientpositive/llap/temp_table_orc_diff_part_cols.q.out
@@ -14,11 +14,11 @@ OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat'
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@test_orc_n0_temp
-PREHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '1') SELECT key FROM src tablesample (5 rows)
+PREHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '1') SELECT key FROM src tablesample (5 rows) ORDER BY key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test_orc_n0_temp@part=1
-POSTHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '1') SELECT key FROM src tablesample (5 rows)
+POSTHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '1') SELECT key FROM src tablesample (5 rows) ORDER BY key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_orc_n0_temp@part=1
@@ -31,11 +31,11 @@ POSTHOOK: query: ALTER TABLE test_orc_n0_temp ADD COLUMNS (cnt INT)
 POSTHOOK: type: ALTERTABLE_ADDCOLS
 POSTHOOK: Input: default@test_orc_n0_temp
 POSTHOOK: Output: default@test_orc_n0_temp
-PREHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key LIMIT 5
+PREHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key ORDER BY key LIMIT 5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 PREHOOK: Output: default@test_orc_n0_temp@part=2
-POSTHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key LIMIT 5
+POSTHOOK: query: INSERT OVERWRITE TABLE test_orc_n0_temp PARTITION (part = '2') SELECT key, count(*) FROM src GROUP BY key ORDER BY key LIMIT 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_orc_n0_temp@part=2
diff --git a/ql/src/test/results/clientpositive/temp_table_orc_diff_part_cols2.q.out b/ql/src/test/results/clientpositive/llap/temp_table_orc_diff_part_cols2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_orc_diff_part_cols2.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_orc_diff_part_cols2.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_parquet_mixed_partition_formats.q.out b/ql/src/test/results/clientpositive/llap/temp_table_parquet_mixed_partition_formats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_parquet_mixed_partition_formats.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_parquet_mixed_partition_formats.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_parquet_partitioned.q.out b/ql/src/test/results/clientpositive/llap/temp_table_parquet_partitioned.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_parquet_partitioned.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_parquet_partitioned.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_parquet_ppd_partition.q.out b/ql/src/test/results/clientpositive/llap/temp_table_parquet_ppd_partition.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_parquet_ppd_partition.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_parquet_ppd_partition.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partInit.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partInit.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partInit.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partInit.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_boolean.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_char.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_char.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_char.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_char.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_date.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_date.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_date.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_date.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_decode_name.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_decode_name.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_decode_name.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_decode_name.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_schema1.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_schema1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_schema1.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_schema1.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_special_char.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_special_char.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_special_char.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_special_char.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_timestamp.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_timestamp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_timestamp.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_timestamp.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_type_check.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_type_check.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_type_check.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_type_check.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_type_in_plan.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_type_in_plan.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_type_in_plan.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_type_in_plan.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partition_wise_fileformat.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partition_wise_fileformat.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partition_wise_fileformat.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partition_wise_fileformat.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_partitions_json.q.out b/ql/src/test/results/clientpositive/llap/temp_table_partitions_json.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_partitions_json.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_partitions_json.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_precedence.q.out b/ql/src/test/results/clientpositive/llap/temp_table_precedence.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_precedence.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_precedence.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_subquery1.q.out b/ql/src/test/results/clientpositive/llap/temp_table_subquery1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_subquery1.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_subquery1.q.out
diff --git a/ql/src/test/results/clientpositive/temp_table_truncate.q.out b/ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/temp_table_truncate.q.out
rename to ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out
diff --git a/ql/src/test/results/clientpositive/testSetQueryString.q.out b/ql/src/test/results/clientpositive/llap/testSetQueryString.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/testSetQueryString.q.out
rename to ql/src/test/results/clientpositive/llap/testSetQueryString.q.out
diff --git a/ql/src/test/results/clientpositive/test_boolean_whereclause.q.out b/ql/src/test/results/clientpositive/llap/test_boolean_whereclause.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/test_boolean_whereclause.q.out
rename to ql/src/test/results/clientpositive/llap/test_boolean_whereclause.q.out
diff --git a/ql/src/test/results/clientpositive/testdataset.q.out b/ql/src/test/results/clientpositive/llap/testdataset.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/testdataset.q.out
rename to ql/src/test/results/clientpositive/llap/testdataset.q.out
diff --git a/ql/src/test/results/clientpositive/testdataset_2.q.out b/ql/src/test/results/clientpositive/llap/testdataset_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/testdataset_2.q.out
rename to ql/src/test/results/clientpositive/llap/testdataset_2.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_1.q.out b/ql/src/test/results/clientpositive/llap/timestamp_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_1.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_1.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_2.q.out b/ql/src/test/results/clientpositive/llap/timestamp_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_2.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_2.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_3.q.out b/ql/src/test/results/clientpositive/llap/timestamp_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_3.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_3.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_comparison.q.out b/ql/src/test/results/clientpositive/llap/timestamp_comparison.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_comparison.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_comparison.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_comparison2.q.out b/ql/src/test/results/clientpositive/llap/timestamp_comparison2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_comparison2.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_comparison2.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_date_only.q.out b/ql/src/test/results/clientpositive/llap/timestamp_date_only.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_date_only.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_date_only.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_dst.q.out b/ql/src/test/results/clientpositive/llap/timestamp_dst.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_dst.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_dst.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_formats.q.out b/ql/src/test/results/clientpositive/llap/timestamp_formats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_formats.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_formats.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_lazy.q.out b/ql/src/test/results/clientpositive/llap/timestamp_lazy.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_lazy.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_lazy.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_null.q.out b/ql/src/test/results/clientpositive/llap/timestamp_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_null.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_null.q.out
diff --git a/ql/src/test/results/clientpositive/timestamp_udf.q.out b/ql/src/test/results/clientpositive/llap/timestamp_udf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamp_udf.q.out
rename to ql/src/test/results/clientpositive/llap/timestamp_udf.q.out
diff --git a/ql/src/test/results/clientpositive/timestamptz_1.q.out b/ql/src/test/results/clientpositive/llap/timestamptz_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamptz_1.q.out
rename to ql/src/test/results/clientpositive/llap/timestamptz_1.q.out
diff --git a/ql/src/test/results/clientpositive/timestamptz_3.q.out b/ql/src/test/results/clientpositive/llap/timestamptz_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamptz_3.q.out
rename to ql/src/test/results/clientpositive/llap/timestamptz_3.q.out
diff --git a/ql/src/test/results/clientpositive/timestamptz_4.q.out b/ql/src/test/results/clientpositive/llap/timestamptz_4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/timestamptz_4.q.out
rename to ql/src/test/results/clientpositive/llap/timestamptz_4.q.out
diff --git a/ql/src/test/results/clientpositive/topn.q.out b/ql/src/test/results/clientpositive/llap/topn.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/topn.q.out
rename to ql/src/test/results/clientpositive/llap/topn.q.out
diff --git a/ql/src/test/results/clientpositive/touch.q.out b/ql/src/test/results/clientpositive/llap/touch.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/touch.q.out
rename to ql/src/test/results/clientpositive/llap/touch.q.out
diff --git a/ql/src/test/results/clientpositive/truncate_column.q.out b/ql/src/test/results/clientpositive/llap/truncate_column.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/truncate_column.q.out
rename to ql/src/test/results/clientpositive/llap/truncate_column.q.out
diff --git a/ql/src/test/results/clientpositive/truncate_column_merge.q.out b/ql/src/test/results/clientpositive/llap/truncate_column_merge.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/truncate_column_merge.q.out
rename to ql/src/test/results/clientpositive/llap/truncate_column_merge.q.out
diff --git a/ql/src/test/results/clientpositive/truncate_table.q.out b/ql/src/test/results/clientpositive/llap/truncate_table.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/truncate_table.q.out
rename to ql/src/test/results/clientpositive/llap/truncate_table.q.out
diff --git a/ql/src/test/results/clientpositive/tumbled_window_tests.q.out b/ql/src/test/results/clientpositive/llap/tumbled_window_tests.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/tumbled_window_tests.q.out
rename to ql/src/test/results/clientpositive/llap/tumbled_window_tests.q.out
diff --git a/ql/src/test/results/clientpositive/tunable_ndv.q.out b/ql/src/test/results/clientpositive/llap/tunable_ndv.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/tunable_ndv.q.out
rename to ql/src/test/results/clientpositive/llap/tunable_ndv.q.out
diff --git a/ql/src/test/results/clientpositive/type_change_test_fraction.q.out b/ql/src/test/results/clientpositive/llap/type_change_test_fraction.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/type_change_test_fraction.q.out
rename to ql/src/test/results/clientpositive/llap/type_change_test_fraction.q.out
diff --git a/ql/src/test/results/clientpositive/type_change_test_int.q.out b/ql/src/test/results/clientpositive/llap/type_change_test_int.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/type_change_test_int.q.out
rename to ql/src/test/results/clientpositive/llap/type_change_test_int.q.out
diff --git a/ql/src/test/results/clientpositive/type_conversions_1.q.out b/ql/src/test/results/clientpositive/llap/type_conversions_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/type_conversions_1.q.out
rename to ql/src/test/results/clientpositive/llap/type_conversions_1.q.out
diff --git a/ql/src/test/results/clientpositive/udaf_collect_set.q.out b/ql/src/test/results/clientpositive/llap/udaf_collect_set.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udaf_collect_set.q.out
rename to ql/src/test/results/clientpositive/llap/udaf_collect_set.q.out
diff --git a/ql/src/test/results/clientpositive/udaf_covar_pop.q.out b/ql/src/test/results/clientpositive/llap/udaf_covar_pop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udaf_covar_pop.q.out
rename to ql/src/test/results/clientpositive/llap/udaf_covar_pop.q.out
diff --git a/ql/src/test/results/clientpositive/udaf_covar_samp.q.out b/ql/src/test/results/clientpositive/llap/udaf_covar_samp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udaf_covar_samp.q.out
rename to ql/src/test/results/clientpositive/llap/udaf_covar_samp.q.out
diff --git a/ql/src/test/results/clientpositive/udaf_ngrams.q.out b/ql/src/test/results/clientpositive/llap/udaf_ngrams.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udaf_ngrams.q.out
rename to ql/src/test/results/clientpositive/llap/udaf_ngrams.q.out
diff --git a/ql/src/test/results/clientpositive/udaf_percentile.q.out b/ql/src/test/results/clientpositive/llap/udaf_percentile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udaf_percentile.q.out
rename to ql/src/test/results/clientpositive/llap/udaf_percentile.q.out
diff --git a/ql/src/test/results/clientpositive/udf_acos.q.out b/ql/src/test/results/clientpositive/llap/udf_acos.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_acos.q.out
rename to ql/src/test/results/clientpositive/llap/udf_acos.q.out
diff --git a/ql/src/test/results/clientpositive/udf_add.q.out b/ql/src/test/results/clientpositive/llap/udf_add.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_add.q.out
rename to ql/src/test/results/clientpositive/llap/udf_add.q.out
diff --git a/ql/src/test/results/clientpositive/udf_array_contains.q.out b/ql/src/test/results/clientpositive/llap/udf_array_contains.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_array_contains.q.out
rename to ql/src/test/results/clientpositive/llap/udf_array_contains.q.out
diff --git a/ql/src/test/results/clientpositive/udf_asin.q.out b/ql/src/test/results/clientpositive/llap/udf_asin.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_asin.q.out
rename to ql/src/test/results/clientpositive/llap/udf_asin.q.out
diff --git a/ql/src/test/results/clientpositive/udf_atan.q.out b/ql/src/test/results/clientpositive/llap/udf_atan.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_atan.q.out
rename to ql/src/test/results/clientpositive/llap/udf_atan.q.out
diff --git a/ql/src/test/results/clientpositive/udf_avg.q.out b/ql/src/test/results/clientpositive/llap/udf_avg.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_avg.q.out
rename to ql/src/test/results/clientpositive/llap/udf_avg.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bigint.q.out b/ql/src/test/results/clientpositive/llap/udf_bigint.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bigint.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bigint.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bin.q.out b/ql/src/test/results/clientpositive/llap/udf_bin.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bin.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bin.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bitwise_and.q.out b/ql/src/test/results/clientpositive/llap/udf_bitwise_and.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bitwise_and.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bitwise_and.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bitwise_not.q.out b/ql/src/test/results/clientpositive/llap/udf_bitwise_not.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bitwise_not.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bitwise_not.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bitwise_or.q.out b/ql/src/test/results/clientpositive/llap/udf_bitwise_or.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bitwise_or.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bitwise_or.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bitwise_xor.q.out b/ql/src/test/results/clientpositive/llap/udf_bitwise_xor.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bitwise_xor.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bitwise_xor.q.out
diff --git a/ql/src/test/results/clientpositive/udf_boolean.q.out b/ql/src/test/results/clientpositive/llap/udf_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/udf_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/udf_bround.q.out b/ql/src/test/results/clientpositive/llap/udf_bround.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_bround.q.out
rename to ql/src/test/results/clientpositive/llap/udf_bround.q.out
diff --git a/ql/src/test/results/clientpositive/udf_ceil.q.out b/ql/src/test/results/clientpositive/llap/udf_ceil.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_ceil.q.out
rename to ql/src/test/results/clientpositive/llap/udf_ceil.q.out
diff --git a/ql/src/test/results/clientpositive/udf_ceiling.q.out b/ql/src/test/results/clientpositive/llap/udf_ceiling.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_ceiling.q.out
rename to ql/src/test/results/clientpositive/llap/udf_ceiling.q.out
diff --git a/ql/src/test/results/clientpositive/udf_chr.q.out b/ql/src/test/results/clientpositive/llap/udf_chr.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_chr.q.out
rename to ql/src/test/results/clientpositive/llap/udf_chr.q.out
diff --git a/ql/src/test/results/clientpositive/udf_classloader.q.out b/ql/src/test/results/clientpositive/llap/udf_classloader.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_classloader.q.out
rename to ql/src/test/results/clientpositive/llap/udf_classloader.q.out
diff --git a/ql/src/test/results/clientpositive/udf_classloader_dynamic_dependency_resolution.q.out b/ql/src/test/results/clientpositive/llap/udf_classloader_dynamic_dependency_resolution.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_classloader_dynamic_dependency_resolution.q.out
rename to ql/src/test/results/clientpositive/llap/udf_classloader_dynamic_dependency_resolution.q.out
diff --git a/ql/src/test/results/clientpositive/udf_compare_java_string.q.out b/ql/src/test/results/clientpositive/llap/udf_compare_java_string.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_compare_java_string.q.out
rename to ql/src/test/results/clientpositive/llap/udf_compare_java_string.q.out
diff --git a/ql/src/test/results/clientpositive/udf_concat.q.out b/ql/src/test/results/clientpositive/llap/udf_concat.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_concat.q.out
rename to ql/src/test/results/clientpositive/llap/udf_concat.q.out
diff --git a/ql/src/test/results/clientpositive/udf_concat_insert2.q.out b/ql/src/test/results/clientpositive/llap/udf_concat_insert2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_concat_insert2.q.out
rename to ql/src/test/results/clientpositive/llap/udf_concat_insert2.q.out
diff --git a/ql/src/test/results/clientpositive/udf_conv.q.out b/ql/src/test/results/clientpositive/llap/udf_conv.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_conv.q.out
rename to ql/src/test/results/clientpositive/llap/udf_conv.q.out
diff --git a/ql/src/test/results/clientpositive/udf_cos.q.out b/ql/src/test/results/clientpositive/llap/udf_cos.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_cos.q.out
rename to ql/src/test/results/clientpositive/llap/udf_cos.q.out
diff --git a/ql/src/test/results/clientpositive/udf_current_user.q.out b/ql/src/test/results/clientpositive/llap/udf_current_user.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_current_user.q.out
rename to ql/src/test/results/clientpositive/llap/udf_current_user.q.out
diff --git a/ql/src/test/results/clientpositive/udf_date_add.q.out b/ql/src/test/results/clientpositive/llap/udf_date_add.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_date_add.q.out
rename to ql/src/test/results/clientpositive/llap/udf_date_add.q.out
diff --git a/ql/src/test/results/clientpositive/udf_date_sub.q.out b/ql/src/test/results/clientpositive/llap/udf_date_sub.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_date_sub.q.out
rename to ql/src/test/results/clientpositive/llap/udf_date_sub.q.out
diff --git a/ql/src/test/results/clientpositive/udf_datediff.q.out b/ql/src/test/results/clientpositive/llap/udf_datediff.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_datediff.q.out
rename to ql/src/test/results/clientpositive/llap/udf_datediff.q.out
diff --git a/ql/src/test/results/clientpositive/udf_day.q.out b/ql/src/test/results/clientpositive/llap/udf_day.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_day.q.out
rename to ql/src/test/results/clientpositive/llap/udf_day.q.out
diff --git a/ql/src/test/results/clientpositive/udf_dayofmonth.q.out b/ql/src/test/results/clientpositive/llap/udf_dayofmonth.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_dayofmonth.q.out
rename to ql/src/test/results/clientpositive/llap/udf_dayofmonth.q.out
diff --git a/ql/src/test/results/clientpositive/udf_div.q.out b/ql/src/test/results/clientpositive/llap/udf_div.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_div.q.out
rename to ql/src/test/results/clientpositive/llap/udf_div.q.out
diff --git a/ql/src/test/results/clientpositive/udf_divide.q.out b/ql/src/test/results/clientpositive/llap/udf_divide.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_divide.q.out
rename to ql/src/test/results/clientpositive/llap/udf_divide.q.out
diff --git a/ql/src/test/results/clientpositive/udf_double.q.out b/ql/src/test/results/clientpositive/llap/udf_double.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_double.q.out
rename to ql/src/test/results/clientpositive/llap/udf_double.q.out
diff --git a/ql/src/test/results/clientpositive/udf_equal.q.out b/ql/src/test/results/clientpositive/llap/udf_equal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_equal.q.out
rename to ql/src/test/results/clientpositive/llap/udf_equal.q.out
diff --git a/ql/src/test/results/clientpositive/udf_exp.q.out b/ql/src/test/results/clientpositive/llap/udf_exp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_exp.q.out
rename to ql/src/test/results/clientpositive/llap/udf_exp.q.out
diff --git a/ql/src/test/results/clientpositive/udf_field.q.out b/ql/src/test/results/clientpositive/llap/udf_field.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_field.q.out
rename to ql/src/test/results/clientpositive/llap/udf_field.q.out
diff --git a/ql/src/test/results/clientpositive/udf_float.q.out b/ql/src/test/results/clientpositive/llap/udf_float.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_float.q.out
rename to ql/src/test/results/clientpositive/llap/udf_float.q.out
diff --git a/ql/src/test/results/clientpositive/udf_floor.q.out b/ql/src/test/results/clientpositive/llap/udf_floor.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_floor.q.out
rename to ql/src/test/results/clientpositive/llap/udf_floor.q.out
diff --git a/ql/src/test/results/clientpositive/udf_from_unixtime.q.out b/ql/src/test/results/clientpositive/llap/udf_from_unixtime.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_from_unixtime.q.out
rename to ql/src/test/results/clientpositive/llap/udf_from_unixtime.q.out
diff --git a/ql/src/test/results/clientpositive/udf_greaterthan.q.out b/ql/src/test/results/clientpositive/llap/udf_greaterthan.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_greaterthan.q.out
rename to ql/src/test/results/clientpositive/llap/udf_greaterthan.q.out
diff --git a/ql/src/test/results/clientpositive/udf_greaterthanorequal.q.out b/ql/src/test/results/clientpositive/llap/udf_greaterthanorequal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_greaterthanorequal.q.out
rename to ql/src/test/results/clientpositive/llap/udf_greaterthanorequal.q.out
diff --git a/ql/src/test/results/clientpositive/udf_hex.q.out b/ql/src/test/results/clientpositive/llap/udf_hex.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_hex.q.out
rename to ql/src/test/results/clientpositive/llap/udf_hex.q.out
diff --git a/ql/src/test/results/clientpositive/udf_in.q.out b/ql/src/test/results/clientpositive/llap/udf_in.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_in.q.out
rename to ql/src/test/results/clientpositive/llap/udf_in.q.out
diff --git a/ql/src/test/results/clientpositive/udf_index.q.out b/ql/src/test/results/clientpositive/llap/udf_index.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_index.q.out
rename to ql/src/test/results/clientpositive/llap/udf_index.q.out
diff --git a/ql/src/test/results/clientpositive/udf_initcap.q.out b/ql/src/test/results/clientpositive/llap/udf_initcap.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_initcap.q.out
rename to ql/src/test/results/clientpositive/llap/udf_initcap.q.out
diff --git a/ql/src/test/results/clientpositive/udf_int.q.out b/ql/src/test/results/clientpositive/llap/udf_int.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_int.q.out
rename to ql/src/test/results/clientpositive/llap/udf_int.q.out
diff --git a/ql/src/test/results/clientpositive/udf_isnotnull.q.out b/ql/src/test/results/clientpositive/llap/udf_isnotnull.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_isnotnull.q.out
rename to ql/src/test/results/clientpositive/llap/udf_isnotnull.q.out
diff --git a/ql/src/test/results/clientpositive/udf_isnull.q.out b/ql/src/test/results/clientpositive/llap/udf_isnull.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_isnull.q.out
rename to ql/src/test/results/clientpositive/llap/udf_isnull.q.out
diff --git a/ql/src/test/results/clientpositive/udf_isops.q.out b/ql/src/test/results/clientpositive/llap/udf_isops.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_isops.q.out
rename to ql/src/test/results/clientpositive/llap/udf_isops.q.out
diff --git a/ql/src/test/results/clientpositive/udf_json_read.q.out b/ql/src/test/results/clientpositive/llap/udf_json_read.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_json_read.q.out
rename to ql/src/test/results/clientpositive/llap/udf_json_read.q.out
diff --git a/ql/src/test/results/clientpositive/udf_lcase.q.out b/ql/src/test/results/clientpositive/llap/udf_lcase.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_lcase.q.out
rename to ql/src/test/results/clientpositive/llap/udf_lcase.q.out
diff --git a/ql/src/test/results/clientpositive/udf_lessthan.q.out b/ql/src/test/results/clientpositive/llap/udf_lessthan.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_lessthan.q.out
rename to ql/src/test/results/clientpositive/llap/udf_lessthan.q.out
diff --git a/ql/src/test/results/clientpositive/udf_lessthanorequal.q.out b/ql/src/test/results/clientpositive/llap/udf_lessthanorequal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_lessthanorequal.q.out
rename to ql/src/test/results/clientpositive/llap/udf_lessthanorequal.q.out
diff --git a/ql/src/test/results/clientpositive/udf_likeall.q.out b/ql/src/test/results/clientpositive/llap/udf_likeall.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_likeall.q.out
rename to ql/src/test/results/clientpositive/llap/udf_likeall.q.out
diff --git a/ql/src/test/results/clientpositive/udf_likeany.q.out b/ql/src/test/results/clientpositive/llap/udf_likeany.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_likeany.q.out
rename to ql/src/test/results/clientpositive/llap/udf_likeany.q.out
diff --git a/ql/src/test/results/clientpositive/udf_ln.q.out b/ql/src/test/results/clientpositive/llap/udf_ln.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_ln.q.out
rename to ql/src/test/results/clientpositive/llap/udf_ln.q.out
diff --git a/ql/src/test/results/clientpositive/udf_log.q.out b/ql/src/test/results/clientpositive/llap/udf_log.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_log.q.out
rename to ql/src/test/results/clientpositive/llap/udf_log.q.out
diff --git a/ql/src/test/results/clientpositive/udf_log10.q.out b/ql/src/test/results/clientpositive/llap/udf_log10.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_log10.q.out
rename to ql/src/test/results/clientpositive/llap/udf_log10.q.out
diff --git a/ql/src/test/results/clientpositive/udf_log2.q.out b/ql/src/test/results/clientpositive/llap/udf_log2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_log2.q.out
rename to ql/src/test/results/clientpositive/llap/udf_log2.q.out
diff --git a/ql/src/test/results/clientpositive/udf_logged_in_user.q.out b/ql/src/test/results/clientpositive/llap/udf_logged_in_user.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_logged_in_user.q.out
rename to ql/src/test/results/clientpositive/llap/udf_logged_in_user.q.out
diff --git a/ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out b/ql/src/test/results/clientpositive/llap/udf_logic_java_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/udf_logic_java_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/udf_ltrim.q.out b/ql/src/test/results/clientpositive/llap/udf_ltrim.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_ltrim.q.out
rename to ql/src/test/results/clientpositive/llap/udf_ltrim.q.out
diff --git a/ql/src/test/results/clientpositive/udf_map_keys.q.out b/ql/src/test/results/clientpositive/llap/udf_map_keys.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_map_keys.q.out
rename to ql/src/test/results/clientpositive/llap/udf_map_keys.q.out
diff --git a/ql/src/test/results/clientpositive/udf_map_values.q.out b/ql/src/test/results/clientpositive/llap/udf_map_values.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_map_values.q.out
rename to ql/src/test/results/clientpositive/llap/udf_map_values.q.out
diff --git a/ql/src/test/results/clientpositive/udf_max.q.out b/ql/src/test/results/clientpositive/llap/udf_max.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_max.q.out
rename to ql/src/test/results/clientpositive/llap/udf_max.q.out
diff --git a/ql/src/test/results/clientpositive/udf_mid.q.out b/ql/src/test/results/clientpositive/llap/udf_mid.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_mid.q.out
rename to ql/src/test/results/clientpositive/llap/udf_mid.q.out
diff --git a/ql/src/test/results/clientpositive/udf_min.q.out b/ql/src/test/results/clientpositive/llap/udf_min.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_min.q.out
rename to ql/src/test/results/clientpositive/llap/udf_min.q.out
diff --git a/ql/src/test/results/clientpositive/udf_modulo.q.out b/ql/src/test/results/clientpositive/llap/udf_modulo.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_modulo.q.out
rename to ql/src/test/results/clientpositive/llap/udf_modulo.q.out
diff --git a/ql/src/test/results/clientpositive/udf_month.q.out b/ql/src/test/results/clientpositive/llap/udf_month.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_month.q.out
rename to ql/src/test/results/clientpositive/llap/udf_month.q.out
diff --git a/ql/src/test/results/clientpositive/udf_negative.q.out b/ql/src/test/results/clientpositive/llap/udf_negative.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_negative.q.out
rename to ql/src/test/results/clientpositive/llap/udf_negative.q.out
diff --git a/ql/src/test/results/clientpositive/udf_not.q.out b/ql/src/test/results/clientpositive/llap/udf_not.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_not.q.out
rename to ql/src/test/results/clientpositive/llap/udf_not.q.out
diff --git a/ql/src/test/results/clientpositive/udf_notop.q.out b/ql/src/test/results/clientpositive/llap/udf_notop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_notop.q.out
rename to ql/src/test/results/clientpositive/llap/udf_notop.q.out
diff --git a/ql/src/test/results/clientpositive/udf_or.q.out b/ql/src/test/results/clientpositive/llap/udf_or.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_or.q.out
rename to ql/src/test/results/clientpositive/llap/udf_or.q.out
diff --git a/ql/src/test/results/clientpositive/udf_percentile.q.out b/ql/src/test/results/clientpositive/llap/udf_percentile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_percentile.q.out
rename to ql/src/test/results/clientpositive/llap/udf_percentile.q.out
diff --git a/ql/src/test/results/clientpositive/udf_pmod.q.out b/ql/src/test/results/clientpositive/llap/udf_pmod.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_pmod.q.out
rename to ql/src/test/results/clientpositive/llap/udf_pmod.q.out
diff --git a/ql/src/test/results/clientpositive/udf_positive.q.out b/ql/src/test/results/clientpositive/llap/udf_positive.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_positive.q.out
rename to ql/src/test/results/clientpositive/llap/udf_positive.q.out
diff --git a/ql/src/test/results/clientpositive/udf_pow.q.out b/ql/src/test/results/clientpositive/llap/udf_pow.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_pow.q.out
rename to ql/src/test/results/clientpositive/llap/udf_pow.q.out
diff --git a/ql/src/test/results/clientpositive/udf_power.q.out b/ql/src/test/results/clientpositive/llap/udf_power.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_power.q.out
rename to ql/src/test/results/clientpositive/llap/udf_power.q.out
diff --git a/ql/src/test/results/clientpositive/udf_rand.q.out b/ql/src/test/results/clientpositive/llap/udf_rand.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_rand.q.out
rename to ql/src/test/results/clientpositive/llap/udf_rand.q.out
diff --git a/ql/src/test/results/clientpositive/udf_regexp.q.out b/ql/src/test/results/clientpositive/llap/udf_regexp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_regexp.q.out
rename to ql/src/test/results/clientpositive/llap/udf_regexp.q.out
diff --git a/ql/src/test/results/clientpositive/udf_regexp_extract.q.out b/ql/src/test/results/clientpositive/llap/udf_regexp_extract.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_regexp_extract.q.out
rename to ql/src/test/results/clientpositive/llap/udf_regexp_extract.q.out
diff --git a/ql/src/test/results/clientpositive/udf_regexp_replace.q.out b/ql/src/test/results/clientpositive/llap/udf_regexp_replace.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_regexp_replace.q.out
rename to ql/src/test/results/clientpositive/llap/udf_regexp_replace.q.out
diff --git a/ql/src/test/results/clientpositive/udf_replace.q.out b/ql/src/test/results/clientpositive/llap/udf_replace.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_replace.q.out
rename to ql/src/test/results/clientpositive/llap/udf_replace.q.out
diff --git a/ql/src/test/results/clientpositive/udf_rlike.q.out b/ql/src/test/results/clientpositive/llap/udf_rlike.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_rlike.q.out
rename to ql/src/test/results/clientpositive/llap/udf_rlike.q.out
diff --git a/ql/src/test/results/clientpositive/udf_round.q.out b/ql/src/test/results/clientpositive/llap/udf_round.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_round.q.out
rename to ql/src/test/results/clientpositive/llap/udf_round.q.out
diff --git a/ql/src/test/results/clientpositive/udf_round_2.q.out b/ql/src/test/results/clientpositive/llap/udf_round_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_round_2.q.out
rename to ql/src/test/results/clientpositive/llap/udf_round_2.q.out
diff --git a/ql/src/test/results/clientpositive/udf_round_2_auto_stats.q.out b/ql/src/test/results/clientpositive/llap/udf_round_2_auto_stats.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_round_2_auto_stats.q.out
rename to ql/src/test/results/clientpositive/llap/udf_round_2_auto_stats.q.out
diff --git a/ql/src/test/results/clientpositive/udf_round_3.q.out b/ql/src/test/results/clientpositive/llap/udf_round_3.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_round_3.q.out
rename to ql/src/test/results/clientpositive/llap/udf_round_3.q.out
diff --git a/ql/src/test/results/clientpositive/udf_rtrim.q.out b/ql/src/test/results/clientpositive/llap/udf_rtrim.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_rtrim.q.out
rename to ql/src/test/results/clientpositive/llap/udf_rtrim.q.out
diff --git a/ql/src/test/results/clientpositive/udf_sentences.q.out b/ql/src/test/results/clientpositive/llap/udf_sentences.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_sentences.q.out
rename to ql/src/test/results/clientpositive/llap/udf_sentences.q.out
diff --git a/ql/src/test/results/clientpositive/udf_sin.q.out b/ql/src/test/results/clientpositive/llap/udf_sin.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_sin.q.out
rename to ql/src/test/results/clientpositive/llap/udf_sin.q.out
diff --git a/ql/src/test/results/clientpositive/udf_smallint.q.out b/ql/src/test/results/clientpositive/llap/udf_smallint.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_smallint.q.out
rename to ql/src/test/results/clientpositive/llap/udf_smallint.q.out
diff --git a/ql/src/test/results/clientpositive/udf_sqrt.q.out b/ql/src/test/results/clientpositive/llap/udf_sqrt.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_sqrt.q.out
rename to ql/src/test/results/clientpositive/llap/udf_sqrt.q.out
diff --git a/ql/src/test/results/clientpositive/udf_std.q.out b/ql/src/test/results/clientpositive/llap/udf_std.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_std.q.out
rename to ql/src/test/results/clientpositive/llap/udf_std.q.out
diff --git a/ql/src/test/results/clientpositive/udf_stddev.q.out b/ql/src/test/results/clientpositive/llap/udf_stddev.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_stddev.q.out
rename to ql/src/test/results/clientpositive/llap/udf_stddev.q.out
diff --git a/ql/src/test/results/clientpositive/udf_stddev_pop.q.out b/ql/src/test/results/clientpositive/llap/udf_stddev_pop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_stddev_pop.q.out
rename to ql/src/test/results/clientpositive/llap/udf_stddev_pop.q.out
diff --git a/ql/src/test/results/clientpositive/udf_stddev_samp.q.out b/ql/src/test/results/clientpositive/llap/udf_stddev_samp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_stddev_samp.q.out
rename to ql/src/test/results/clientpositive/llap/udf_stddev_samp.q.out
diff --git a/ql/src/test/results/clientpositive/udf_string.q.out b/ql/src/test/results/clientpositive/llap/udf_string.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_string.q.out
rename to ql/src/test/results/clientpositive/llap/udf_string.q.out
diff --git a/ql/src/test/results/clientpositive/udf_substr.q.out b/ql/src/test/results/clientpositive/llap/udf_substr.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_substr.q.out
rename to ql/src/test/results/clientpositive/llap/udf_substr.q.out
diff --git a/ql/src/test/results/clientpositive/udf_substring.q.out b/ql/src/test/results/clientpositive/llap/udf_substring.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_substring.q.out
rename to ql/src/test/results/clientpositive/llap/udf_substring.q.out
diff --git a/ql/src/test/results/clientpositive/udf_subtract.q.out b/ql/src/test/results/clientpositive/llap/udf_subtract.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_subtract.q.out
rename to ql/src/test/results/clientpositive/llap/udf_subtract.q.out
diff --git a/ql/src/test/results/clientpositive/udf_sum.q.out b/ql/src/test/results/clientpositive/llap/udf_sum.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_sum.q.out
rename to ql/src/test/results/clientpositive/llap/udf_sum.q.out
diff --git a/ql/src/test/results/clientpositive/udf_tan.q.out b/ql/src/test/results/clientpositive/llap/udf_tan.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_tan.q.out
rename to ql/src/test/results/clientpositive/llap/udf_tan.q.out
diff --git a/ql/src/test/results/clientpositive/udf_testlength.q.out b/ql/src/test/results/clientpositive/llap/udf_testlength.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_testlength.q.out
rename to ql/src/test/results/clientpositive/llap/udf_testlength.q.out
diff --git a/ql/src/test/results/clientpositive/udf_testlength2.q.out b/ql/src/test/results/clientpositive/llap/udf_testlength2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_testlength2.q.out
rename to ql/src/test/results/clientpositive/llap/udf_testlength2.q.out
diff --git a/ql/src/test/results/clientpositive/udf_tinyint.q.out b/ql/src/test/results/clientpositive/llap/udf_tinyint.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_tinyint.q.out
rename to ql/src/test/results/clientpositive/llap/udf_tinyint.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_boolean.q.out b/ql/src/test/results/clientpositive/llap/udf_to_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_byte.q.out b/ql/src/test/results/clientpositive/llap/udf_to_byte.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_byte.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_byte.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_date.q.out b/ql/src/test/results/clientpositive/llap/udf_to_date.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_date.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_date.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_double.q.out b/ql/src/test/results/clientpositive/llap/udf_to_double.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_double.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_double.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_float.q.out b/ql/src/test/results/clientpositive/llap/udf_to_float.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_float.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_float.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_long.q.out b/ql/src/test/results/clientpositive/llap/udf_to_long.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_long.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_long.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_short.q.out b/ql/src/test/results/clientpositive/llap/udf_to_short.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_short.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_short.q.out
diff --git a/ql/src/test/results/clientpositive/udf_to_string.q.out b/ql/src/test/results/clientpositive/llap/udf_to_string.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_to_string.q.out
rename to ql/src/test/results/clientpositive/llap/udf_to_string.q.out
diff --git a/ql/src/test/results/clientpositive/udf_translate.q.out b/ql/src/test/results/clientpositive/llap/udf_translate.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_translate.q.out
rename to ql/src/test/results/clientpositive/llap/udf_translate.q.out
diff --git a/ql/src/test/results/clientpositive/udf_trim.q.out b/ql/src/test/results/clientpositive/llap/udf_trim.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_trim.q.out
rename to ql/src/test/results/clientpositive/llap/udf_trim.q.out
diff --git a/ql/src/test/results/clientpositive/udf_ucase.q.out b/ql/src/test/results/clientpositive/llap/udf_ucase.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_ucase.q.out
rename to ql/src/test/results/clientpositive/llap/udf_ucase.q.out
diff --git a/ql/src/test/results/clientpositive/udf_unhex.q.out b/ql/src/test/results/clientpositive/llap/udf_unhex.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_unhex.q.out
rename to ql/src/test/results/clientpositive/llap/udf_unhex.q.out
diff --git a/ql/src/test/results/clientpositive/udf_upper.q.out b/ql/src/test/results/clientpositive/llap/udf_upper.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_upper.q.out
rename to ql/src/test/results/clientpositive/llap/udf_upper.q.out
diff --git a/ql/src/test/results/clientpositive/udf_var_pop.q.out b/ql/src/test/results/clientpositive/llap/udf_var_pop.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_var_pop.q.out
rename to ql/src/test/results/clientpositive/llap/udf_var_pop.q.out
diff --git a/ql/src/test/results/clientpositive/udf_var_samp.q.out b/ql/src/test/results/clientpositive/llap/udf_var_samp.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_var_samp.q.out
rename to ql/src/test/results/clientpositive/llap/udf_var_samp.q.out
diff --git a/ql/src/test/results/clientpositive/udf_variance.q.out b/ql/src/test/results/clientpositive/llap/udf_variance.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_variance.q.out
rename to ql/src/test/results/clientpositive/llap/udf_variance.q.out
diff --git a/ql/src/test/results/clientpositive/udf_version.q.out b/ql/src/test/results/clientpositive/llap/udf_version.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_version.q.out
rename to ql/src/test/results/clientpositive/llap/udf_version.q.out
diff --git a/ql/src/test/results/clientpositive/udf_weekofyear.q.out b/ql/src/test/results/clientpositive/llap/udf_weekofyear.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_weekofyear.q.out
rename to ql/src/test/results/clientpositive/llap/udf_weekofyear.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_boolean.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_boolean.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_boolean.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_boolean.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_double.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_double.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_double.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_double.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_float.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_float.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_float.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_float.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_int.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_int.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_int.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_int.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_long.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_long.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_long.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_long.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_short.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_short.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_short.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_short.q.out
diff --git a/ql/src/test/results/clientpositive/udf_xpath_string.q.out b/ql/src/test/results/clientpositive/llap/udf_xpath_string.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_xpath_string.q.out
rename to ql/src/test/results/clientpositive/llap/udf_xpath_string.q.out
diff --git a/ql/src/test/results/clientpositive/udf_year.q.out b/ql/src/test/results/clientpositive/llap/udf_year.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udf_year.q.out
rename to ql/src/test/results/clientpositive/llap/udf_year.q.out
diff --git a/ql/src/test/results/clientpositive/udtf_nofetchtask.q.out b/ql/src/test/results/clientpositive/llap/udtf_nofetchtask.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udtf_nofetchtask.q.out
rename to ql/src/test/results/clientpositive/llap/udtf_nofetchtask.q.out
diff --git a/ql/src/test/results/clientpositive/udtf_posexplode.q.out b/ql/src/test/results/clientpositive/llap/udtf_posexplode.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udtf_posexplode.q.out
rename to ql/src/test/results/clientpositive/llap/udtf_posexplode.q.out
diff --git a/ql/src/test/results/clientpositive/udtf_replicate_rows.q.out b/ql/src/test/results/clientpositive/llap/udtf_replicate_rows.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/udtf_replicate_rows.q.out
rename to ql/src/test/results/clientpositive/llap/udtf_replicate_rows.q.out
diff --git a/ql/src/test/results/clientpositive/unicode_notation.q.out b/ql/src/test/results/clientpositive/llap/unicode_notation.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/unicode_notation.q.out
rename to ql/src/test/results/clientpositive/llap/unicode_notation.q.out
diff --git a/ql/src/test/results/clientpositive/union36.q.out b/ql/src/test/results/clientpositive/llap/union36.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/union36.q.out
rename to ql/src/test/results/clientpositive/llap/union36.q.out
diff --git a/ql/src/test/results/clientpositive/union38.q.out b/ql/src/test/results/clientpositive/llap/union38.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/union38.q.out
rename to ql/src/test/results/clientpositive/llap/union38.q.out
diff --git a/ql/src/test/results/clientpositive/union_date.q.out b/ql/src/test/results/clientpositive/llap/union_date.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/union_date.q.out
rename to ql/src/test/results/clientpositive/llap/union_date.q.out
diff --git a/ql/src/test/results/clientpositive/union_date_trim.q.out b/ql/src/test/results/clientpositive/llap/union_date_trim.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/union_date_trim.q.out
rename to ql/src/test/results/clientpositive/llap/union_date_trim.q.out
diff --git a/ql/src/test/results/clientpositive/union_null.q.out b/ql/src/test/results/clientpositive/llap/union_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/union_null.q.out
rename to ql/src/test/results/clientpositive/llap/union_null.q.out
diff --git a/ql/src/test/results/clientpositive/unionall_join_nullconstant.q.out b/ql/src/test/results/clientpositive/llap/unionall_join_nullconstant.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/unionall_join_nullconstant.q.out
rename to ql/src/test/results/clientpositive/llap/unionall_join_nullconstant.q.out
diff --git a/ql/src/test/results/clientpositive/unionall_lateralview1.q.out b/ql/src/test/results/clientpositive/llap/unionall_lateralview1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/unionall_lateralview1.q.out
rename to ql/src/test/results/clientpositive/llap/unionall_lateralview1.q.out
diff --git a/ql/src/test/results/clientpositive/unset_table_view_property.q.out b/ql/src/test/results/clientpositive/llap/unset_table_view_property.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/unset_table_view_property.q.out
rename to ql/src/test/results/clientpositive/llap/unset_table_view_property.q.out
diff --git a/ql/src/test/results/clientpositive/updateAccessTime.q.out b/ql/src/test/results/clientpositive/llap/updateAccessTime.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/updateAccessTime.q.out
rename to ql/src/test/results/clientpositive/llap/updateAccessTime.q.out
diff --git a/ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out b/ql/src/test/results/clientpositive/llap/update_after_multiple_inserts_special_characters.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/update_after_multiple_inserts_special_characters.q.out
rename to ql/src/test/results/clientpositive/llap/update_after_multiple_inserts_special_characters.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_1.q.out b/ql/src/test/results/clientpositive/llap/varchar_1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_1.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_1.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_2.q.out b/ql/src/test/results/clientpositive/llap/varchar_2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_2.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_2.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_cast.q.out b/ql/src/test/results/clientpositive/llap/varchar_cast.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_cast.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_cast.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_comparison.q.out b/ql/src/test/results/clientpositive/llap/varchar_comparison.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_comparison.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_comparison.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_join1.q.out b/ql/src/test/results/clientpositive/llap/varchar_join1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_join1.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_join1.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_nested_types.q.out b/ql/src/test/results/clientpositive/llap/varchar_nested_types.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_nested_types.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_nested_types.q.out
diff --git a/ql/src/test/results/clientpositive/varchar_union1.q.out b/ql/src/test/results/clientpositive/llap/varchar_union1.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/varchar_union1.q.out
rename to ql/src/test/results/clientpositive/llap/varchar_union1.q.out
diff --git a/ql/src/test/results/clientpositive/vector_join.q.out b/ql/src/test/results/clientpositive/llap/vector_join.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/vector_join.q.out
rename to ql/src/test/results/clientpositive/llap/vector_join.q.out
diff --git a/ql/src/test/results/clientpositive/vector_orc_string_reader_empty_dict.q.out b/ql/src/test/results/clientpositive/llap/vector_orc_string_reader_empty_dict.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/vector_orc_string_reader_empty_dict.q.out
rename to ql/src/test/results/clientpositive/llap/vector_orc_string_reader_empty_dict.q.out
diff --git a/ql/src/test/results/clientpositive/vectorization_escape_crlf.q.out b/ql/src/test/results/clientpositive/llap/vectorization_escape_crlf.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/vectorization_escape_crlf.q.out
rename to ql/src/test/results/clientpositive/llap/vectorization_escape_crlf.q.out
diff --git a/ql/src/test/results/clientpositive/view.q.out b/ql/src/test/results/clientpositive/llap/view.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/view.q.out
rename to ql/src/test/results/clientpositive/llap/view.q.out
diff --git a/ql/src/test/results/clientpositive/view_authorization_sqlstd.q.out b/ql/src/test/results/clientpositive/llap/view_authorization_sqlstd.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/view_authorization_sqlstd.q.out
rename to ql/src/test/results/clientpositive/llap/view_authorization_sqlstd.q.out
diff --git a/ql/src/test/results/clientpositive/view_cast.q.out b/ql/src/test/results/clientpositive/llap/view_cast.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/view_cast.q.out
rename to ql/src/test/results/clientpositive/llap/view_cast.q.out
diff --git a/ql/src/test/results/clientpositive/view_inputs.q.out b/ql/src/test/results/clientpositive/llap/view_inputs.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/view_inputs.q.out
rename to ql/src/test/results/clientpositive/llap/view_inputs.q.out
diff --git a/ql/src/test/results/clientpositive/virtual_column.q.out b/ql/src/test/results/clientpositive/llap/virtual_column.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/virtual_column.q.out
rename to ql/src/test/results/clientpositive/llap/virtual_column.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_adjust_rowcontainer_sz.q.out b/ql/src/test/results/clientpositive/llap/windowing_adjust_rowcontainer_sz.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_adjust_rowcontainer_sz.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_adjust_rowcontainer_sz.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_columnPruning.q.out b/ql/src/test/results/clientpositive/llap/windowing_columnPruning.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_columnPruning.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_columnPruning.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_decimal.q.out b/ql/src/test/results/clientpositive/llap/windowing_decimal.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_decimal.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_decimal.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_distinct.q.out b/ql/src/test/results/clientpositive/llap/windowing_distinct.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_distinct.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_distinct.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_duplicate.q.out b/ql/src/test/results/clientpositive/llap/windowing_duplicate.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_duplicate.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_duplicate.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_ntile.q.out b/ql/src/test/results/clientpositive/llap/windowing_ntile.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_ntile.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_ntile.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_order_null.q.out b/ql/src/test/results/clientpositive/llap/windowing_order_null.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_order_null.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_order_null.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_rank.q.out b/ql/src/test/results/clientpositive/llap/windowing_rank.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_rank.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_rank.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_udaf2.q.out b/ql/src/test/results/clientpositive/llap/windowing_udaf2.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_udaf2.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_udaf2.q.out
diff --git a/ql/src/test/results/clientpositive/windowing_windowspec4.q.out b/ql/src/test/results/clientpositive/llap/windowing_windowspec4.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/windowing_windowspec4.q.out
rename to ql/src/test/results/clientpositive/llap/windowing_windowspec4.q.out
diff --git a/ql/src/test/results/clientpositive/zero_rows_single_insert.q.out b/ql/src/test/results/clientpositive/llap/zero_rows_single_insert.q.out
similarity index 100%
rename from ql/src/test/results/clientpositive/zero_rows_single_insert.q.out
rename to ql/src/test/results/clientpositive/llap/zero_rows_single_insert.q.out