aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorReynold Xin <rxin@databricks.com>2016-04-20 16:29:26 -0700
committerReynold Xin <rxin@databricks.com>2016-04-20 16:29:26 -0700
commitb28fe448d91330afc84e369c548ab0a5de91e9ac (patch)
tree8805524326f544ee3b0c10afbd3f90bba959fef5 /sql
parentfd82681945447d97df368bcdcd112b08bd541cca (diff)
downloadspark-b28fe448d91330afc84e369c548ab0a5de91e9ac.tar.gz
spark-b28fe448d91330afc84e369c548ab0a5de91e9ac.tar.bz2
spark-b28fe448d91330afc84e369c548ab0a5de91e9ac.zip
[SPARK-14770][SQL] Remove unused queries in hive module test resources
## What changes were proposed in this pull request? We currently have five folders in queries: clientcompare, clientnegative, clientpositive, negative, and positive. Only clientpositive is used. We can remove the rest. ## How was this patch tested? N/A - removing unused test resources. Author: Reynold Xin <rxin@databricks.com> Closes #12540 from rxin/SPARK-14770.
Diffstat (limited to 'sql')
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs.q43
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_00.qv1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_01.qv1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/add_partition_with_whitelist.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/addpart1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_concatenate_indexed_table.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_non_native.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_2columns.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidcolname.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidtype.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_invalidspec.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop_table.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_offline.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_with_whitelist.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure3.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_add_partition.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_wrong_regex.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_not_exist.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_with_partition.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure2.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure4.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure5.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure6.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure7.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure8.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure9.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/altern1.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col0.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_non_existent_tbl.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_view.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive2.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive3.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive4.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive5.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_corrupt.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert1.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert2.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert3.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert4.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi1.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi2.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi3.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi4.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi5.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi6.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi7.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec1.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec2.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec3.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec4.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec5.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addjar.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addpartition.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner_default.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func1.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func2.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_macro1.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_role_no_admin.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_createview.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_ctas.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_desc_table_nosel.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_dfs.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_disallow_transform.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q27
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_droppartition.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_1.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_2.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_3.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_4.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_5.q20
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_6.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_7.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_create_db.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_drop_db.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_allpriv.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_dup.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail_nogrant.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noinspriv.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noselectpriv.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v1.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v2.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_rename.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_serdeprop.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_tab.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_view.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_part.q37
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q29
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_create.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_drop.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail1.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail2.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles1.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles2.q24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_grant.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q74
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select_view.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg1.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_parts_nosel.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_no_admin.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_v1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_roles_no_admin.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_truncate.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_createdb.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_export.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_import.q25
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_index.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_load_data.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_create_tbl.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_grant_public.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_revoke_public.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/autolocal1.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_exec_hooks.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_indextype.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_sample_clause.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q42
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q20
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cachingprintstream.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cluster_tasklog_retrieval.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbydistributeby.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbyorderby.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbysortby.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern4.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename1.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename3.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename4.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename5.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_dp.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_incorrect_num_keys.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_invalid_values.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_multiple_part_clause.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_complex_type.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_incorrect_column.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_double_bigint.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_string_bigint.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compile_processor.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compute_stats_long.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_class.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_db.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonudf_class.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_insert_outputformat.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view1.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view3.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view4.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view5.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view6.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view7.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view8.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure3.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure4.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_wrong_regex.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_udaf_failure.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_genericudf.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_udf_udaf.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure1.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure3.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure4.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure5.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure6.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure7.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure8.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure9.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ctas.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_recursion.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_with_in_subquery.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_already_exists.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_invalid_name.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_does_not_exist.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty_restrict.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_switch_does_not_exist.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodblock.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodbunlock.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notablelock.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notableunlock.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ddltime.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision_1.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/default_partition_name.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/deletejar.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure3.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath3.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath4.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on1.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_func_nonexistent.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_function_failure.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_index_failure.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_native_udf.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_failure.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_filter_failure.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure3.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure1.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform_schema.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert1.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part2.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part3.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part4.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_empty.q.disabled24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max_per_node.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing2.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_test.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q38
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q26
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q28
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q25
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_12_nonnative_export.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_13_nonnative_import.q24
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_14_nonpart_part.q25
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_15_part_nonpart.q25
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q26
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q30
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q30
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_19_external_over_existing.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q30
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q35
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_22_export_authfail.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q31
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fetchtask_ioexception.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_bad_class.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_input.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_output.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/genericFileFormat.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_map_skew_multi_distinct.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q36
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q36
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube1.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_id1.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets1.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets4.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets5.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets6.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets7.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_invalid_position.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_key.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup1.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/having1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type4.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_bitmap_no_map_aggr.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_entry_limit.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_size_limit.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input4.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input41.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input_part0_neg.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into2.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into3.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into4.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into5.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into6.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_view_failure.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertexternal1.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_arithmetic_type.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_avg_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_4.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_5.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_6.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_3.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl1.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_mapjoin1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_max_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_min_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_subquery.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_tablename.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_expression.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_std_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_sum_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_create2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_transform.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_tbl_name.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_3.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_variance_syntax.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalidate_view1.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join2.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join28.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join29.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join32.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join35.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_nonexistent_part.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/joinneg.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_alias.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_join.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition_stats.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/line_terminator.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_exist_part_authfail.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_non_native.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_nonpart_authfail.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_authfail.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_nospec.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_stored_as_dirs.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_view_failure.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_rc_seq.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_txt_seq.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_noof_part.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/local_mapred_error_cache.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg1.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg2.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg3.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg4.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg5.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_db_lock_conflict.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_drop_locked_db.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/macro_unused_parameter.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_hadoop20.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff_hadoop20.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_3.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/minimr_broken_pipe.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nested_complex_neg.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/no_matching_udf.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nonkey_groupby.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_insert.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_load.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/notable_alias4.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_invalid_position.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_position_unsupported.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderbysortby.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_char.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_date.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_decimal.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_timestamp.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_varchar.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/part_col_complex_type.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part1.q21
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part2.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part_no_drop.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl1.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl2.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl3.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl4.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl5.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl6.q8
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl7.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl8.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl_no_drop.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q20
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q28
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q19
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q20
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q22
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q21
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q20
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q19
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q21
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/recursive_view.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_groupby.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sa_fail_hook3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sample.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe3.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_error.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_charliteral.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_udtf_alias.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin4.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex2.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex3.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_table_property.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns3.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_does_not_exist.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_index.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_partitions1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tableproperties1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q23
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_mapjoin_14.q38
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q28
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_out_of_range.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_noscan_non_native.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q31
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q12
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_1.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_2.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_join.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_orderby.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_pruning.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subq_insert.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_groupby.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_select.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_nested_subquery.q18
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_shared_alias.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_subquery_chain.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_unqual_corr_expr.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_windowing_corr.q26
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_with_or_cond.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_bucketed_column.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_indexed_table.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_seqfile.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column2.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure4.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udaf_invalid_place.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_coalesce.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_type.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong6.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_function_does_not_implement_udf.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_not_bool.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_in.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_invalid.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_local_resource.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_max.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_min.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_nonexistent_resource.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong4.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_qualified_name.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_reflect_neg.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_type.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error_reduce.q11
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_when_type_wrong.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_invalid_place.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported1.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported3.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union2.q13
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union22.q26
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union3.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin3.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_table_property.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_view_property.q6
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q26
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_over.q17
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/clientnegative/wrong_column_type.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/ambiguous_join_col.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/duplicate_alias.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/garbage.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/insert_wrong_number_columns.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_create_table.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_dot.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_function_param2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_index.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_select.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/macro_reserved_word.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/missing_overwrite.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/nonkey_groupby.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/quoted_string.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column4.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column5.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column6.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function3.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function4.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table2.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct1.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/case_sensitivity.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/cast1.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/groupby1.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/groupby2.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/groupby3.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/groupby4.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/groupby5.q4
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/groupby6.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input1.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input20.q9
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input3.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input4.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input5.q7
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input6.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input7.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input8.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input9.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input_part1.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/input_testsequencefile.q2
-rwxr-xr-xsql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath2.q2
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join1.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join2.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join4.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join5.q15
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join6.q16
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join7.q21
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/join8.q14
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample1.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample2.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample3.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample4.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample5.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample6.q3
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/sample7.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/subq.q4
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/udf1.q5
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/udf4.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/udf6.q1
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/udf_case.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/udf_when.q10
-rw-r--r--sql/hive/src/test/resources/ql/src/test/queries/positive/union.q6
690 files changed, 0 insertions, 5352 deletions
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs.q b/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs.q
deleted file mode 100644
index c640ca148b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs.q
+++ /dev/null
@@ -1,43 +0,0 @@
-
-select
- cdouble
- ,Round(cdouble, 2)
- ,Floor(cdouble)
- ,Ceil(cdouble)
- ,Rand(98007) as rnd
- ,Exp(ln(cdouble))
- ,Ln(cdouble)
- ,Ln(cfloat)
- ,Log10(cdouble)
- -- Use log2 as a representative function to test all input types.
- ,Log2(cdouble)
- ,Log2(cfloat)
- ,Log2(cbigint)
- ,Log2(cint)
- ,Log2(csmallint)
- ,Log2(ctinyint)
- ,Log(2.0, cdouble)
- ,Pow(log2(cdouble), 2.0)
- ,Power(log2(cdouble), 2.0)
- ,Sqrt(cdouble)
- ,Sqrt(cbigint)
- ,Bin(cbigint)
- ,Hex(cdouble)
- ,Conv(cbigint, 10, 16)
- ,Abs(cdouble)
- ,Abs(ctinyint)
- ,Pmod(cint, 3)
- ,Sin(cdouble)
- ,Asin(cdouble)
- ,Cos(cdouble)
- ,ACos(cdouble)
- ,Atan(cdouble)
- ,Degrees(cdouble)
- ,Radians(cdouble)
- ,Positive(cdouble)
- ,Positive(cbigint)
- ,Negative(cdouble)
- ,Sign(cdouble)
- ,Sign(cbigint)
-from alltypesorc order by rnd limit 400;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_00.qv b/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_00.qv
deleted file mode 100644
index 51f231008f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_00.qv
+++ /dev/null
@@ -1 +0,0 @@
-SET hive.vectorized.execution.enabled = false;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_01.qv b/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_01.qv
deleted file mode 100644
index 18e02dc854..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientcompare/vectorized_math_funcs_01.qv
+++ /dev/null
@@ -1 +0,0 @@
-SET hive.vectorized.execution.enabled = true;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/add_partition_with_whitelist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/add_partition_with_whitelist.q
deleted file mode 100644
index 8f0a60b713..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/add_partition_with_whitelist.q
+++ /dev/null
@@ -1,8 +0,0 @@
-SET hive.metastore.partition.name.whitelist.pattern=[\\x20-\\x7E&&[^,]]* ;
--- This pattern matches all printable ASCII characters (disallow unicode) and disallows commas
-
-CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS part_whitelist_test;
-
-ALTER TABLE part_whitelist_test ADD PARTITION (ds='1,2,3,4');
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/addpart1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/addpart1.q
deleted file mode 100644
index a7c9fe91f6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/addpart1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-
-create table addpart1 (a int) partitioned by (b string, c string);
-
-alter table addpart1 add partition (b='f', c='s');
-
-show partitions addpart1;
-
-alter table addpart1 add partition (b='f', c='');
-
-show prtitions addpart1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_concatenate_indexed_table.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_concatenate_indexed_table.q
deleted file mode 100644
index 4193315d30..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_concatenate_indexed_table.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.exec.concatenate.check.index=true;
-create table src_rc_concatenate_test(key int, value string) stored as rcfile;
-
-load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_concatenate_test;
-load data local inpath '../../data/files/smbbucket_2.rc' into table src_rc_concatenate_test;
-load data local inpath '../../data/files/smbbucket_3.rc' into table src_rc_concatenate_test;
-
-show table extended like `src_rc_concatenate_test`;
-
-select count(1) from src_rc_concatenate_test;
-select sum(hash(key)), sum(hash(value)) from src_rc_concatenate_test;
-
-create index src_rc_concatenate_test_index on table src_rc_concatenate_test(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2");
-show indexes on src_rc_concatenate_test;
-
-alter table src_rc_concatenate_test concatenate;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_non_native.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_non_native.q
deleted file mode 100644
index 73ae853778..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_non_native.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-CREATE TABLE non_native1(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
-
--- we do not support ALTER TABLE on non-native tables yet
-ALTER TABLE non_native1 RENAME TO new_non_native;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_2columns.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_2columns.q
deleted file mode 100644
index e10f77cf3f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_2columns.q
+++ /dev/null
@@ -1,11 +0,0 @@
--- create testing table
-create table alter_coltype(key string, value string) partitioned by (dt string, ts string);
-
--- insert and create a partition
-insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1;
-
-desc alter_coltype;
-
--- alter partition change multiple keys at same time
-alter table alter_coltype partition column (dt int, ts int);
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidcolname.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidcolname.q
deleted file mode 100644
index 66eba75d40..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidcolname.q
+++ /dev/null
@@ -1,12 +0,0 @@
--- create testing table
-create table alter_coltype(key string, value string) partitioned by (dt string, ts string);
-
--- insert and create a partition
-insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1;
-
-desc alter_coltype;
-
--- alter partition key column with invalid column name
-alter table alter_coltype partition column (dd int);
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidtype.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidtype.q
deleted file mode 100644
index ad016c5f3a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_coltype_invalidtype.q
+++ /dev/null
@@ -1,11 +0,0 @@
--- create testing table
-create table alter_coltype(key string, value string) partitioned by (dt string, ts string);
-
--- insert and create a partition
-insert overwrite table alter_coltype partition(dt='100x', ts='6:30pm') select * from src1;
-
-desc alter_coltype;
-
--- alter partition key column data type for ts column to a wrong type
-alter table alter_coltype partition column (ts time);
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_invalidspec.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_invalidspec.q
deleted file mode 100644
index 8cbb25cfa9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_invalidspec.q
+++ /dev/null
@@ -1,8 +0,0 @@
--- Create table
-create table if not exists alter_part_invalidspec(key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
--- Load data
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_invalidspec partition (year='1996', month='10');
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_invalidspec partition (year='1996', month='12');
-
-alter table alter_part_invalidspec partition (year='1997') enable no_drop;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop.q
deleted file mode 100644
index 3c0ff02b1a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop.q
+++ /dev/null
@@ -1,9 +0,0 @@
--- Create table
-create table if not exists alter_part_nodrop_part(key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
--- Load data
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_part partition (year='1996', month='10');
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_part partition (year='1996', month='12');
-
-alter table alter_part_nodrop_part partition (year='1996') enable no_drop;
-alter table alter_part_nodrop_part drop partition (year='1996');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop_table.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop_table.q
deleted file mode 100644
index f2135b1aa0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_nodrop_table.q
+++ /dev/null
@@ -1,9 +0,0 @@
--- Create table
-create table if not exists alter_part_nodrop_table(key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
--- Load data
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_table partition (year='1996', month='10');
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_nodrop_table partition (year='1996', month='12');
-
-alter table alter_part_nodrop_table partition (year='1996') enable no_drop;
-drop table alter_part_nodrop_table;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_offline.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_offline.q
deleted file mode 100644
index 7376d8bfe4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_offline.q
+++ /dev/null
@@ -1,11 +0,0 @@
--- create table
-create table if not exists alter_part_offline (key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
--- Load data
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_offline partition (year='1996', month='10');
-load data local inpath '../../data/files/T1.txt' overwrite into table alter_part_offline partition (year='1996', month='12');
-
-alter table alter_part_offline partition (year='1996') disable offline;
-select * from alter_part_offline where year = '1996';
-alter table alter_part_offline partition (year='1996') enable offline;
-select * from alter_part_offline where year = '1996';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_with_whitelist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_with_whitelist.q
deleted file mode 100644
index 6e33bc0782..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_partition_with_whitelist.q
+++ /dev/null
@@ -1,9 +0,0 @@
-SET hive.metastore.partition.name.whitelist.pattern=[\\x20-\\x7E&&[^,]]* ;
--- This pattern matches all printable ASCII characters (disallow unicode) and disallows commas
-
-CREATE TABLE part_whitelist_test (key STRING, value STRING) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS part_whitelist_test;
-
-ALTER TABLE part_whitelist_test ADD PARTITION (ds='1');
-
-ALTER TABLE part_whitelist_test PARTITION (ds='1') rename to partition (ds='1,2,3');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure.q
deleted file mode 100644
index be971f1849..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure.q
+++ /dev/null
@@ -1,6 +0,0 @@
-create table alter_rename_partition_src ( col1 string ) stored as textfile ;
-load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src ;
-create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile;
-insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src ;
-
-alter table alter_rename_partition partition (pCol1='nonexist_part1:', pcol2='nonexist_part2:') rename to partition (pCol1='new_part1:', pcol2='new_part2:');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure2.q
deleted file mode 100644
index 4babdda2db..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure2.q
+++ /dev/null
@@ -1,6 +0,0 @@
-create table alter_rename_partition_src ( col1 string ) stored as textfile ;
-load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src ;
-create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile;
-insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src ;
-
-alter table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') rename to partition (pCol1='old_part1:', pcol2='old_part2:');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure3.q
deleted file mode 100644
index 3af807ef61..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_rename_partition_failure3.q
+++ /dev/null
@@ -1,6 +0,0 @@
-create table alter_rename_partition_src ( col1 string ) stored as textfile ;
-load data local inpath '../../data/files/test.dat' overwrite into table alter_rename_partition_src ;
-create table alter_rename_partition ( col1 string ) partitioned by (pcol1 string , pcol2 string) stored as sequencefile;
-insert overwrite table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') select col1 from alter_rename_partition_src ;
-
-alter table alter_rename_partition partition (pCol1='old_part1:', pcol2='old_part2:') rename to partition (pCol1='old_part1:', pcol2='old_part2:', pcol3='old_part3:'); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_add_partition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_add_partition.q
deleted file mode 100644
index 2427c3b2a4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_add_partition.q
+++ /dev/null
@@ -1,5 +0,0 @@
-create table mp (a int) partitioned by (b int);
-
--- should fail
-alter table mp add partition (b='1', c='1');
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_wrong_regex.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_wrong_regex.q
deleted file mode 100644
index fad194d016..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_table_wrong_regex.q
+++ /dev/null
@@ -1,7 +0,0 @@
-drop table aa;
-create table aa ( test STRING )
- ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.RegexSerDe'
- WITH SERDEPROPERTIES ("input.regex" = "(.*)", "output.format.string" = "$1s");
-
-alter table aa set serdeproperties ("input.regex" = "[^\\](.*)", "output.format.string" = "$1s");
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_not_exist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_not_exist.q
deleted file mode 100644
index 30fe4d9916..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_not_exist.q
+++ /dev/null
@@ -1,4 +0,0 @@
-DROP VIEW testView;
-
--- Cannot ALTER VIEW AS SELECT if view currently does not exist
-ALTER VIEW testView AS SELECT * FROM srcpart;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_with_partition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_with_partition.q
deleted file mode 100644
index dca6770b1b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_as_select_with_partition.q
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE VIEW testViewPart PARTITIONED ON (value)
-AS
-SELECT key, value
-FROM src
-WHERE key=86;
-
-ALTER VIEW testViewPart
-ADD PARTITION (value='val_86') PARTITION (value='val_xyz');
-DESCRIBE FORMATTED testViewPart;
-
--- If a view has partition, could not replace it with ALTER VIEW AS SELECT
-ALTER VIEW testViewPart as SELECT * FROM srcpart;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure.q
deleted file mode 100644
index 705b985095..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure.q
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP VIEW xxx3;
-CREATE VIEW xxx3 AS SELECT * FROM src;
-ALTER TABLE xxx3 REPLACE COLUMNS (xyz int);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure2.q
deleted file mode 100644
index 26d2c4f3ad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure2.q
+++ /dev/null
@@ -1,8 +0,0 @@
-DROP VIEW xxx4;
-CREATE VIEW xxx4
-PARTITIONED ON (value)
-AS
-SELECT * FROM src;
-
--- should fail: need to use ALTER VIEW, not ALTER TABLE
-ALTER TABLE xxx4 ADD PARTITION (value='val_86');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure3.q
deleted file mode 100644
index 49c17a8b57..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- should fail: can't use ALTER VIEW on a table
-ALTER VIEW srcpart ADD PARTITION (ds='2012-12-31', hr='23');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure4.q
deleted file mode 100644
index e2fad270b1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure4.q
+++ /dev/null
@@ -1,8 +0,0 @@
-DROP VIEW xxx5;
-CREATE VIEW xxx5
-PARTITIONED ON (value)
-AS
-SELECT * FROM src;
-
--- should fail: LOCATION clause is illegal
-ALTER VIEW xxx5 ADD PARTITION (value='val_86') LOCATION '/foo/bar/baz';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure5.q
deleted file mode 100644
index e44766e113..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure5.q
+++ /dev/null
@@ -1,8 +0,0 @@
-DROP VIEW xxx6;
-CREATE VIEW xxx6
-PARTITIONED ON (value)
-AS
-SELECT * FROM src;
-
--- should fail: partition column name does not match
-ALTER VIEW xxx6 ADD PARTITION (v='val_86');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure6.q
deleted file mode 100644
index dab7b145f7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure6.q
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP VIEW xxx7;
-CREATE VIEW xxx7
-PARTITIONED ON (key)
-AS
-SELECT hr,key FROM srcpart;
-
-SET hive.mapred.mode=strict;
-
--- strict mode should cause this to fail since view partition
--- predicate does not correspond to an underlying table partition predicate
-ALTER VIEW xxx7 ADD PARTITION (key=10);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure7.q
deleted file mode 100644
index eff04c5b47..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure7.q
+++ /dev/null
@@ -1,8 +0,0 @@
-DROP VIEW xxx8;
-CREATE VIEW xxx8
-PARTITIONED ON (ds,hr)
-AS
-SELECT key,ds,hr FROM srcpart;
-
--- should fail: need to fill in all partition columns
-ALTER VIEW xxx8 ADD PARTITION (ds='2011-01-01');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure8.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure8.q
deleted file mode 100644
index 9dff784250..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure8.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- should fail: can't use ALTER VIEW on a table
-CREATE TABLE invites (foo INT, bar STRING) PARTITIONED BY (ds STRING);
-ALTER VIEW invites RENAME TO invites2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure9.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure9.q
deleted file mode 100644
index 0f40fad90d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/alter_view_failure9.q
+++ /dev/null
@@ -1,7 +0,0 @@
-DROP VIEW xxx4;
-CREATE VIEW xxx4
-AS
-SELECT * FROM src;
-
--- should fail: need to use ALTER VIEW, not ALTER TABLE
-ALTER TABLE xxx4 RENAME TO xxx4a;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/altern1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/altern1.q
deleted file mode 100644
index 60414c1f3a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/altern1.q
+++ /dev/null
@@ -1,4 +0,0 @@
-
-create table altern1(a int, b int) partitioned by (ds string);
-alter table altern1 replace columns(a int, b int, ds string);
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col.q
deleted file mode 100644
index 866cec126f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col.q
+++ /dev/null
@@ -1 +0,0 @@
-FROM (SELECT key, concat(value) AS key FROM src) a SELECT a.key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col0.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col0.q
deleted file mode 100644
index 46349c60bc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col0.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- TOK_ALLCOLREF
-explain select * from (select * from (select * from src) a join (select * from src1) b on (a.key = b.key)) t;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col1.q
deleted file mode 100644
index 9e8bcbd1bb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.support.quoted.identifiers=none;
--- TOK_TABLE_OR_COL
-explain select * from (select `.*` from (select * from src) a join (select * from src1) b on (a.key = b.key)) t;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col2.q
deleted file mode 100644
index 33d4aed3cd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ambiguous_col2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.support.quoted.identifiers=none;
--- DOT
-explain select * from (select a.`[kv].*`, b.`[kv].*` from (select * from src) a join (select * from src1) b on (a.key = b.key)) t;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze.q
deleted file mode 100644
index 874f5bfc14..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze.q
+++ /dev/null
@@ -1 +0,0 @@
-analyze table srcpart compute statistics;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze1.q
deleted file mode 100644
index 057a1a0b48..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze1.q
+++ /dev/null
@@ -1 +0,0 @@
-analyze table srcpart partition (key) compute statistics;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_non_existent_tbl.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_non_existent_tbl.q
deleted file mode 100644
index 78a97019f1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_non_existent_tbl.q
+++ /dev/null
@@ -1 +0,0 @@
-analyze table nonexistent compute statistics;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_view.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_view.q
deleted file mode 100644
index af4970f52e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/analyze_view.q
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP VIEW av;
-
-CREATE VIEW av AS SELECT * FROM src;
-
--- should fail: can't analyze a view...yet
-ANALYZE TABLE av COMPUTE STATISTICS;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive1.q
deleted file mode 100644
index a4b50f5e14..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE srcpart_archived LIKE srcpart;
-
-INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE srcpart_archived ARCHIVE PARTITION (ds='2008-04-08', hr='12');
-ALTER TABLE srcpart_archived ARCHIVE PARTITION (ds='2008-04-08', hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive2.q
deleted file mode 100644
index ff8dcb2485..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive2.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to unarchive a non-archived partition
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-drop table tstsrcpart;
-create table tstsrcpart like srcpart;
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12')
-select key, value from srcpart where ds='2008-04-08' and hr='12';
-
-ALTER TABLE tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08', hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive3.q
deleted file mode 100644
index 53057daa1b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive3.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.archive.enabled = true;
--- Tests archiving a table
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-ALTER TABLE srcpart ARCHIVE;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive4.q
deleted file mode 100644
index 56d6f1798d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive4.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.archive.enabled = true;
--- Tests archiving multiple partitions
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-ALTER TABLE srcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12') PARTITION (ds='2008-04-08', hr='11');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive5.q
deleted file mode 100644
index 4f6dc8d72c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive5.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.archive.enabled = true;
--- Tests creating a partition where the partition value will collide with the
--- a intermediate directory
-
-ALTER TABLE srcpart ADD PARTITION (ds='2008-04-08', hr='14_INTERMEDIATE_ORIGINAL')
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_corrupt.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_corrupt.q
deleted file mode 100644
index 130b37b5c9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_corrupt.q
+++ /dev/null
@@ -1,18 +0,0 @@
-USE default;
-
-set hive.archive.enabled = true;
-set hive.enforce.bucketing = true;
-
-drop table tstsrcpart;
-
-create table tstsrcpart like srcpart;
-
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
--- The version of GzipCodec that is provided in Hadoop 0.20 silently ignores
--- file format errors. However, versions of Hadoop that include
--- HADOOP-6835 (e.g. 0.23 and 1.x) cause a Wrong File Format exception
--- to be thrown during the LOAD step. This former behavior is tested
--- in clientpositive/archive_corrupt.q
-
-load data local inpath '../../data/files/archive_corrupt.rc' overwrite into table tstsrcpart partition (ds='2008-04-08', hr='11');
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert1.q
deleted file mode 100644
index deaff63d67..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert1.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to insert into archived partition.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12');
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert2.q
deleted file mode 100644
index d744f24876..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert2.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to insert into archived partition.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert3.q
deleted file mode 100644
index c6cb142824..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert3.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to create partition inside of archived directory.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert4.q
deleted file mode 100644
index c36f3ef9e8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_insert4.q
+++ /dev/null
@@ -1,15 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to (possible) dynamic insert into archived partition.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12');
-
-SET hive.exec.dynamic.partition=true;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr)
-SELECT key, value, hr FROM srcpart WHERE ds='2008-04-08' AND hr='12';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi1.q
deleted file mode 100644
index 8c702ed008..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi1.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi2.q
deleted file mode 100644
index d3cfb89c98..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi2.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to unarchive a non-archived partition group
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-drop table tstsrcpart;
-create table tstsrcpart like srcpart;
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='12')
-select key, value from srcpart where ds='2008-04-08' and hr='12';
-
-ALTER TABLE tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08', hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi3.q
deleted file mode 100644
index 75f5dfad47..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi3.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive outer partition group containing other partition inside.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12');
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi4.q
deleted file mode 100644
index abe0647ae6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi4.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive inner partition contained in archived partition group.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi5.q
deleted file mode 100644
index 71635e054a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi5.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to unarchive outer partition group containing other partition inside.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12');
-ALTER TABLE tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi6.q
deleted file mode 100644
index 5bb1474fdc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi6.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to unarchive inner partition contained in archived partition group.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
-ALTER TABLE tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08', hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi7.q
deleted file mode 100644
index db7f392737..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_multi7.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition group with custom locations.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE tstsrcpart LIKE srcpart;
-
-INSERT OVERWRITE TABLE tstsrcpart PARTITION (ds='2008-04-08', hr='11')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='11';
-ALTER TABLE tstsrcpart ADD PARTITION (ds='2008-04-08', hr='12')
-LOCATION "${system:test.tmp.dir}/tstsrc";
-
-ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec1.q
deleted file mode 100644
index d83b19d9fe..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec1.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE srcpart_archived LIKE srcpart;
-
-INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE srcpart_archived ARCHIVE PARTITION (ds='2008-04-08', nonexistingpart='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec2.q
deleted file mode 100644
index ed14bbf688..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec2.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE srcpart_archived LIKE srcpart;
-
-INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE srcpart_archived ARCHIVE PARTITION (hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec3.q
deleted file mode 100644
index f27ad6d63b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec3.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE srcpart_archived LIKE srcpart;
-
-INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE srcpart_archived ARCHIVE PARTITION ();
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec4.q
deleted file mode 100644
index 491c2ac459..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec4.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE srcpart_archived LIKE srcpart;
-
-INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE srcpart_archived ARCHIVE PARTITION (hr='12', ds='2008-04-08'); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec5.q
deleted file mode 100644
index bb25ef2c7e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/archive_partspec5.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.archive.enabled = true;
--- Tests trying to archive a partition twice.
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
-
-CREATE TABLE srcpart_archived (key string, value string) partitioned by (ds string, hr int, min int);
-
-INSERT OVERWRITE TABLE srcpart_archived PARTITION (ds='2008-04-08', hr='12', min='00')
-SELECT key, value FROM srcpart WHERE ds='2008-04-08' AND hr='12';
-
-ALTER TABLE srcpart_archived ARCHIVE PARTITION (ds='2008-04-08', min='00'); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addjar.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addjar.q
deleted file mode 100644
index a1709dae5f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addjar.q
+++ /dev/null
@@ -1,7 +0,0 @@
-set hive.security.authorization.enabled=true;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
-
--- running a sql query to initialize the authorization - not needed in real HS2 mode
-show tables;
-
-add jar ${system:maven.local.repository}/org/apache/hive/hcatalog/hive-hcatalog-core/${system:hive.version}/hive-hcatalog-core-${system:hive.version}.jar;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addpartition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addpartition.q
deleted file mode 100644
index 8abdd2b3cd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_addpartition.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-set user.name=user1;
--- check add partition without insert privilege
-create table tpart(i int, j int) partitioned by (k string);
-
-set user.name=user2;
-alter table tpart add partition (k = 'abc');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner.q
deleted file mode 100644
index f716262e23..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if alter table owner fails
--- for now, alter db owner is allowed only for admin
-
-create database dbao;
-alter database dbao set owner user user2;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner_default.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner_default.q
deleted file mode 100644
index f904935018..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_alter_db_owner_default.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if alter table owner fails
-alter database default set owner user user1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q
deleted file mode 100644
index de91e91923..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-create role all;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q
deleted file mode 100644
index 42a42f65b2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-create role default;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q
deleted file mode 100644
index 0d14cde6d5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-create role None;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
deleted file mode 100644
index d5ea284f14..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
+++ /dev/null
@@ -1,17 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-
-create role testrole;
-show roles;
-drop role TESTROLE;
-show roles;
-create role TESTROLE;
-show roles;
-grant role testROLE to user hive_admin_user;
-set role testrolE;
-set role adMin;
-show roles;
-create role TESTRoLE;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func1.q
deleted file mode 100644
index 02bbe090cf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func1.q
+++ /dev/null
@@ -1,7 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=hive_test_user;
-
--- permanent function creation should fail for non-admin roles
-create function perm_fn as 'org.apache.hadoop.hive.ql.udf.UDFAscii';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func2.q
deleted file mode 100644
index 8760fa8d82..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_func2.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=hive_test_user;
-
--- temp function creation should fail for non-admin roles
-create temporary function temp_fn as 'org.apache.hadoop.hive.ql.udf.UDFAscii';
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_macro1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_macro1.q
deleted file mode 100644
index c904a100c5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_macro1.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=hive_test_user;
-
--- temp macro creation should fail for non-admin roles
-create temporary macro mymacro1(x double) x * x;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_role_no_admin.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_role_no_admin.q
deleted file mode 100644
index a84fe64bd6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_create_role_no_admin.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
--- this test will fail because hive_test_user is not in admin role.
-create role r1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_createview.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_createview.q
deleted file mode 100644
index 9b1f2ea6c6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_createview.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check create view without select privileges
-create table t1(i int);
-set user.name=user1;
-create view v1 as select * from t1;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_ctas.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_ctas.q
deleted file mode 100644
index 1cf74a365d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_ctas.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check query without select privilege fails
-create table t1(i int);
-
-set user.name=user1;
-create table t2 as select * from t1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_desc_table_nosel.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_desc_table_nosel.q
deleted file mode 100644
index 47663c9bb9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_desc_table_nosel.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if alter table fails as different user
-create table t1(i int);
-desc t1;
-
-grant all on table t1 to user user2;
-revoke select on table t1 from user user2;
-
-set user.name=user2;
-desc t1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_dfs.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_dfs.q
deleted file mode 100644
index 7d47a7b649..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_dfs.q
+++ /dev/null
@@ -1,7 +0,0 @@
-set hive.security.authorization.enabled=true;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
-
--- running a sql query to initialize the authorization - not needed in real HS2 mode
-show tables;
-dfs -ls ${system:test.tmp.dir}/
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_disallow_transform.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_disallow_transform.q
deleted file mode 100644
index 64b300c8d9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_disallow_transform.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set role ALL;
-SELECT TRANSFORM (*) USING 'cat' AS (key, value) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q
deleted file mode 100644
index edeae9b71d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q
+++ /dev/null
@@ -1,22 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- ensure that drop database cascade works
-create database dba1;
-create table dba1.tab1(i int);
-drop database dba1 cascade;
-
--- check if drop database fails if the db has a table for which user does not have permission
-create database dba2;
-create table dba2.tab2(i int);
-
-set user.name=hive_admin_user;
-set role ADMIN;
-alter database dba2 set owner user user2;
-
-set user.name=user2;
-show current roles;
-drop database dba2 cascade ;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q
deleted file mode 100644
index 46d4d0f92c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q
+++ /dev/null
@@ -1,27 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if changing owner and dropping as other user works
-create database dba1;
-
-set user.name=hive_admin_user;
-set role ADMIN;
-alter database dba1 set owner user user2;
-
-set user.name=user2;
-show current roles;
-drop database dba1;
-
-
-set user.name=user1;
--- check if dropping db as another user fails
-show current roles;
-create database dba2;
-
-set user.name=user2;
-show current roles;
-
-drop database dba2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
deleted file mode 100644
index a7aa17f5ab..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-show current roles;
-create role r1;
-set role ALL;
-show current roles;
-drop role r1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_droppartition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_droppartition.q
deleted file mode 100644
index f05e9458fa..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_droppartition.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/authz_drop_part_1;
-
--- check drop partition without delete privilege
-create table tpart(i int, j int) partitioned by (k string);
-alter table tpart add partition (k = 'abc') location 'file:${system:test.tmp.dir}/authz_drop_part_1' ;
-set user.name=user1;
-alter table tpart drop partition (k = 'abc');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_1.q
deleted file mode 100644
index c38dab5eb7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_1.q
+++ /dev/null
@@ -1,7 +0,0 @@
-create table authorization_fail_1 (key int, value string);
-set hive.security.authorization.enabled=true;
-
-grant Create on table authorization_fail_1 to user hive_test_user;
-grant Create on table authorization_fail_1 to user hive_test_user;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_2.q
deleted file mode 100644
index 341e44774d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_2.q
+++ /dev/null
@@ -1,7 +0,0 @@
-create table authorization_fail_2 (key int, value string) partitioned by (ds string);
-
-set hive.security.authorization.enabled=true;
-
-alter table authorization_fail_2 add partition (ds='2010');
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_3.q
deleted file mode 100644
index 6a56daa05f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_3.q
+++ /dev/null
@@ -1,12 +0,0 @@
--- SORT_BEFORE_DIFF
-
-create table authorization_fail_3 (key int, value string) partitioned by (ds string);
-set hive.security.authorization.enabled=true;
-
-grant Create on table authorization_fail_3 to user hive_test_user;
-alter table authorization_fail_3 add partition (ds='2010');
-
-show grant user hive_test_user on table authorization_fail_3;
-show grant user hive_test_user on table authorization_fail_3 partition (ds='2010');
-
-select key from authorization_fail_3 where ds='2010';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_4.q
deleted file mode 100644
index f0cb6459a2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_4.q
+++ /dev/null
@@ -1,15 +0,0 @@
--- SORT_BEFORE_DIFF
-
-create table authorization_fail_4 (key int, value string) partitioned by (ds string);
-
-set hive.security.authorization.enabled=true;
-grant Alter on table authorization_fail_4 to user hive_test_user;
-ALTER TABLE authorization_fail_4 SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE");
-
-grant Create on table authorization_fail_4 to user hive_test_user;
-alter table authorization_fail_4 add partition (ds='2010');
-
-show grant user hive_test_user on table authorization_fail_4;
-show grant user hive_test_user on table authorization_fail_4 partition (ds='2010');
-
-select key from authorization_fail_4 where ds='2010';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_5.q
deleted file mode 100644
index b4efab5667..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_5.q
+++ /dev/null
@@ -1,20 +0,0 @@
--- SORT_BEFORE_DIFF
-
-create table authorization_fail (key int, value string) partitioned by (ds string);
-set hive.security.authorization.enabled=true;
-
-grant Alter on table authorization_fail to user hive_test_user;
-ALTER TABLE authorization_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE");
-
-grant Create on table authorization_fail to user hive_test_user;
-grant Select on table authorization_fail to user hive_test_user;
-alter table authorization_fail add partition (ds='2010');
-
-show grant user hive_test_user on table authorization_fail;
-show grant user hive_test_user on table authorization_fail partition (ds='2010');
-
-revoke Select on table authorization_fail partition (ds='2010') from user hive_test_user;
-
-show grant user hive_test_user on table authorization_fail partition (ds='2010');
-
-select key from authorization_fail where ds='2010'; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_6.q
deleted file mode 100644
index 977246948c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_6.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- SORT_BEFORE_DIFF
-
-create table authorization_part_fail (key int, value string) partitioned by (ds string);
-set hive.security.authorization.enabled=true;
-
-ALTER TABLE authorization_part_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE");
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_7.q
deleted file mode 100644
index 492deed10b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_7.q
+++ /dev/null
@@ -1,17 +0,0 @@
--- SORT_BEFORE_DIFF
-
-create table authorization_fail (key int, value string);
-
-set hive.security.authorization.enabled=true;
-
-create role hive_test_role_fail;
-
-grant role hive_test_role_fail to user hive_test_user;
-grant select on table authorization_fail to role hive_test_role_fail;
-show role grant user hive_test_user;
-
-show grant role hive_test_role_fail on table authorization_fail;
-
-drop role hive_test_role_fail;
-
-select key from authorization_fail; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_create_db.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_create_db.q
deleted file mode 100644
index d969e39027..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_create_db.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.security.authorization.enabled=true;
-
-create database db_to_fail;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_drop_db.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_drop_db.q
deleted file mode 100644
index 87719b0043..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_fail_drop_db.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.security.authorization.enabled=false;
-create database db_fail_to_drop;
-set hive.security.authorization.enabled=true;
-
-drop database db_fail_to_drop;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_allpriv.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_allpriv.q
deleted file mode 100644
index f3c86b97ce..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_allpriv.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=user1;
--- current user has been set (comment line before the set cmd is resulting in parse error!!)
-
-CREATE TABLE table_priv_allf(i int);
-
--- grant insert to user2 WITH grant option
-GRANT INSERT ON table_priv_allf TO USER user2 with grant option;
-
-set user.name=user2;
--- try grant all to user3, without having all privileges
-GRANT ALL ON table_priv_allf TO USER user3;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_dup.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_dup.q
deleted file mode 100644
index 7808cb3ec7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_dup.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=user1;
--- current user has been set (comment line before the set cmd is resulting in parse error!!)
-
-CREATE TABLE tauth_gdup(i int);
-
--- It should be possible to revert owners privileges
-revoke SELECT ON tauth_gdup from user user1;
-
-show grant user user1 on table tauth_gdup;
-
--- Owner already has all privileges granted, another grant would become duplicate
--- and result in error
-GRANT INSERT ON tauth_gdup TO USER user1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail1.q
deleted file mode 100644
index 8dc8e45a79..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=user1;
--- current user has been set (comment line before the set cmd is resulting in parse error!!)
-
-CREATE TABLE table_priv_gfail1(i int);
-
-set user.name=user2;
--- try grant insert to user3 as user2
-GRANT INSERT ON table_priv_gfail1 TO USER user3;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail_nogrant.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail_nogrant.q
deleted file mode 100644
index d51c1c3507..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_grant_table_fail_nogrant.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=user1;
--- current user has been set (comment line before the set cmd is resulting in parse error!!)
-
-CREATE TABLE table_priv_gfail1(i int);
-
--- grant insert to user2 WITHOUT grant option
-GRANT INSERT ON table_priv_gfail1 TO USER user2;
-
-set user.name=user2;
--- try grant insert to user3
-GRANT INSERT ON table_priv_gfail1 TO USER user3;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noinspriv.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noinspriv.q
deleted file mode 100644
index 2fa3cb260b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noinspriv.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check insert without select priv
-create table t1(i int);
-
-set user.name=user1;
-create table user2tab(i int);
-insert into table t1 select * from user2tab;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noselectpriv.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noselectpriv.q
deleted file mode 100644
index b9bee4ea40..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_insert_noselectpriv.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check insert without select priv
-create table t1(i int);
-
-set user.name=user1;
-create table t2(i int);
-insert into table t2 select * from t1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v1.q
deleted file mode 100644
index 2a1da23dae..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v1.q
+++ /dev/null
@@ -1,6 +0,0 @@
-create table if not exists authorization_invalid_v1 (key int, value string);
-grant delete on table authorization_invalid_v1 to user hive_test_user;
-drop table authorization_invalid_v1;
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v2.q
deleted file mode 100644
index 9c724085d9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_invalid_priv_v2.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-
-create table if not exists authorization_invalid_v2 (key int, value string);
-grant index on table authorization_invalid_v2 to user hive_test_user;
-drop table authorization_invalid_v2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_rename.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_rename.q
deleted file mode 100644
index 8a3300cb2e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_rename.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if alter table fails as different user
-create table t1(i int);
-
-set user.name=user2;
-alter table t1 rename to tnew1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_serdeprop.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_serdeprop.q
deleted file mode 100644
index 0172c4c74c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_alter_tab_serdeprop.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if alter table fails as different user
-create table t1(i int);
-
-set user.name=user2;
-ALTER TABLE t1 SET SERDEPROPERTIES ('field.delim' = ',');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_tab.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_tab.q
deleted file mode 100644
index 2d0e52da00..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_tab.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if create table fails as different user
-create table t1(i int);
-
-set user.name=user2;
-drop table t1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_view.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_view.q
deleted file mode 100644
index 76bbab42b3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_not_owner_drop_view.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if create table fails as different user
-create table t1(i int);
-create view vt1 as select * from t1;
-
-set user.name=user2;
-drop view vt1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_part.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_part.q
deleted file mode 100644
index a654a2380c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_part.q
+++ /dev/null
@@ -1,37 +0,0 @@
--- SORT_BEFORE_DIFF
-
-create table authorization_part_fail (key int, value string) partitioned by (ds string);
-ALTER TABLE authorization_part_fail SET TBLPROPERTIES ("PARTITION_LEVEL_PRIVILEGE"="TRUE");
-create table src_auth as select * from src;
-set hive.security.authorization.enabled=true;
-
-grant Create on table authorization_part_fail to user hive_test_user;
-grant Update on table authorization_part_fail to user hive_test_user;
-grant Drop on table authorization_part_fail to user hive_test_user;
-grant select on table src_auth to user hive_test_user;
-
--- column grant to group
-
-grant select(key) on table authorization_part_fail to group hive_test_group1;
-grant select on table authorization_part_fail to group hive_test_group1;
-
-show grant group hive_test_group1 on table authorization_part_fail;
-
-insert overwrite table authorization_part_fail partition (ds='2010') select key, value from src_auth;
-show grant group hive_test_group1 on table authorization_part_fail(key) partition (ds='2010');
-show grant group hive_test_group1 on table authorization_part_fail partition (ds='2010');
-select key, value from authorization_part_fail where ds='2010' order by key limit 20;
-
-insert overwrite table authorization_part_fail partition (ds='2011') select key, value from src_auth;
-show grant group hive_test_group1 on table authorization_part_fail(key) partition (ds='2011');
-show grant group hive_test_group1 on table authorization_part_fail partition (ds='2011');
-select key, value from authorization_part_fail where ds='2011' order by key limit 20;
-
-select key,value, ds from authorization_part_fail where ds>='2010' order by key, ds limit 20;
-
-revoke select on table authorization_part_fail partition (ds='2010') from group hive_test_group1;
-
-select key,value, ds from authorization_part_fail where ds>='2010' order by key, ds limit 20;
-
-drop table authorization_part_fail;
-drop table src_auth; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
deleted file mode 100644
index bbf3b66970..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
+++ /dev/null
@@ -1,29 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-
--- the test verifies that authorization is happening with privileges of the current roles
-
--- grant privileges with grant option for table to role2
-create role role2;
-grant role role2 to user user2;
-create table tpriv_current_role(i int);
-grant all on table tpriv_current_role to role role2 with grant option;
-
-set user.name=user2;
--- switch to user2
-
--- by default all roles should be in current roles, and grant to new user should work
-show current roles;
-grant all on table tpriv_current_role to user user3;
-
-set role role2;
--- switch to role2, grant should work
-grant all on table tpriv_current_role to user user4;
-show grant user user4 on table tpriv_current_role;
-
-set role PUBLIC;
--- set role to public, should fail as role2 is not one of the current roles
-grant all on table tpriv_current_role to user user5;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_create.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_create.q
deleted file mode 100644
index 002389f203..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_create.q
+++ /dev/null
@@ -1 +0,0 @@
-create role PUBLIC;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_drop.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_drop.q
deleted file mode 100644
index 69c5a8de8b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_public_drop.q
+++ /dev/null
@@ -1 +0,0 @@
-drop role PUBLIC;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail1.q
deleted file mode 100644
index e19bf370fa..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail1.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=user1;
--- current user has been set (comment line before the set cmd is resulting in parse error!!)
-
-CREATE TABLE table_priv_rfail1(i int);
-
--- grant insert to user2
-GRANT INSERT ON table_priv_rfail1 TO USER user2;
-
-set user.name=user3;
--- try dropping the privilege as user3
-REVOKE INSERT ON TABLE table_priv_rfail1 FROM USER user2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail2.q
deleted file mode 100644
index 4b0cf3286a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_revoke_table_fail2.q
+++ /dev/null
@@ -1,18 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=user1;
--- current user has been set (comment line before the set cmd is resulting in parse error!!)
-
-CREATE TABLE table_priv_rfai2(i int);
-
--- grant insert to user2
-GRANT INSERT ON table_priv_rfai2 TO USER user2;
-GRANT SELECT ON table_priv_rfai2 TO USER user3 WITH GRANT OPTION;
-
-set user.name=user3;
--- grant select as user3 to user 2
-GRANT SELECT ON table_priv_rfai2 TO USER user2;
-
--- try dropping the privilege as user3
-REVOKE INSERT ON TABLE table_priv_rfai2 FROM USER user2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
deleted file mode 100644
index a819d204f5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
--- this is applicable to any security mode as check is in metastore
-create role role1;
-create role role2;
-grant role role1 to role role2;
-
--- this will create a cycle
-grant role role2 to role role1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
deleted file mode 100644
index 423f030630..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
+++ /dev/null
@@ -1,24 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set user.name=hive_admin_user;
-set role ADMIN;
--- this is applicable to any security mode as check is in metastore
-
-create role role1;
-
-create role role2;
-grant role role2 to role role1;
-
-create role role3;
-grant role role3 to role role2;
-
-create role role4;
-grant role role4 to role role3;
-
-create role role5;
-grant role role5 to role role4;
-
--- this will create a cycle in middle of the hierarchy
-grant role role2 to role role4;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_grant.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_grant.q
deleted file mode 100644
index c5c500a712..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_role_grant.q
+++ /dev/null
@@ -1,22 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-
-set role ADMIN;
-
-----------------------------------------
--- role granting with admin option
--- since user2 doesn't have admin option for role_noadmin, last grant should fail
-----------------------------------------
-
-create role role_noadmin;
-create role src_role_wadmin;
-grant src_role_wadmin to user user2 with admin option;
-grant role_noadmin to user user2;
-show role grant user user2;
-
-
-set user.name=user2;
-set role role_noadmin;
-grant src_role_wadmin to user user3;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
deleted file mode 100644
index d9f4c7cdb8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
+++ /dev/null
@@ -1,74 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-set user.name=hive_admin_user;
-show current roles;
-set role ADMIN;
-
-----------
--- create the following user, role mapping
--- user1 -> role1 -> role2 -> role3
-----------
-
-create role role1;
-grant role1 to user user1;
-
-create role role2;
-grant role2 to role role1;
-
-create role role3;
-grant role3 to role role2;
-
-
-create table t1(i int);
-grant select on t1 to role role3;
-
-set user.name=user1;
-show current roles;
-select * from t1;
-
-set user.name=hive_admin_user;
-show current roles;
-grant select on t1 to role role2;
-
-
-set user.name=user1;
-show current roles;
-select * from t1;
-
-set user.name=hive_admin_user;
-set role ADMIN;
-show current roles;
-revoke select on table t1 from role role2;
-
-
-create role role4;
-grant role4 to user user1;
-grant role3 to role role4;;
-
-set user.name=user1;
-show current roles;
-select * from t1;
-
-set user.name=hive_admin_user;
-show current roles;
-set role ADMIN;
-
--- Revoke role3 from hierarchy one at a time and check permissions
--- after revoking from both, select should fail
-revoke role3 from role role2;
-
-set user.name=user1;
-show current roles;
-select * from t1;
-
-set user.name=hive_admin_user;
-show current roles;
-set role ADMIN;
-revoke role3 from role role4;
-
-set user.name=user1;
-show current roles;
-select * from t1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select.q
deleted file mode 100644
index 39871793af..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select.q
+++ /dev/null
@@ -1,9 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check query without select privilege fails
-create table t1(i int);
-
-set user.name=user1;
-select * from t1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select_view.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select_view.q
deleted file mode 100644
index a4071cd0d4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_select_view.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check create view without select privileges
-create table t1(i int);
-create view v1 as select * from t1;
-set user.name=user1;
-select * from v1;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg1.q
deleted file mode 100644
index 9ba3a82a56..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg1.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-
--- an error should be thrown if 'set role ' is done for role that does not exist
-
-set role nosuchroleexists;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
deleted file mode 100644
index 03f748fcc9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.users.in.admin.role=hive_admin_user;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set user.name=hive_admin_user;
-set role ADMIN;
-
--- an error should be thrown if 'set role ' is done for role that does not exist
-
-create role rset_role_neg;
-grant role rset_role_neg to user user2;
-
-set user.name=user2;
-set role rset_role_neg;
-set role public;
-set role nosuchroleexists;;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_parts_nosel.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_parts_nosel.q
deleted file mode 100644
index d8190de950..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_parts_nosel.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-set user.name=user1;
-
--- check if alter table fails as different user
-create table t_show_parts(i int) partitioned by (j string);
-
-set user.name=user2;
-show partitions t_show_parts;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_no_admin.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_no_admin.q
deleted file mode 100644
index 2afe87fc30..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_no_admin.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
--- This test will fail because hive_test_user is not in admin role
-show principals role1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_v1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_v1.q
deleted file mode 100644
index 69cea2f267..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_role_principals_v1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- This test will fail because the command is not currently supported in auth mode v1
-show principals role1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_roles_no_admin.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_roles_no_admin.q
deleted file mode 100644
index 0fc9fca940..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_show_roles_no_admin.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
--- This test will fail because hive_test_user is not in admin role
-show roles;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_truncate.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_truncate.q
deleted file mode 100644
index 285600b23a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_truncate.q
+++ /dev/null
@@ -1,9 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
--- check add partition without insert privilege
-create table t1(i int, j int);
-set user.name=user1;
-truncate table t1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q
deleted file mode 100644
index d82ac710cc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_add_partition.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/a_uri_add_part;
-dfs -touchz ${system:test.tmp.dir}/a_uri_add_part/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/a_uri_add_part/1.txt;
-
-create table tpart(i int, j int) partitioned by (k string);
-alter table tpart add partition (k = 'abc') location '${system:test.tmp.dir}/a_uri_add_part/';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q
deleted file mode 100644
index d38ba74d90..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_alterpart_loc.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_alterpart_loc_perm;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_alterpart_loc;
-dfs -touchz ${system:test.tmp.dir}/az_uri_alterpart_loc/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/az_uri_alterpart_loc/1.txt;
-
-create table tpart(i int, j int) partitioned by (k string);
-alter table tpart add partition (k = 'abc') location '${system:test.tmp.dir}/az_uri_alterpart_loc_perm/';
-
-alter table tpart partition (k = 'abc') set location '${system:test.tmp.dir}/az_uri_alterpart_loc/';
-
-
--- Attempt to set partition to location without permissions should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q
deleted file mode 100644
index c446b8636f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_altertab_setloc.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_altertab_setloc;
-dfs -touchz ${system:test.tmp.dir}/az_uri_altertab_setloc/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/az_uri_altertab_setloc/1.txt;
-
-create table t1(i int);
-
-alter table t1 set location '${system:test.tmp.dir}/az_uri_altertab_setloc/1.txt'
-
--- Attempt to set location of table to a location without permissions should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q
deleted file mode 100644
index c8e1fb43ee..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/a_uri_crtab1;
-dfs -touchz ${system:test.tmp.dir}/a_uri_crtab1/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/a_uri_crtab1/1.txt;
-
-create table t1(i int) location '${system:test.tmp.dir}/a_uri_crtab_ext';
-
--- Attempt to create table with dir that does not have write permission should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q
deleted file mode 100644
index c8549b4563..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_create_table_ext.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/a_uri_crtab_ext;
-dfs -touchz ${system:test.tmp.dir}/a_uri_crtab_ext/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/a_uri_crtab_ext/1.txt;
-
-create external table t1(i int) location '${system:test.tmp.dir}/a_uri_crtab_ext';
-
--- Attempt to create table with dir that does not have write permission should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_createdb.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_createdb.q
deleted file mode 100644
index edfdf5a8fc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_createdb.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_createdb;
-dfs -touchz ${system:test.tmp.dir}/az_uri_createdb/1.txt;
-dfs -chmod 300 ${system:test.tmp.dir}/az_uri_createdb/1.txt;
-
-create database az_test_db location '${system:test.tmp.dir}/az_uri_createdb/';
-
--- Attempt to create db for dir without sufficient permissions should fail
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_export.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_export.q
deleted file mode 100644
index 81763916a0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_export.q
+++ /dev/null
@@ -1,22 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=export_auth_uri;
-
-
-create table export_auth_uri ( dep_id int comment "department id")
- stored as textfile;
-
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/export_auth_uri/temp;
-dfs -rmr target/tmp/ql/test/data/exports/export_auth_uri;
-
-
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/export_auth_uri/;
-dfs -chmod 555 target/tmp/ql/test/data/exports/export_auth_uri;
-
-export table export_auth_uri to 'ql/test/data/exports/export_auth_uri';
-
--- Attempt to export to location without sufficient permissions should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_import.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_import.q
deleted file mode 100644
index 4ea4dc0a47..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_import.q
+++ /dev/null
@@ -1,25 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=import_auth_uri;
-
-
-create table import_auth_uri ( dep_id int comment "department id")
- stored as textfile;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/import_auth_uri/temp;
-dfs -rmr target/tmp/ql/test/data/exports/import_auth_uri;
-export table import_auth_uri to 'ql/test/data/exports/import_auth_uri';
-drop table import_auth_uri;
-
-dfs -touchz target/tmp/ql/test/data/exports/import_auth_uri/1.txt;
-dfs -chmod 555 target/tmp/ql/test/data/exports/import_auth_uri/1.txt;
-
-create database importer;
-use importer;
-
-import from 'ql/test/data/exports/import_auth_uri';
-
--- Attempt to import from location without sufficient permissions should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_index.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_index.q
deleted file mode 100644
index 1a8f9cb2ad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_index.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_index;
-dfs -touchz ${system:test.tmp.dir}/az_uri_index/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/az_uri_index/1.txt;
-
-
-create table t1(i int);
-create index idt1 on table t1 (i) as 'COMPACT' WITH DEFERRED REBUILD LOCATION '${system:test.tmp.dir}/az_uri_index/';
-
--- Attempt to use location for index that does not have permissions should fail
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert.q
deleted file mode 100644
index 81b6e522c1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_insert;
-dfs -touchz ${system:test.tmp.dir}/az_uri_insert/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/az_uri_insert/1.txt;
-
-create table t1(i int, j int);
-
-insert overwrite directory '${system:test.tmp.dir}/az_uri_insert/' select * from t1;
-
--- Attempt to insert into uri without permissions should fail
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q
deleted file mode 100644
index 0a2fd8919f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_insert_local.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/az_uri_insert_local;
-dfs -touchz ${system:test.tmp.dir}/az_uri_insert_local/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/az_uri_insert_local/1.txt;
-
-create table t1(i int, j int);
-
-insert overwrite local directory '${system:test.tmp.dir}/az_uri_insert_local/' select * from t1;
-
--- Attempt to insert into uri without permissions should fail
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_load_data.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_load_data.q
deleted file mode 100644
index 6af41f0cda..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorization_uri_load_data.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/authz_uri_load_data;
-dfs -touchz ${system:test.tmp.dir}/authz_uri_load_data/1.txt;
-dfs -chmod 555 ${system:test.tmp.dir}/authz_uri_load_data/1.txt;
-
-create table t1(i int);
-load data inpath 'pfile:${system:test.tmp.dir}/authz_uri_load_data/' overwrite into table t1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_create_tbl.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_create_tbl.q
deleted file mode 100644
index d8beac370d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_create_tbl.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
-
-set hive.security.authorization.enabled=true;
-set user.name=user33;
-create database db23221;
-use db23221;
-
-set user.name=user44;
-create table twew221(a string);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_grant_public.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_grant_public.q
deleted file mode 100644
index bfd3165237..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_grant_public.q
+++ /dev/null
@@ -1 +0,0 @@
-grant role PUBLIC to user hive_test_user;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_revoke_public.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_revoke_public.q
deleted file mode 100644
index 2b29822371..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/authorize_revoke_public.q
+++ /dev/null
@@ -1 +0,0 @@
-revoke role PUBLIC from user hive_test_user;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/autolocal1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/autolocal1.q
deleted file mode 100644
index bd1c9d6e15..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/autolocal1.q
+++ /dev/null
@@ -1,15 +0,0 @@
-set mapred.job.tracker=abracadabra;
-set hive.exec.mode.local.auto.inputbytes.max=1;
-set hive.exec.mode.local.auto=true;
-
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20)
--- hadoop0.23 changes the behavior of JobClient initialization
--- in hadoop0.20, JobClient initialization tries to get JobTracker's address
--- this throws the expected IllegalArgumentException
--- in hadoop0.23, JobClient initialization only initializes cluster
--- and get user group information
--- not attempts to get JobTracker's address
--- no IllegalArgumentException thrown in JobClient Initialization
--- an exception is thrown when JobClient submitJob
-
-SELECT key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_exec_hooks.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_exec_hooks.q
deleted file mode 100644
index 709d8d9c85..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_exec_hooks.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.exec.pre.hooks="org.this.is.a.bad.class";
-
-EXPLAIN
-SELECT x.* FROM SRC x LIMIT 20;
-
-SELECT x.* FROM SRC x LIMIT 20;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_indextype.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_indextype.q
deleted file mode 100644
index 8f5bf42664..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_indextype.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) AS 'UNKNOWN' WITH DEFERRED REBUILD;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_sample_clause.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_sample_clause.q
deleted file mode 100644
index fd6769827b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bad_sample_clause.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE;
-
-INSERT OVERWRITE TABLE dest1 SELECT s.*
-FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 2) s
-WHERE s.ds='2008-04-08' and s.hr='11';
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q
deleted file mode 100644
index 6bebb8942d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_mismatch1.q
+++ /dev/null
@@ -1,42 +0,0 @@
-CREATE TABLE srcbucket_mapjoin_part (key int, value string)
- partitioned by (ds string) CLUSTERED BY (key) INTO 3 BUCKETS
- STORED AS TEXTFILE;
-load data local inpath '../../data/files/srcbucket20.txt'
- INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
-load data local inpath '../../data/files/srcbucket21.txt'
- INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
-load data local inpath '../../data/files/srcbucket22.txt'
- INTO TABLE srcbucket_mapjoin_part partition(ds='2008-04-08');
-
-CREATE TABLE srcbucket_mapjoin_part_2 (key int, value string)
- partitioned by (ds string) CLUSTERED BY (key) INTO 2 BUCKETS
- STORED AS TEXTFILE;
-load data local inpath '../../data/files/srcbucket22.txt'
- INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08');
-load data local inpath '../../data/files/srcbucket23.txt'
- INTO TABLE srcbucket_mapjoin_part_2 partition(ds='2008-04-08');
-
--- The number of buckets in the 2 tables above (being joined later) dont match.
--- Throw an error if the user requested a bucketed mapjoin to be enforced.
--- In the default case (hive.enforce.bucketmapjoin=false), the query succeeds
--- even though mapjoin is not being performed
-
-explain
-select a.key, a.value, b.value
-from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
-on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08";
-
-set hive.optimize.bucketmapjoin = true;
-
-explain
-select /*+mapjoin(b)*/ a.key, a.value, b.value
-from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
-on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08";
-
-set hive.enforce.bucketmapjoin=true;
-
-explain
-select /*+mapjoin(b)*/ a.key, a.value, b.value
-from srcbucket_mapjoin_part a join srcbucket_mapjoin_part_2 b
-on a.key=b.key and a.ds="2008-04-08" and b.ds="2008-04-08";
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q
deleted file mode 100644
index 802fcd903c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_1.q
+++ /dev/null
@@ -1,20 +0,0 @@
--- Although the user has specified a bucketed map-join, the number of buckets in the table
--- do not match the number of files
-drop table table1;
-drop table table2;
-
-create table table1(key string, value string) clustered by (key, value)
-into 2 BUCKETS stored as textfile;
-create table table2(key string, value string) clustered by (value, key)
-into 2 BUCKETS stored as textfile;
-
-load data local inpath '../../data/files/T1.txt' overwrite into table table1;
-
-load data local inpath '../../data/files/T1.txt' overwrite into table table2;
-load data local inpath '../../data/files/T2.txt' overwrite into table table2;
-
-set hive.optimize.bucketmapjoin = true;
-set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
-
-select /*+ mapjoin(b) */ count(*) from table1 a join table2 b on a.key=b.key and a.value=b.value;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q
deleted file mode 100644
index ac5abebb0b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/bucket_mapjoin_wrong_table_metadata_2.q
+++ /dev/null
@@ -1,24 +0,0 @@
--- Although the user has specified a bucketed map-join, the number of buckets in the table
--- do not match the number of files
-drop table table1;
-drop table table2;
-
-create table table1(key string, value string) partitioned by (ds string) clustered by (key, value)
-into 2 BUCKETS stored as textfile;
-create table table2(key string, value string) clustered by (value, key)
-into 2 BUCKETS stored as textfile;
-
-load data local inpath '../../data/files/T1.txt' overwrite into table table1 partition (ds='1');
-load data local inpath '../../data/files/T2.txt' overwrite into table table1 partition (ds='1');
-
-load data local inpath '../../data/files/T1.txt' overwrite into table table1 partition (ds='2');
-
-load data local inpath '../../data/files/T1.txt' overwrite into table table2;
-load data local inpath '../../data/files/T2.txt' overwrite into table table2;
-
-set hive.optimize.bucketmapjoin = true;
-set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
-
-select /*+ mapjoin(b) */ count(*) from table1 a join table2 b
-on a.key=b.key and a.value=b.value and a.ds is not null;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cachingprintstream.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cachingprintstream.q
deleted file mode 100644
index d57a4517f0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cachingprintstream.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifyCachingPrintStreamHook;
-set hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyCachingPrintStreamHook;
-
-SELECT count(*) FROM src;
-FROM src SELECT TRANSFORM (key, value) USING 'FAKE_SCRIPT_SHOULD_NOT_EXIST' AS key, value;
-
-set hive.exec.failure.hooks=;
-set hive.exec.post.hooks=;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cluster_tasklog_retrieval.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cluster_tasklog_retrieval.q
deleted file mode 100644
index bc980448a9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cluster_tasklog_retrieval.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- TaskLog retrieval upon Null Pointer Exception in Cluster
-
-CREATE TEMPORARY FUNCTION evaluate_npe AS 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFEvaluateNPE';
-
-FROM src
-SELECT evaluate_npe(src.key) LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbydistributeby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbydistributeby.q
deleted file mode 100644
index 4c6a9b38d7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbydistributeby.q
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
-
-FROM src
-INSERT OVERWRITE TABLE dest1
-MAP src.key, CAST(src.key / 10 AS INT), CAST(src.key % 10 AS INT), src.value
-USING 'cat' AS (tkey, ten, one, tvalue)
-CLUSTER BY tvalue, tkey
-DISTRIBUTE BY tvalue, tkey;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbyorderby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbyorderby.q
deleted file mode 100644
index d9ee9b9d26..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbyorderby.q
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM src
-MAP src.key, CAST(src.key / 10 AS INT), CAST(src.key % 10 AS INT), src.value
-USING 'cat' AS (tkey, ten, one, tvalue)
-CLUSTER BY tvalue, tkey
-ORDER BY ten, one;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbysortby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbysortby.q
deleted file mode 100644
index 7b4e744ba6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clusterbysortby.q
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
-
-FROM src
-INSERT OVERWRITE TABLE dest1
-MAP src.key, CAST(src.key / 10 AS INT), CAST(src.key % 10 AS INT), src.value
-USING 'cat' AS (tkey, ten, one, tvalue)
-CLUSTER BY tvalue, tkey
-SORT BY ten, one;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern2.q
deleted file mode 100644
index 9ed8944d2b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPLAIN
-SELECT x.key, x.value as v1, y.* FROM SRC x JOIN SRC y ON (x.key = y.key) CLUSTER BY key;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern3.q
deleted file mode 100644
index 23f73667ed..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern3.q
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPLAIN
-SELECT x.key as k1, x.value FROM SRC x CLUSTER BY x.key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern4.q
deleted file mode 100644
index 3a9b45ca60..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/clustern4.q
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPLAIN
-SELECT x.key as k1, x.value FROM SRC x CLUSTER BY key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q
deleted file mode 100644
index 9a3e0b2efe..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_change_skewedcol_type1.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-
-CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6);
-
-ALTER TABLE skewedtable CHANGE key key INT;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename1.q
deleted file mode 100644
index d99b821802..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename1.q
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table tstsrc;
-create table tstsrc like src;
-insert overwrite table tstsrc
-select key, value from src;
-
-alter table tstsrc change src_not_exist key_value string;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename2.q
deleted file mode 100644
index cccc8ad54e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename2.q
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table tstsrc;
-create table tstsrc like src;
-insert overwrite table tstsrc
-select key, value from src;
-
-alter table tstsrc change key value string;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename3.q
deleted file mode 100644
index 91c9537a99..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename3.q
+++ /dev/null
@@ -1 +0,0 @@
-alter table src change key key; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename4.q
deleted file mode 100644
index dd89a5a10b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename4.q
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table tstsrc;
-create table tstsrc like src;
-insert overwrite table tstsrc
-select key, value from src;
-
-alter table tstsrc change key key2 string after key_value;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename5.q
deleted file mode 100644
index 3827b83361..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/column_rename5.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-
-CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6);
-
-ALTER TABLE skewedtable CHANGE key key_new STRING;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_dp.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_dp.q
deleted file mode 100644
index b4887c4115..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_dp.q
+++ /dev/null
@@ -1,16 +0,0 @@
-DROP TABLE Employee_Part;
-
-CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
-row format delimited fields terminated by '|' stored as textfile;
-
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK');
-
--- dynamic partitioning syntax
-explain
-analyze table Employee_Part partition (employeeSalary='4000.0', country) compute statistics for columns employeeName, employeeID;
-analyze table Employee_Part partition (employeeSalary='4000.0', country) compute statistics for columns employeeName, employeeID;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_incorrect_num_keys.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_incorrect_num_keys.q
deleted file mode 100644
index 2f8e9271dd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_incorrect_num_keys.q
+++ /dev/null
@@ -1,16 +0,0 @@
-DROP TABLE Employee_Part;
-
-CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
-row format delimited fields terminated by '|' stored as textfile;
-
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK');
-
--- don't specify all partitioning keys
-explain
-analyze table Employee_Part partition (employeeSalary='2000.0') compute statistics for columns employeeID;
-analyze table Employee_Part partition (employeeSalary='2000.0') compute statistics for columns employeeID;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_invalid_values.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_invalid_values.q
deleted file mode 100644
index 34f91fc8d1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_invalid_values.q
+++ /dev/null
@@ -1,16 +0,0 @@
-DROP TABLE Employee_Part;
-
-CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
-row format delimited fields terminated by '|' stored as textfile;
-
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK');
-
--- specify invalid values for the partitioning keys
-explain
-analyze table Employee_Part partition (employeeSalary='4000.0', country='Canada') compute statistics for columns employeeName, employeeID;
-analyze table Employee_Part partition (employeeSalary='4000.0', country='Canada') compute statistics for columns employeeName, employeeID;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_multiple_part_clause.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_multiple_part_clause.q
deleted file mode 100644
index 49d89dd121..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_partlvl_multiple_part_clause.q
+++ /dev/null
@@ -1,16 +0,0 @@
-DROP TABLE Employee_Part;
-
-CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
-row format delimited fields terminated by '|' stored as textfile;
-
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='2000.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='4000.0', country='USA');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3500.0', country='UK');
-LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee_Part partition(employeeSalary='3000.0', country='UK');
-
--- specify partitioning clause multiple times
-explain
-analyze table Employee_Part partition (employeeSalary='4000.0', country='USA') partition(employeeSalary='2000.0', country='USA') compute statistics for columns employeeName, employeeID;
-analyze table Employee_Part partition (employeeSalary='4000.0', country='USA') partition(employeeSalary='2000.0', country='USA') compute statistics for columns employeeName, employeeID;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl.q
deleted file mode 100644
index a4e0056bff..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl.q
+++ /dev/null
@@ -1,22 +0,0 @@
-
-DROP TABLE IF EXISTS UserVisits_web_text_none;
-
-CREATE TABLE UserVisits_web_text_none (
- sourceIP string,
- destURL string,
- visitDate string,
- adRevenue float,
- userAgent string,
- cCode string,
- lCode string,
- sKeyword string,
- avgTimeOnSite int)
-row format delimited fields terminated by '|' stored as textfile;
-
-LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none;
-
-explain
-analyze table UserVisits_web_text_none compute statistics for columns destIP;
-
-analyze table UserVisits_web_text_none compute statistics for columns destIP;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_complex_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_complex_type.q
deleted file mode 100644
index 85a5f0a021..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_complex_type.q
+++ /dev/null
@@ -1,17 +0,0 @@
-
-DROP TABLE IF EXISTS table_complex_type;
-
-CREATE TABLE table_complex_type (
- a STRING,
- b ARRAY<STRING>,
- c ARRAY<MAP<STRING,STRING>>,
- d MAP<STRING,ARRAY<STRING>>
- ) STORED AS TEXTFILE;
-
-LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table_complex_type;
-
-
-explain
-analyze table table_complex_type compute statistics for columns d;
-
-analyze table table_complex_type compute statistics for columns d;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_incorrect_column.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_incorrect_column.q
deleted file mode 100644
index a4e0056bff..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/columnstats_tbllvl_incorrect_column.q
+++ /dev/null
@@ -1,22 +0,0 @@
-
-DROP TABLE IF EXISTS UserVisits_web_text_none;
-
-CREATE TABLE UserVisits_web_text_none (
- sourceIP string,
- destURL string,
- visitDate string,
- adRevenue float,
- userAgent string,
- cCode string,
- lCode string,
- sKeyword string,
- avgTimeOnSite int)
-row format delimited fields terminated by '|' stored as textfile;
-
-LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none;
-
-explain
-analyze table UserVisits_web_text_none compute statistics for columns destIP;
-
-analyze table UserVisits_web_text_none compute statistics for columns destIP;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_double_bigint.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_double_bigint.q
deleted file mode 100644
index 8ee4b277cb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_double_bigint.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.mapred.mode=strict;
-
--- This should fail until we fix the issue with precision when casting a bigint to a double
-
-select * from src where cast(1 as bigint) = 1.0 limit 10; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_string_bigint.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_string_bigint.q
deleted file mode 100644
index 810f65d4d2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compare_string_bigint.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.mapred.mode=strict;
-
---This should fail until we fix the issue with precision when casting a bigint to a double
-
-select * from src where cast(1 as bigint) = '1' limit 10; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compile_processor.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compile_processor.q
deleted file mode 100644
index c314a940f9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compile_processor.q
+++ /dev/null
@@ -1,8 +0,0 @@
-
-compile `import org.apache.hadoop.hive.ql.exec.UDF \;
-public class Pyth extsfgsfgfsends UDF {
- public double evaluate(double a, double b){
- return Math.sqrt((a*a) + (b*b)) \;
- }
-} ` AS GROOVY NAMED Pyth.groovy;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compute_stats_long.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compute_stats_long.q
deleted file mode 100644
index 5974811280..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/compute_stats_long.q
+++ /dev/null
@@ -1,7 +0,0 @@
-create table tab_int(a int);
-
--- insert some data
-LOAD DATA LOCAL INPATH "../../data/files/int.txt" INTO TABLE tab_int;
-
--- compute stats should raise an error since the number of bit vectors > 1024
-select compute_stats(a, 10000) from tab_int;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_class.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_class.q
deleted file mode 100644
index 3b71e00b2e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_class.q
+++ /dev/null
@@ -1 +0,0 @@
-create function default.badfunc as 'my.nonexistent.class';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_db.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_db.q
deleted file mode 100644
index ae95391edd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonexistent_db.q
+++ /dev/null
@@ -1 +0,0 @@
-create function nonexistentdb.badfunc as 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonudf_class.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonudf_class.q
deleted file mode 100644
index 2083064593..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_function_nonudf_class.q
+++ /dev/null
@@ -1 +0,0 @@
-create function default.badfunc as 'java.lang.String';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_insert_outputformat.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_insert_outputformat.q
deleted file mode 100644
index a052663055..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_insert_outputformat.q
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-CREATE TABLE table_test_output_format(key INT, value STRING) STORED AS
- INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
- OUTPUTFORMAT 'org.apache.hadoop.mapred.MapFileOutputFormat';
-
-FROM src
-INSERT OVERWRITE TABLE table_test_output_format SELECT src.key, src.value LIMIT 10;
-
-describe table_test_output_format;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view1.q
deleted file mode 100644
index c332278b84..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view1.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- Cannot add or drop partition columns with CREATE OR REPLACE VIEW if partitions currently exist (must specify partition columns)
-
-drop view v;
-create view v partitioned on (ds, hr) as select * from srcpart;
-alter view v add partition (ds='1',hr='2');
-create or replace view v as select * from srcpart; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view2.q
deleted file mode 100644
index b53dd07ce8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view2.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- Cannot add or drop partition columns with CREATE OR REPLACE VIEW if partitions currently exist
-
-drop view v;
-create view v partitioned on (ds, hr) as select * from srcpart;
-alter view v add partition (ds='1',hr='2');
-create or replace view v partitioned on (hr) as select * from srcpart; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view3.q
deleted file mode 100644
index d6fa7785df..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view3.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- Existing table is not a view
-
-create or replace view src as select ds, hr from srcpart; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view4.q
deleted file mode 100644
index 12b6059b9e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view4.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- View must have at least one non-partition column.
-
-drop view v;
-create view v partitioned on (ds, hr) as select * from srcpart;
-create or replace view v partitioned on (ds, hr) as select ds, hr from srcpart; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view5.q
deleted file mode 100644
index 4eb9c94896..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view5.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- Can't combine IF NOT EXISTS and OR REPLACE.
-
-drop view v;
-create view v partitioned on (ds, hr) as select * from srcpart;
-create or replace view if not exists v as select * from srcpart; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view6.q
deleted file mode 100644
index a2f916fb26..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view6.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- Can't update view to have an invalid definition
-
-drop view v;
-create view v partitioned on (ds, hr) as select * from srcpart;
-create or replace view v partitioned on (ds, hr) as blah; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view7.q
deleted file mode 100644
index 765a96572a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view7.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- Can't update view to have a view cycle (1)
-
-drop view v;
-create view v1 partitioned on (ds, hr) as select * from srcpart;
-create view v2 partitioned on (ds, hr) as select * from v1;
-create view v3 partitioned on (ds, hr) as select * from v2;
-create or replace view v1 partitioned on (ds, hr) as select * from v3; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view8.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view8.q
deleted file mode 100644
index f3a59b1d07..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_or_replace_view8.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- Can't update view to have a view cycle (2)
-
-drop view v;
-create view v1 partitioned on (ds, hr) as select * from srcpart;
-create or replace view v1 partitioned on (ds, hr) as select * from v1; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q
deleted file mode 100644
index 1d6574e739..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_col_name_value_no_mismatch.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-
-CREATE TABLE skewed_table (key STRING, value STRING) SKEWED BY (key) ON ((1),(5,8),(6));
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q
deleted file mode 100644
index 726f6dd1df..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_dup_col_name.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-
-CREATE TABLE skewed_table (key STRING, value STRING) SKEWED BY (key,key) ON ((1),(5),(6));
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q
deleted file mode 100644
index 30dd418165..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_skewed_table_failure_invalid_col_name.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-
-CREATE TABLE skewed_table (key STRING, value STRING) SKEWED BY (key_non) ON ((1),(5),(6));
- \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure1.q
deleted file mode 100644
index e87c12b8a1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure1.q
+++ /dev/null
@@ -1 +0,0 @@
-create table table_in_database_creation_not_exist.test as select * from src limit 1; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure2.q
deleted file mode 100644
index 0bddae0664..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure2.q
+++ /dev/null
@@ -1 +0,0 @@
-create table `table_in_database_creation_not_exist.test` as select * from src limit 1; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure3.q
deleted file mode 100644
index 9f9f5f64df..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure3.q
+++ /dev/null
@@ -1 +0,0 @@
-create table table_in_database_creation_not_exist.test (a string); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure4.q
deleted file mode 100644
index 67745e0111..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_failure4.q
+++ /dev/null
@@ -1 +0,0 @@
-create table `table_in_database_creation_not_exist.test` (a string); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_wrong_regex.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_wrong_regex.q
deleted file mode 100644
index dc91c9c9ef..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_table_wrong_regex.q
+++ /dev/null
@@ -1,4 +0,0 @@
-drop table aa;
-create table aa ( test STRING )
- ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.RegexSerDe'
- WITH SERDEPROPERTIES ("input.regex" = "[^\\](.*)", "output.format.string" = "$1s");
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_udaf_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_udaf_failure.q
deleted file mode 100644
index e0bb408a64..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_udaf_failure.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TEMPORARY FUNCTION test_udaf AS 'org.apache.hadoop.hive.ql.udf.UDAFWrongArgLengthForTestCase';
-
-EXPLAIN
-SELECT test_udaf(length(src.value)) FROM src;
-
-SELECT test_udaf(length(src.value)) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_genericudf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_genericudf.q
deleted file mode 100644
index 07010c11c7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_genericudf.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TEMPORARY FUNCTION dummy_genericudf AS 'org.apache.hadoop.hive.ql.udf.generic.DummyGenericUDF';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_udf_udaf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_udf_udaf.q
deleted file mode 100644
index a243fff033..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_unknown_udf_udaf.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TEMPORARY FUNCTION dummy_function AS 'org.apache.hadoop.hive.ql.udf.DummyFunction';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure1.q
deleted file mode 100644
index c9060c6766..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure1.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-DROP VIEW xxx12;
-
--- views and tables share the same namespace
-CREATE TABLE xxx12(key int);
-CREATE VIEW xxx12 AS SELECT key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure2.q
deleted file mode 100644
index 6fdcd4a9d3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure2.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-DROP VIEW xxx4;
-
--- views and tables share the same namespace
-CREATE VIEW xxx4 AS SELECT key FROM src;
-CREATE TABLE xxx4(key int);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure3.q
deleted file mode 100644
index ad5fc499ed..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure3.q
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP VIEW xxx13;
-
--- number of explicit view column defs must match underlying SELECT
-CREATE VIEW xxx13(x,y,z) AS
-SELECT key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure4.q
deleted file mode 100644
index eecde65e11..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure4.q
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP VIEW xxx5;
-
--- duplicate column names are illegal
-CREATE VIEW xxx5(x,x) AS
-SELECT key,value FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure5.q
deleted file mode 100644
index f720899168..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure5.q
+++ /dev/null
@@ -1,9 +0,0 @@
-DROP VIEW xxx14;
-
--- Ideally (and according to SQL:200n), this should actually be legal,
--- but since internally we impose the new column descriptors by
--- reference to underlying name rather than position, we have to make
--- it illegal. There's an easy workaround (provide the unique names
--- via direct column aliases, e.g. SELECT key AS x, key AS y)
-CREATE VIEW xxx14(x,y) AS
-SELECT key,key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure6.q
deleted file mode 100644
index 57f52a8af1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure6.q
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP VIEW xxx15;
-
--- should fail: baz is not a column
-CREATE VIEW xxx15
-PARTITIONED ON (baz)
-AS SELECT key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure7.q
deleted file mode 100644
index 00d7f9fbf4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure7.q
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP VIEW xxx16;
-
--- should fail: must have at least one non-partitioning column
-CREATE VIEW xxx16
-PARTITIONED ON (key)
-AS SELECT key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure8.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure8.q
deleted file mode 100644
index 08291826d9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure8.q
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP VIEW xxx17;
-
--- should fail: partitioning key must be at end
-CREATE VIEW xxx17
-PARTITIONED ON (key)
-AS SELECT key,value FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure9.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure9.q
deleted file mode 100644
index d7d44a49c3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/create_view_failure9.q
+++ /dev/null
@@ -1,6 +0,0 @@
-DROP VIEW xxx18;
-
--- should fail: partitioning columns out of order
-CREATE VIEW xxx18
-PARTITIONED ON (value,key)
-AS SELECT key+1 as k2,key,value FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ctas.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ctas.q
deleted file mode 100644
index 507a7a76b1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ctas.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-create external table nzhang_ctas4 as select key, value from src;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_recursion.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_recursion.q
deleted file mode 100644
index 2160b47196..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_recursion.q
+++ /dev/null
@@ -1,4 +0,0 @@
-explain
-with q1 as ( select key from q2 where key = '5'),
-q2 as ( select key from q1 where key = '5')
-select * from (select key from q1) a; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_with_in_subquery.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_with_in_subquery.q
deleted file mode 100644
index e52a1d97db..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/cte_with_in_subquery.q
+++ /dev/null
@@ -1 +0,0 @@
-select * from (with q1 as ( select key from q2 where key = '5') select * from q1) a;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_already_exists.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_already_exists.q
deleted file mode 100644
index 3af7607739..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_already_exists.q
+++ /dev/null
@@ -1,5 +0,0 @@
-SHOW DATABASES;
-
--- Try to create a database that already exists
-CREATE DATABASE test_db;
-CREATE DATABASE test_db;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_invalid_name.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_invalid_name.q
deleted file mode 100644
index 5d6749542b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_create_invalid_name.q
+++ /dev/null
@@ -1,4 +0,0 @@
-SHOW DATABASES;
-
--- Try to create a database with an invalid name
-CREATE DATABASE `test.db`;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_does_not_exist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_does_not_exist.q
deleted file mode 100644
index 66a940e63d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_does_not_exist.q
+++ /dev/null
@@ -1,4 +0,0 @@
-SHOW DATABASES;
-
--- Try to drop a database that does not exist
-DROP DATABASE does_not_exist;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty.q
deleted file mode 100644
index ae5a443f10..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty.q
+++ /dev/null
@@ -1,8 +0,0 @@
-SHOW DATABASES;
-
--- Try to drop a non-empty database
-CREATE DATABASE test_db;
-USE test_db;
-CREATE TABLE t(a INT);
-USE default;
-DROP DATABASE test_db;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty_restrict.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty_restrict.q
deleted file mode 100644
index e1cb81c93f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_drop_not_empty_restrict.q
+++ /dev/null
@@ -1,8 +0,0 @@
-SHOW DATABASES;
-
--- Try to drop a non-empty database in restrict mode
-CREATE DATABASE db_drop_non_empty_restrict;
-USE db_drop_non_empty_restrict;
-CREATE TABLE t(a INT);
-USE default;
-DROP DATABASE db_drop_non_empty_restrict;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_switch_does_not_exist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_switch_does_not_exist.q
deleted file mode 100644
index 5cd469769e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/database_switch_does_not_exist.q
+++ /dev/null
@@ -1,4 +0,0 @@
-SHOW DATABASES;
-
--- Try to switch to a database that does not exist
-USE does_not_exist;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal2.q
deleted file mode 100644
index 711dc9e0fd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- Not in YYYY-MM-DD format
-SELECT DATE '2001/01/01' FROM src LIMIT 2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal3.q
deleted file mode 100644
index 9483509b6b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/date_literal3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- Invalid date value
-SELECT DATE '2001-01-32' FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodblock.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodblock.q
deleted file mode 100644
index 1c658c79b9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodblock.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.support.concurrency=true;
-set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-
-drop database if exists drop_nodblock;
-create database drop_nodblock;
-lock database drop_nodblock shared;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodbunlock.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodbunlock.q
deleted file mode 100644
index ef4b323f06..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_nodbunlock.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.support.concurrency=true;
-set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-
-drop database if exists drop_nodbunlock;
-create database drop_nodbunlock;
-unlock database drop_nodbunlock;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notablelock.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notablelock.q
deleted file mode 100644
index 4a0c6c25c6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notablelock.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.support.concurrency=true;
-set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-
-drop table if exists drop_notablelock;
-create table drop_notablelock (c int);
-lock table drop_notablelock shared;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notableunlock.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notableunlock.q
deleted file mode 100644
index 0b00046579..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dbtxnmgr_notableunlock.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.support.concurrency=true;
-set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-
-drop table if exists drop_notableunlock;
-create table drop_notableunlock (c int);
-unlock table drop_notableunlock;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ddltime.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ddltime.q
deleted file mode 100644
index 3517a6046d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ddltime.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-create table T2 like srcpart;
-
-insert overwrite table T2 partition (ds = '2010-06-21', hr='1') select /*+ HOLD_DDLTIME */ key, value from src where key > 10;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision.q
deleted file mode 100644
index f49649837e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision.q
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP TABLE IF EXISTS DECIMAL_PRECISION;
-
-CREATE TABLE DECIMAL_PRECISION(dec decimal)
-ROW FORMAT DELIMITED
- FIELDS TERMINATED BY ' '
-STORED AS TEXTFILE;
-
-SELECT dec * 123456789012345678901234567890.123456789bd FROM DECIMAL_PRECISION;
-
-DROP TABLE DECIMAL_PRECISION;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision_1.q
deleted file mode 100644
index 036ff1facc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/decimal_precision_1.q
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP TABLE IF EXISTS DECIMAL_PRECISION;
-
-CREATE TABLE DECIMAL_PRECISION(dec decimal)
-ROW FORMAT DELIMITED
- FIELDS TERMINATED BY ' '
-STORED AS TEXTFILE;
-
-SELECT * from DECIMAL_PRECISION WHERE dec > 1234567890123456789.0123456789bd;
-
-DROP TABLE DECIMAL_PRECISION;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/default_partition_name.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/default_partition_name.q
deleted file mode 100644
index 816b6cb80a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/default_partition_name.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table default_partition_name (key int, value string) partitioned by (ds string);
-
-alter table default_partition_name add partition(ds='__HIVE_DEFAULT_PARTITION__');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/deletejar.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/deletejar.q
deleted file mode 100644
index 0bd6985e03..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/deletejar.q
+++ /dev/null
@@ -1,4 +0,0 @@
-
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
-DELETE JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
-CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure1.q
deleted file mode 100644
index f7304b12e6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure1.q
+++ /dev/null
@@ -1 +0,0 @@
-DESC NonExistentTable;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure2.q
deleted file mode 100644
index f28b610466..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-DESC srcpart;
-DESC srcpart PARTITION(ds='2012-04-08', hr='15');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure3.q
deleted file mode 100644
index bee0ea5788..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/desc_failure3.q
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE DATABASE db1;
-CREATE TABLE db1.t1(key1 INT, value1 STRING) PARTITIONED BY (ds STRING, part STRING);
-
--- describe database.table.column
-DESCRIBE db1.t1.key1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath1.q
deleted file mode 100644
index ea72f83e1d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath1.q
+++ /dev/null
@@ -1 +0,0 @@
-describe src_thrift.$elem$;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath2.q
deleted file mode 100644
index f1fee1ac44..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath2.q
+++ /dev/null
@@ -1 +0,0 @@
-describe src_thrift.$key$;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath3.q
deleted file mode 100644
index 4a11f6845f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath3.q
+++ /dev/null
@@ -1 +0,0 @@
-describe src_thrift.lint.abc;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath4.q
deleted file mode 100644
index 0912bf1cd9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/describe_xpath4.q
+++ /dev/null
@@ -1 +0,0 @@
-describe src_thrift.mStringString.abc;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on1.q
deleted file mode 100644
index d0d748cf4f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on1.q
+++ /dev/null
@@ -1,17 +0,0 @@
-SET hive.metastore.disallow.incompatible.col.type.changes=true;
-SELECT * FROM src LIMIT 1;
-CREATE TABLE test_table123 (a INT, b MAP<STRING, STRING>) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE;
-INSERT OVERWRITE TABLE test_table123 PARTITION(ds="foo1") SELECT 1, MAP("a1", "b1") FROM src LIMIT 1;
-SELECT * from test_table123 WHERE ds="foo1";
-ALTER TABLE test_table123 REPLACE COLUMNS (a INT, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 REPLACE COLUMNS (a BIGINT, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 REPLACE COLUMNS (a INT, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 REPLACE COLUMNS (a DOUBLE, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 REPLACE COLUMNS (a TINYINT, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 REPLACE COLUMNS (a BOOLEAN, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 REPLACE COLUMNS (a TINYINT, b MAP<STRING, STRING>);
-ALTER TABLE test_table123 CHANGE COLUMN a a_new BOOLEAN;
--- All the above ALTERs will succeed since they are between compatible types.
--- The following ALTER will fail as MAP<STRING, STRING> and STRING are not
--- compatible.
-ALTER TABLE test_table123 REPLACE COLUMNS (a INT, b STRING);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on2.q
deleted file mode 100644
index 4460c3edd7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on2.q
+++ /dev/null
@@ -1,6 +0,0 @@
-SET hive.metastore.disallow.incompatible.col.type.changes=true;
-SELECT * FROM src LIMIT 1;
-CREATE TABLE test_table123 (a INT, b STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE;
-INSERT OVERWRITE TABLE test_table123 PARTITION(ds="foo1") SELECT 1, "one" FROM src LIMIT 1;
-SELECT * from test_table123 WHERE ds="foo1";
-ALTER TABLE test_table123 CHANGE COLUMN b b MAP<STRING, STRING>;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_func_nonexistent.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_func_nonexistent.q
deleted file mode 100644
index 892ef00e3f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_func_nonexistent.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.exec.drop.ignorenonexistent=false;
--- Can't use DROP FUNCTION if the function doesn't exist and IF EXISTS isn't specified
-drop function nonexistent_function;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_function_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_function_failure.q
deleted file mode 100644
index 51dc5e9d8e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_function_failure.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.exec.drop.ignorenonexistent=false;
--- Can't use DROP TEMPORARY FUNCTION if the function doesn't exist and IF EXISTS isn't specified
-DROP TEMPORARY FUNCTION UnknownFunction;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_index_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_index_failure.q
deleted file mode 100644
index 6e907dfa99..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_index_failure.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.exec.drop.ignorenonexistent=false;
--- Can't use DROP INDEX if the index doesn't exist and IF EXISTS isn't specified
-DROP INDEX UnknownIndex ON src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_native_udf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_native_udf.q
deleted file mode 100644
index ae047bbc17..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_native_udf.q
+++ /dev/null
@@ -1 +0,0 @@
-DROP TEMPORARY FUNCTION max;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_failure.q
deleted file mode 100644
index c2074f69cb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_failure.q
+++ /dev/null
@@ -1,11 +0,0 @@
-create table mp (a string) partitioned by (b string, c string);
-
-alter table mp add partition (b='1', c='1');
-alter table mp add partition (b='1', c='2');
-alter table mp add partition (b='2', c='2');
-
-show partitions mp;
-
-set hive.exec.drop.ignorenonexistent=false;
--- Can't use DROP PARTITION if the partition doesn't exist and IF EXISTS isn't specified
-alter table mp drop partition (b='3');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_filter_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_filter_failure.q
deleted file mode 100644
index df476ed7c4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_partition_filter_failure.q
+++ /dev/null
@@ -1,8 +0,0 @@
-create table ptestfilter1 (a string, b int) partitioned by (c string, d string);
-
-alter table ptestfilter1 add partition (c='US', d=1);
-show partitions ptestfilter1;
-
-set hive.exec.drop.ignorenonexistent=false;
-alter table ptestfilter1 drop partition (c='US', d<1);
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure1.q
deleted file mode 100644
index d47c08b876..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.exec.drop.ignorenonexistent=false;
--- Can't use DROP TABLE if the table doesn't exist and IF EXISTS isn't specified
-DROP TABLE UnknownTable;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure2.q
deleted file mode 100644
index 631e4ffba7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE VIEW xxx6 AS SELECT key FROM src;
--- Can't use DROP TABLE on a view
-DROP TABLE xxx6;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure3.q
deleted file mode 100644
index 534ce0b032..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_table_failure3.q
+++ /dev/null
@@ -1,12 +0,0 @@
-create database dtf3;
-use dtf3;
-
-create table drop_table_failure_temp(col STRING) partitioned by (p STRING);
-
-alter table drop_table_failure_temp add partition (p ='p1');
-alter table drop_table_failure_temp add partition (p ='p2');
-alter table drop_table_failure_temp add partition (p ='p3');
-
-alter table drop_table_failure_temp partition (p ='p3') ENABLE NO_DROP;
-
-drop table drop_table_failure_temp;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure1.q
deleted file mode 100644
index 79cb4e445b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure1.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-CREATE TABLE xxx1(key int);
-
--- Can't use DROP VIEW on a base table
-DROP VIEW xxx1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure2.q
deleted file mode 100644
index 93bb16232d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/drop_view_failure2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-SET hive.exec.drop.ignorenonexistent=false;
--- Can't use DROP VIEW if the view doesn't exist and IF EXISTS isn't specified
-DROP VIEW UnknownView;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform.q
deleted file mode 100644
index b2e8567f09..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform.q
+++ /dev/null
@@ -1 +0,0 @@
-FROM src SELECT TRANSFORM (key, value) USING "awk -F'\001' '{print $0}'" AS (foo, foo); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform_schema.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform_schema.q
deleted file mode 100644
index dabbc351bc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_alias_in_transform_schema.q
+++ /dev/null
@@ -1 +0,0 @@
-FROM src SELECT TRANSFORM (key, value) USING "awk -F'\001' '{print $0}'" AS (foo STRING, foo STRING); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert1.q
deleted file mode 100644
index fcbc7d5444..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert1.q
+++ /dev/null
@@ -1,7 +0,0 @@
-
-create table dest1_din1(key int, value string);
-
-from src
-insert overwrite table dest1_din1 select key, value
-insert overwrite table dest1_din1 select key, value;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert2.q
deleted file mode 100644
index 4f79a0352f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert2.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-create table dest1_din2(key int, value string) partitioned by (ds string);
-
-from src
-insert overwrite table dest1_din2 partition (ds='1') select key, value
-insert overwrite table dest1_din2 partition (ds='1') select key, value;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert3.q
deleted file mode 100644
index 7b271a56d1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/duplicate_insert3.q
+++ /dev/null
@@ -1,4 +0,0 @@
-
-from src
-insert overwrite directory '${system:test.tmp.dir}/dest1' select key, value
-insert overwrite directory '${system:test.tmp.dir}/dest1' select key, value;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part1.q
deleted file mode 100644
index 9f0b6c7a0c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nostrict;
-set hive.exec.max.dynamic.partitions=2;
-
-
-create table dynamic_partition (key string) partitioned by (value string);
-
-insert overwrite table dynamic_partition partition(hr) select key, value from src;
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part2.q
deleted file mode 100644
index 00a92783c0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part2.q
+++ /dev/null
@@ -1,11 +0,0 @@
-
-create table nzhang_part1 (key string, value string) partitioned by (ds string, hr string);
-
-set hive.exec.dynamic.partition=true;
-
-insert overwrite table nzhang_part1 partition(ds='11', hr) select key, value from srcpart where ds is not null;
-
-show partitions nzhang_part1;
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part3.q
deleted file mode 100644
index 7a8c58a6b2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part3.q
+++ /dev/null
@@ -1,9 +0,0 @@
-set hive.exec.max.dynamic.partitions=600;
-set hive.exec.max.dynamic.partitions.pernode=600;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set hive.exec.dynamic.partition=true;
-set hive.exec.max.created.files=100;
-
-create table nzhang_part( key string) partitioned by (value string);
-
-insert overwrite table nzhang_part partition(value) select key, value from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part4.q
deleted file mode 100644
index 9aff7aa631..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part4.q
+++ /dev/null
@@ -1,7 +0,0 @@
-create table nzhang_part4 (key string) partitioned by (ds string, hr string, value string);
-
-set hive.exec.dynamic.partition=true;
-
-insert overwrite table nzhang_part4 partition(value = 'aaa', ds='11', hr) select key, hr from srcpart where ds is not null;
-
-drop table nzhang_part4;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_empty.q.disabled b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_empty.q.disabled
deleted file mode 100644
index a8fce59500..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_empty.q.disabled
+++ /dev/null
@@ -1,24 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set hive.stats.autogether=false;
-set hive.error.on.empty.partition=true;
-
-create table dyn_err(key string, value string) partitioned by (ds string);
-
-insert overwrite table dyn_err partition(ds) select key, value, ds from srcpart where ds is not null and key = 'no exists';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max.q
deleted file mode 100644
index 6a7a6255b9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max.q
+++ /dev/null
@@ -1,16 +0,0 @@
-USE default;
-
--- Test of hive.exec.max.dynamic.partitions
--- Set hive.exec.max.dynamic.partitions.pernode to a large value so it will be ignored
-
-CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING);
-
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set hive.exec.max.dynamic.partitions=10;
-set hive.exec.max.dynamic.partitions.pernode=1000;
-
-INSERT OVERWRITE TABLE max_parts PARTITION(value)
-SELECT key, value
-FROM src
-LIMIT 50;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max_per_node.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max_per_node.q
deleted file mode 100644
index a411ec520b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dyn_part_max_per_node.q
+++ /dev/null
@@ -1,15 +0,0 @@
-USE default;
-
--- Test of hive.exec.max.dynamic.partitions.pernode
-
-CREATE TABLE max_parts(key STRING) PARTITIONED BY (value STRING);
-
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set hive.exec.max.dynamic.partitions=1000;
-set hive.exec.max.dynamic.partitions.pernode=10;
-
-INSERT OVERWRITE TABLE max_parts PARTITION(value)
-SELECT key, value
-FROM src
-LIMIT 50;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q
deleted file mode 100644
index 0ad99d100d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/dynamic_partitions_with_whitelist.q
+++ /dev/null
@@ -1,17 +0,0 @@
-SET hive.metastore.partition.name.whitelist.pattern=[^9]*;
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifyTableDirectoryIsEmptyHook;
-
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-
-create table source_table like srcpart;
-
-create table dest_table like srcpart;
-
-load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE source_table partition(ds='2008-04-08', hr=11);
-
--- Tests creating dynamic partitions with characters not in the whitelist (i.e. 9)
--- If the directory is not empty the hook will throw an error, instead the error should come from the metastore
--- This shows that no dynamic partitions were created and left behind or had directories created
-
-insert overwrite table dest_table partition (ds, hr) select key, hr, ds, value from source_table where ds='2008-04-08' order by value asc;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
deleted file mode 100644
index ca60d047ef..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='h1');
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='h2');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
--- for exchange_part_test1 the value of ds is not given and the value of hr is given, thus this query will fail
-alter table exchange_part_test1 exchange partition (hr='h1') with table exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
deleted file mode 100644
index 7083edc32b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05');
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
--- exchange_part_test1 table partition (ds='2013-04-05') already exists thus this query will fail
-alter table exchange_part_test1 exchange partition (ds='2013-04-05') with table exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
deleted file mode 100644
index 6dfe81a8b0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1');
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2');
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='3');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
--- exchange_part_test1 table partition (ds='2013-04-05') already exists thus this query will fail
-alter table exchange_part_test1 exchange partition (ds='2013-04-05') with table exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
deleted file mode 100644
index 60671e52e0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING, hr STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING, hr STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1');
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2');
-ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='1');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
--- exchange_part_test2 table partition (ds='2013-04-05') already exists thus this query will fail
-alter table exchange_part_test1 exchange partition (ds='2013-04-05') with table exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
deleted file mode 100644
index 38c0eda236..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING);
-CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS exchange_part_test1;
-
--- exchange_part_test2 partition (ds='2013-04-05') does not exist thus this query will fail
-alter table exchange_part_test1 exchange partition (ds='2013-04-05') with table exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing.q
deleted file mode 100644
index 7b926a3a8a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- t1 does not exist and the query fails
-alter table t1 exchange partition (ds='2013-04-05') with table t2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing2.q
deleted file mode 100644
index 48fcd74a6f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing2.q
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS exchange_part_test1;
-
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05');
-SHOW PARTITIONS exchange_part_test1;
-
--- exchange_part_test2 table does not exist thus this query will fail
-alter table exchange_part_test1 exchange partition (ds='2013-04-05') with table exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_test.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_test.q
deleted file mode 100644
index 23e86e96ca..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exchange_partition_neg_test.q
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE exchange_part_test1 (f1 string) PARTITIONED BY (ds STRING);
-CREATE TABLE exchange_part_test2 (f1 string, f2 string) PARTITIONED BY (ds STRING);
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05');
-SHOW PARTITIONS exchange_part_test1;
-SHOW PARTITIONS exchange_part_test2;
-
--- exchange_part_test1 and exchange_part_test2 do not have the same scheme and thus they fail
-ALTER TABLE exchange_part_test1 EXCHANGE PARTITION (ds='2013-04-05') WITH TABLE exchange_part_test2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q
deleted file mode 100644
index 6ffc33acb9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'nosuchschema://nosuchauthority/ql/test/data/exports/exim_department';
-drop table exim_department;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q
deleted file mode 100644
index 970e6463e2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q
+++ /dev/null
@@ -1,24 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department identifier")
- stored as textfile
- tblproperties("maker"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q
deleted file mode 100644
index 358918363d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q
+++ /dev/null
@@ -1,38 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="ka");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="ka");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
-
-create database importer;
-use importer;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "table of employees"
- partitioned by (emp_country string comment "iso code", emp_state string comment "free-form text")
- stored as textfile
- tblproperties("maker"="krishna");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="ka");
-import from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-select * from exim_employee;
-drop table exim_employee;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q
deleted file mode 100644
index 45268c21c0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_key int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q
deleted file mode 100644
index cad6c90fd3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id", dep_name string)
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q
deleted file mode 100644
index f5f904f42a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id bigint comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q
deleted file mode 100644
index c56329c03f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- stored as rcfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q
deleted file mode 100644
index afaedcd37b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q
+++ /dev/null
@@ -1,26 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- stored as inputformat "org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat"
- outputformat "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat"
- inputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileInputDriver"
- outputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileOutputDriver"
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q
deleted file mode 100644
index 230b28c402..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q
+++ /dev/null
@@ -1,24 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- row format serde "org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe"
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q
deleted file mode 100644
index c2e00a9663..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q
+++ /dev/null
@@ -1,28 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- row format serde "org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe"
- with serdeproperties ("serialization.format"="0")
- stored as inputformat "org.apache.hadoop.mapred.TextInputFormat"
- outputformat "org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat"
- inputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileInputDriver"
- outputdriver "org.apache.hadoop.hive.howl.rcfile.RCFileOutputDriver"
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q
deleted file mode 100644
index a6586ead0c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q
+++ /dev/null
@@ -1,24 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- clustered by (dep_id) into 10 buckets
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q
deleted file mode 100644
index 990a686ebe..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q
+++ /dev/null
@@ -1,25 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- clustered by (dep_id) sorted by (dep_id desc) into 10 buckets
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- clustered by (dep_id) sorted by (dep_id asc) into 10 buckets
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_12_nonnative_export.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_12_nonnative_export.q
deleted file mode 100644
index 289bcf001f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_12_nonnative_export.q
+++ /dev/null
@@ -1,9 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- clustered by (dep_id) sorted by (dep_id desc) into 10 buckets
- stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler"
- tblproperties("creator"="krishna");
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_13_nonnative_import.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_13_nonnative_import.q
deleted file mode 100644
index 02537ef022..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_13_nonnative_import.q
+++ /dev/null
@@ -1,24 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- stored by "org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler"
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
- \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_14_nonpart_part.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_14_nonpart_part.q
deleted file mode 100644
index 897c674735..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_14_nonpart_part.q
+++ /dev/null
@@ -1,25 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- partitioned by (dep_org string)
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
- \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_15_part_nonpart.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_15_part_nonpart.q
deleted file mode 100644
index 12013e5ccf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_15_part_nonpart.q
+++ /dev/null
@@ -1,25 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- partitioned by (dep_org string)
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department partition (dep_org="hr");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
- \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q
deleted file mode 100644
index d8d2b8008c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q
+++ /dev/null
@@ -1,26 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- partitioned by (dep_org string)
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department partition (dep_org="hr");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- partitioned by (dep_mgr string)
- stored as textfile
- tblproperties("creator"="krishna");
-import from 'ql/test/data/exports/exim_department';
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
-drop database importer;
- \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q
deleted file mode 100644
index 82dcce9455..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q
+++ /dev/null
@@ -1,30 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="ka");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="ka");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
-
-create database importer;
-use importer;
-import table exim_employee partition (emp_country="us") from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-select * from exim_employee;
-drop table exim_employee;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q
deleted file mode 100644
index d92efeb9a7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q
+++ /dev/null
@@ -1,30 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="ka");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="ka");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
-
-create database importer;
-use importer;
-import table exim_employee partition (emp_country="us", emp_state="kl") from 'ql/test/data/exports/exim_employee';
-describe extended exim_employee;
-select * from exim_employee;
-drop table exim_employee;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_19_external_over_existing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_19_external_over_existing.q
deleted file mode 100644
index 12d827b9c8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_19_external_over_existing.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-import external table exim_department from 'ql/test/data/exports/exim_department';
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-drop table exim_department;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q
deleted file mode 100644
index 726dee5395..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q
+++ /dev/null
@@ -1,30 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
-
-create table exim_department ( dep_id int comment "department id")
- stored as textfile
- location 'ql/test/data/tablestore/exim_department'
- tblproperties("creator"="krishna");
-import table exim_department from 'ql/test/data/exports/exim_department'
- location 'ql/test/data/tablestore2/exim_department';
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-drop table exim_department;
-dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
-
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q
deleted file mode 100644
index d187c78202..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q
+++ /dev/null
@@ -1,35 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="ka");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="tn");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="us", emp_state="ka");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
-
-create database importer;
-use importer;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-import external table exim_employee partition (emp_country="us", emp_state="tn")
- from 'ql/test/data/exports/exim_employee';
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-drop table exim_employee;
-
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_22_export_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_22_export_authfail.q
deleted file mode 100644
index b818686f77..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_22_export_authfail.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int) stored as textfile;
-
-set hive.security.authorization.enabled=true;
-
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-
-set hive.security.authorization.enabled=false;
-drop table exim_department;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q
deleted file mode 100644
index 4acefb9f0a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q
+++ /dev/null
@@ -1,22 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-
-create table exim_department ( dep_id int) stored as textfile;
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-create table exim_department ( dep_id int) stored as textfile;
-set hive.security.authorization.enabled=true;
-import from 'ql/test/data/exports/exim_department';
-
-set hive.security.authorization.enabled=false;
-drop table exim_department;
-drop database importer;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q
deleted file mode 100644
index 467014e467..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q
+++ /dev/null
@@ -1,31 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
-
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-load data local inpath "../../data/files/test.dat"
- into table exim_employee partition (emp_country="in", emp_state="tn");
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-export table exim_employee to 'ql/test/data/exports/exim_employee';
-drop table exim_employee;
-
-create database importer;
-use importer;
-create table exim_employee ( emp_id int comment "employee id")
- comment "employee table"
- partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
- stored as textfile
- tblproperties("creator"="krishna");
-
-set hive.security.authorization.enabled=true;
-import from 'ql/test/data/exports/exim_employee';
-set hive.security.authorization.enabled=false;
-
-dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
-drop table exim_employee;
-drop database importer;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q
deleted file mode 100644
index 595fa7e764..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.test.mode=true;
-set hive.test.mode.prefix=;
-set hive.test.mode.nosamplelist=exim_department,exim_employee;
-
-create table exim_department ( dep_id int) stored as textfile;
-load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-export table exim_department to 'ql/test/data/exports/exim_department';
-drop table exim_department;
-
-create database importer;
-use importer;
-
-set hive.security.authorization.enabled=true;
-import from 'ql/test/data/exports/exim_department';
-
-set hive.security.authorization.enabled=false;
-select * from exim_department;
-drop table exim_department;
-drop database importer;
-dfs -rmr target/tmp/ql/test/data/exports/exim_department;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external1.q
deleted file mode 100644
index d56c955050..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-
-create external table external1(a int, b int) location 'invalidscheme://data.s3ndemo.hive/kv';
-describe external1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external2.q
deleted file mode 100644
index 0df85a09af..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/external2.q
+++ /dev/null
@@ -1,4 +0,0 @@
-
-create external table external2(a int, b int) partitioned by (ds string);
-alter table external2 add partition (ds='2008-01-01') location 'invalidscheme://data.s3ndemo.hive/pkv/2008-01-01';
-describe external2 partition (ds='2008-01-01');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fetchtask_ioexception.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fetchtask_ioexception.q
deleted file mode 100644
index 82230f782e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fetchtask_ioexception.q
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE fetchtask_ioexception (
- KEY STRING,
- VALUE STRING) STORED AS SEQUENCEFILE;
-
-LOAD DATA LOCAL INPATH '../../data/files/kv1_broken.seq' OVERWRITE INTO TABLE fetchtask_ioexception;
-
-SELECT * FROM fetchtask_ioexception;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q
deleted file mode 100644
index 286cf1afb4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/file_with_header_footer_negative.q
+++ /dev/null
@@ -1,13 +0,0 @@
-dfs ${system:test.dfs.mkdir} hdfs:///tmp/test_file_with_header_footer_negative/;
-
-dfs -copyFromLocal ../data/files/header_footer_table_1 hdfs:///tmp/test_file_with_header_footer_negative/header_footer_table_1;
-
-dfs -copyFromLocal ../data/files/header_footer_table_2 hdfs:///tmp/test_file_with_header_footer_negative/header_footer_table_2;
-
-CREATE EXTERNAL TABLE header_footer_table_1 (name string, message string, id int) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' LOCATION 'hdfs:///tmp/test_file_with_header_footer_negative/header_footer_table_1' tblproperties ("skip.header.line.count"="1", "skip.footer.line.count"="200");
-
-SELECT * FROM header_footer_table_1;
-
-DROP TABLE header_footer_table_1;
-
-dfs -rmr hdfs:///tmp/test_file_with_header_footer_negative; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_bad_class.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_bad_class.q
deleted file mode 100644
index 33dd4fa614..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_bad_class.q
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE TABLE dest1(key INT, value STRING) STORED AS
- INPUTFORMAT 'ClassDoesNotExist'
- OUTPUTFORMAT 'java.lang.Void';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_input.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_input.q
deleted file mode 100644
index c514562b24..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_input.q
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE dest1(key INT, value STRING) STORED AS
- INPUTFORMAT 'java.lang.Void'
- OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat';
-
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 10;
-
-SELECT dest1.* FROM dest1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_output.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_output.q
deleted file mode 100644
index a9cef1eada..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fileformat_void_output.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE dest1(key INT, value STRING) STORED AS
- INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
- OUTPUTFORMAT 'java.lang.Void';
-
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 10;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name1.q
deleted file mode 100644
index f50369b138..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-set fs.default.name='http://www.example.com;
-show tables;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name2.q
deleted file mode 100644
index 485c3db068..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/fs_default_name2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-set fs.default.name='http://www.example.com;
-SELECT * FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/genericFileFormat.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/genericFileFormat.q
deleted file mode 100644
index bd633b9760..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/genericFileFormat.q
+++ /dev/null
@@ -1 +0,0 @@
-create table testFail (a int) stored as foo;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_map_skew_multi_distinct.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_map_skew_multi_distinct.q
deleted file mode 100644
index cecd9c6bd8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_map_skew_multi_distinct.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.map.aggr=true;
-set hive.groupby.skewindata=true;
-set mapred.reduce.tasks=31;
-
-CREATE TABLE dest1(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE;
-
-EXPLAIN
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-
-SELECT dest1.* FROM dest1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q
deleted file mode 100644
index e3b0066112..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby2_multi_distinct.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.map.aggr=false;
-set hive.groupby.skewindata=true;
-
-CREATE TABLE dest_g2(key STRING, c1 INT, c2 STRING, c3 INT, c4 INT) STORED AS TEXTFILE;
-
-EXPLAIN
-FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-
-FROM src
-INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), sum(DISTINCT substr(src.value, 5)), count(src.value) GROUP BY substr(src.key,1,1);
-
-SELECT dest_g2.* FROM dest_g2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q
deleted file mode 100644
index 168aeb1261..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_map_skew_multi_distinct.q
+++ /dev/null
@@ -1,36 +0,0 @@
-set hive.map.aggr=true;
-set hive.groupby.skewindata=true;
-set mapred.reduce.tasks=31;
-
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE;
-
-EXPLAIN
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
- sum(substr(src.value,5)),
- avg(substr(src.value,5)),
- avg(DISTINCT substr(src.value,5)),
- max(substr(src.value,5)),
- min(substr(src.value,5)),
- std(substr(src.value,5)),
- stddev_samp(substr(src.value,5)),
- variance(substr(src.value,5)),
- var_samp(substr(src.value,5)),
- sum(DISTINCT substr(src.value, 5)),
- count(DISTINCT substr(src.value, 5));
-
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
- sum(substr(src.value,5)),
- avg(substr(src.value,5)),
- avg(DISTINCT substr(src.value,5)),
- max(substr(src.value,5)),
- min(substr(src.value,5)),
- std(substr(src.value,5)),
- stddev_samp(substr(src.value,5)),
- variance(substr(src.value,5)),
- var_samp(substr(src.value,5)),
- sum(DISTINCT substr(src.value, 5)),
- count(DISTINCT substr(src.value, 5));
-
-SELECT dest1.* FROM dest1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q
deleted file mode 100644
index 1a28477918..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby3_multi_distinct.q
+++ /dev/null
@@ -1,36 +0,0 @@
-set hive.map.aggr=false;
-set hive.groupby.skewindata=true;
-
-CREATE TABLE dest1(c1 DOUBLE, c2 DOUBLE, c3 DOUBLE, c4 DOUBLE, c5 DOUBLE, c6 DOUBLE, c7 DOUBLE, c8 DOUBLE, c9 DOUBLE, c10 DOUBLE, c11 DOUBLE) STORED AS TEXTFILE;
-
-EXPLAIN
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
- sum(substr(src.value,5)),
- avg(substr(src.value,5)),
- avg(DISTINCT substr(src.value,5)),
- max(substr(src.value,5)),
- min(substr(src.value,5)),
- std(substr(src.value,5)),
- stddev_samp(substr(src.value,5)),
- variance(substr(src.value,5)),
- var_samp(substr(src.value,5)),
- sum(DISTINCT substr(src.value, 5)),
- count(DISTINCT substr(src.value, 5));
-
-
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT
- sum(substr(src.value,5)),
- avg(substr(src.value,5)),
- avg(DISTINCT substr(src.value,5)),
- max(substr(src.value,5)),
- min(substr(src.value,5)),
- std(substr(src.value,5)),
- stddev_samp(substr(src.value,5)),
- variance(substr(src.value,5)),
- var_samp(substr(src.value,5)),
- sum(DISTINCT substr(src.value, 5)),
- count(DISTINCT substr(src.value, 5));
-
-SELECT dest1.* FROM dest1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube1.q
deleted file mode 100644
index a0bc177ad6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube1.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.map.aggr=false;
-
-SELECT key, count(distinct value) FROM src GROUP BY key with cube;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube2.q
deleted file mode 100644
index f8ecb6a2d4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_cube2.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.map.aggr=true;
-
-SELECT key, value, count(distinct value) FROM src GROUP BY key, value with cube;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_id1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_id1.q
deleted file mode 100644
index ac5b6f7b03..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_id1.q
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE;
-
-SELECT GROUPING__ID FROM T1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets1.q
deleted file mode 100644
index ec6b16bfb2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets1.q
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE T1(a STRING, b STRING, c STRING);
-
--- Check for empty grouping set
-SELECT * FROM T1 GROUP BY a GROUPING SETS (());
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets2.q
deleted file mode 100644
index c988e04e74..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets2.q
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE T1(a STRING, b STRING, c STRING);
-
--- Check for mupltiple empty grouping sets
-SELECT * FROM T1 GROUP BY b GROUPING SETS ((), (), ());
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets3.q
deleted file mode 100644
index 3e73552422..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets3.q
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE T1(a STRING, b STRING, c STRING);
-
--- Grouping sets expression is not in GROUP BY clause
-SELECT a FROM T1 GROUP BY a GROUPING SETS (a, b);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets4.q
deleted file mode 100644
index cf6352c47d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets4.q
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE T1(a STRING, b STRING, c STRING);
-
--- Expression 'a' is not in GROUP BY clause
-SELECT a FROM T1 GROUP BY b GROUPING SETS (b);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets5.q
deleted file mode 100644
index 7df3318a64..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets5.q
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE T1(a STRING, b STRING, c STRING);
-
--- Alias in GROUPING SETS
-SELECT a as c, count(*) FROM T1 GROUP BY c GROUPING SETS (c);
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets6.q
deleted file mode 100644
index 2783047698..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets6.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.new.job.grouping.set.cardinality=2;
-
-CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE;
-
--- Since 4 grouping sets would be generated for the query below, an additional MR job should be created
--- This is not allowed with distincts.
-SELECT a, b, count(distinct c) from T1 group by a, b with cube;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets7.q
deleted file mode 100644
index 6c9d5133ad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_grouping_sets7.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.new.job.grouping.set.cardinality=2;
-set hive.map.aggr=true;
-set hive.groupby.skewindata=true;
-
-CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE;
-
--- Since 4 grouping sets would be generated for the query below, an additional MR job should be created
--- This is not allowed with map-side aggregation and skew
-SELECT a, b, count(1) from T1 group by a, b with cube;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_invalid_position.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_invalid_position.q
deleted file mode 100644
index 173a752e35..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_invalid_position.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.groupby.orderby.position.alias=true;
-
--- invalid position alias in group by
-SELECT src.key, sum(substr(src.value,5)) FROM src GROUP BY 3;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_key.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_key.q
deleted file mode 100644
index 20970152c3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_key.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT concat(value, concat(value)) FROM src GROUP BY concat(value);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup1.q
deleted file mode 100644
index 6366744276..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup1.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.map.aggr=false;
-
-SELECT key, value, count(1) FROM src GROUP BY key, value with rollup;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup2.q
deleted file mode 100644
index aa19b523e9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/groupby_rollup2.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.map.aggr=true;
-
-SELECT key, value, count(key) FROM src GROUP BY key, value with rollup;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/having1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/having1.q
deleted file mode 100644
index 71f4fd13a0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/having1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPLAIN SELECT * FROM src HAVING key > 300;
-SELECT * FROM src HAVING key > 300;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type.q
deleted file mode 100644
index 1ab828c8be..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- begin part(string, int) pass(string, string)
-CREATE TABLE tab1 (id1 int,id2 string) PARTITIONED BY(month string,day int) ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' ;
-LOAD DATA LOCAL INPATH '../../data/files/T1.txt' overwrite into table tab1 PARTITION(month='June', day='second');
-
-select * from tab1;
-drop table tab1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type2.q
deleted file mode 100644
index 2438288209..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table tab1 (id1 int, id2 string) PARTITIONED BY(month string,day int) row format delimited fields terminated by ',';
-alter table tab1 add partition (month='June', day='second');
-drop table tab1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type3.q
deleted file mode 100644
index 49e6a092fc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type3.q
+++ /dev/null
@@ -1,4 +0,0 @@
-create table tab1(c int) partitioned by (i int);
-alter table tab1 add partition(i = "some name");
-
-drop table tab1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type4.q
deleted file mode 100644
index 50f486e624..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/illegal_partition_type4.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table tab1(s string) PARTITIONED BY(dt date, st string);
-alter table tab1 add partition (dt=date 'foo', st='foo');
-drop table tab1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_bitmap_no_map_aggr.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_bitmap_no_map_aggr.q
deleted file mode 100644
index a17cd1fec5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_bitmap_no_map_aggr.q
+++ /dev/null
@@ -1,7 +0,0 @@
-EXPLAIN
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.map.aggr=false;
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src1_index ON src REBUILD;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_entry_limit.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_entry_limit.q
deleted file mode 100644
index 5bb889c027..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_entry_limit.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set hive.stats.dbclass=fs;
-drop index src_index on src;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` , `_offsets` FROM default__src_src_index__ WHERE key<1000;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SET hive.index.compact.query.max.entries=5;
-SELECT key, value FROM src WHERE key=100 ORDER BY key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_size_limit.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_size_limit.q
deleted file mode 100644
index c6600e69b6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/index_compact_size_limit.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.stats.dbclass=fs;
-drop index src_index on src;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` , `_offsets` FROM default__src_src_index__ WHERE key<1000;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SET hive.index.compact.query.max.size=1024;
-SELECT key, value FROM src WHERE key=100 ORDER BY key;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input1.q
deleted file mode 100644
index 92a6791acb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input1.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT a.* FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input2.q
deleted file mode 100644
index 0fe907d9d8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input2.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT a.key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input4.q
deleted file mode 100644
index 60aea3208c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input4.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.mapred.mode=strict;
-
-select * from srcpart a join
- (select b.key, count(1) as count from srcpart b where b.ds = '2008-04-08' and b.hr = '14' group by b.key) subq
- where a.ds = '2008-04-08' and a.hr = '11' limit 10;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input41.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input41.q
deleted file mode 100644
index 872ab10148..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input41.q
+++ /dev/null
@@ -1,5 +0,0 @@
-select * from
- (select * from src
- union all
- select * from srcpart where ds = '2009-08-09'
- )x;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input_part0_neg.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input_part0_neg.q
deleted file mode 100644
index 4656693d48..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/input_part0_neg.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.mapred.mode=strict;
-
-SELECT x.* FROM SRCPART x WHERE key = '2008-04-08';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into1.q
deleted file mode 100644
index 8c19767021..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-set hive.lock.numretries=5;
-set hive.lock.sleep.between.retries=5;
-
-DROP TABLE insert_into1_neg;
-
-CREATE TABLE insert_into1_neg (key int, value string);
-
-LOCK TABLE insert_into1_neg SHARED;
-INSERT INTO TABLE insert_into1_neg SELECT * FROM src LIMIT 100;
-
-DROP TABLE insert_into1_neg;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into2.q
deleted file mode 100644
index 73a3b6ff13..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into2.q
+++ /dev/null
@@ -1,10 +0,0 @@
-set hive.lock.numretries=5;
-set hive.lock.sleep.between.retries=5;
-
-DROP TABLE insert_into1_neg;
-CREATE TABLE insert_into1_neg (key int, value string);
-
-LOCK TABLE insert_into1_neg EXCLUSIVE;
-INSERT INTO TABLE insert_into1_neg SELECT * FROM src LIMIT 100;
-
-DROP TABLE insert_into1_neg;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into3.q
deleted file mode 100644
index 4d048b337e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into3.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.lock.numretries=5;
-set hive.lock.sleep.between.retries=5;
-
-DROP TABLE insert_into3_neg;
-
-CREATE TABLE insert_into3_neg (key int, value string)
- PARTITIONED BY (ds string);
-
-INSERT INTO TABLE insert_into3_neg PARTITION (ds='1')
- SELECT * FROM src LIMIT 100;
-
-LOCK TABLE insert_into3_neg PARTITION (ds='1') SHARED;
-INSERT INTO TABLE insert_into3_neg PARTITION (ds='1')
- SELECT * FROM src LIMIT 100;
-
-DROP TABLE insert_into3_neg;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into4.q
deleted file mode 100644
index b8944e742b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into4.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.lock.numretries=5;
-set hive.lock.sleep.between.retries=5;
-
-DROP TABLE insert_into3_neg;
-
-CREATE TABLE insert_into3_neg (key int, value string)
- PARTITIONED BY (ds string);
-
-INSERT INTO TABLE insert_into3_neg PARTITION (ds='1')
- SELECT * FROM src LIMIT 100;
-
-LOCK TABLE insert_into3_neg PARTITION (ds='1') EXCLUSIVE;
-INSERT INTO TABLE insert_into3_neg PARTITION (ds='1')
- SELECT * FROM src LIMIT 100;
-
-DROP TABLE insert_into3_neg;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into5.q
deleted file mode 100644
index c20c168a88..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into5.q
+++ /dev/null
@@ -1,9 +0,0 @@
-DROP TABLE if exists insert_into5_neg;
-
-CREATE TABLE insert_into5_neg (key int, value string) TBLPROPERTIES ("immutable"="true");
-
-INSERT INTO TABLE insert_into5_neg SELECT * FROM src LIMIT 100;
-
-INSERT INTO TABLE insert_into5_neg SELECT * FROM src LIMIT 100;
-
-DROP TABLE insert_into5_neg;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into6.q
deleted file mode 100644
index a92ee5ca94..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_into6.q
+++ /dev/null
@@ -1,17 +0,0 @@
-DROP TABLE IF EXISTS insert_into6_neg;
-
-CREATE TABLE insert_into6_neg (key int, value string)
- PARTITIONED BY (ds string) TBLPROPERTIES("immutable"="true") ;
-
-INSERT INTO TABLE insert_into6_neg PARTITION (ds='1')
- SELECT * FROM src LIMIT 100;
-
-INSERT INTO TABLE insert_into6_neg PARTITION (ds='2')
- SELECT * FROM src LIMIT 100;
-
-SELECT COUNT(*) from insert_into6_neg;
-
-INSERT INTO TABLE insert_into6_neg PARTITION (ds='1')
- SELECT * FROM src LIMIT 100;
-
-DROP TABLE insert_into6_neg;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_view_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_view_failure.q
deleted file mode 100644
index 1f5e139062..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insert_view_failure.q
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP VIEW xxx2;
-CREATE VIEW xxx2 AS SELECT * FROM src;
-INSERT OVERWRITE TABLE xxx2
-SELECT key, value
-FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertexternal1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertexternal1.q
deleted file mode 100644
index 01ebae1022..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertexternal1.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.insert.into.external.tables=false;
-
-
-create external table texternal(key string, val string) partitioned by (insertdate string);
-
-alter table texternal add partition (insertdate='2008-01-01') location 'pfile://${system:test.tmp.dir}/texternal/2008-01-01';
-from src insert overwrite table texternal partition (insertdate='2008-01-01') select *;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q
deleted file mode 100644
index a8f77c28a8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/insertover_dynapart_ifnotexists.q
+++ /dev/null
@@ -1,9 +0,0 @@
-set hive.exec.dynamic.partition=true;
-
-create table srcpart_dp like srcpart;
-
-create table destpart_dp like srcpart;
-
-load data local inpath '../../data/files/srcbucket20.txt' INTO TABLE srcpart_dp partition(ds='2008-04-08', hr=11);
-
-insert overwrite table destpart_dp partition (ds='2008-04-08', hr) if not exists select key, value, hr from srcpart_dp where ds='2008-04-08'; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_arithmetic_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_arithmetic_type.q
deleted file mode 100644
index ad37cff79b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_arithmetic_type.q
+++ /dev/null
@@ -1,3 +0,0 @@
-
-select timestamp('2001-01-01 00:00:01') - timestamp('2000-01-01 00:00:01') from src;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_avg_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_avg_syntax.q
deleted file mode 100644
index d5b58e0765..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_avg_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT avg(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_1.q
deleted file mode 100644
index 73e4729aa0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table tbl (a binary);
-select cast (a as int) from tbl limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_2.q
deleted file mode 100644
index 50ec481525..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table tbl (a binary);
-select cast (a as tinyint) from tbl limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_3.q
deleted file mode 100644
index 16f56ec5d3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_3.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table tbl (a binary);
-select cast (a as smallint) from tbl limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_4.q
deleted file mode 100644
index bd222f14b4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_4.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table tbl (a binary);
-select cast (a as bigint) from tbl limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_5.q
deleted file mode 100644
index 594fd2bb6f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_5.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table tbl (a binary);
-select cast (a as float) from tbl limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_6.q
deleted file mode 100644
index 40ff801460..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_from_binary_6.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table tbl (a binary);
-select cast (a as double) from tbl limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q
deleted file mode 100644
index 00cd98ed13..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_1.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast (2 as binary) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q
deleted file mode 100644
index f31344f835..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_2.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(cast (2 as smallint) as binary) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q
deleted file mode 100644
index af23d29f4e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_3.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(cast (2 as tinyint) as binary) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q
deleted file mode 100644
index 91abe1e6b8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_4.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(cast (2 as bigint) as binary) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q
deleted file mode 100644
index afd99be976..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_5.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(cast (2 as float) as binary) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q
deleted file mode 100644
index c2143c5c9e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_cast_to_binary_6.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(cast (2 as double) as binary) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_1.q
deleted file mode 100644
index ba7d164c77..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-drop table invalid_char_length_1;
-create table invalid_char_length_1 (c1 char(1000000));
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_2.q
deleted file mode 100644
index 866b43d312..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_2.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(value as char(100000)) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_3.q
deleted file mode 100644
index 481b630d20..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_char_length_3.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table invalid_char_length_3;
-create table invalid_char_length_3 (c1 char(0));
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config1.q
deleted file mode 100644
index c49ac8a690..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set mapred.input.dir.recursive=true;
-
-CREATE TABLE skewedtable (key STRING, value STRING) SKEWED BY (key) ON (1,5,6);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config2.q
deleted file mode 100644
index fa023c8c4b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_config2.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.mapred.supports.subdirectories=false;
-set hive.optimize.union.remove=true;
-
-select count(1) from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl1.q
deleted file mode 100644
index 2e1ea6b005..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl1.q
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CREATE TABLE inv_valid_tbl1 COMMENT 'This is a thrift based table'
- PARTITIONED BY(aint DATETIME, country STRING)
- CLUSTERED BY(aint) SORTED BY(lint) INTO 32 BUCKETS
- ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer'
- WITH SERDEPROPERTIES ('serialization.class' = 'org.apache.hadoop.hive.serde2.thrift.test.Complex',
- 'serialization.format' = 'org.apache.thrift.protocol.TBinaryProtocol')
- STORED AS SEQUENCEFILE;
-DESCRIBE EXTENDED inv_valid_tbl1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl2.q
deleted file mode 100644
index 408919ee2d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_create_tbl2.q
+++ /dev/null
@@ -1 +0,0 @@
-create tabl tmp_zshao_22 (id int, name strin;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_mapjoin1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_mapjoin1.q
deleted file mode 100644
index 56d9211d28..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_mapjoin1.q
+++ /dev/null
@@ -1 +0,0 @@
-select /*+ MAPJOIN(a) ,MAPJOIN(b)*/ * from src a join src b on (a.key=b.key and a.value=b.value);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_max_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_max_syntax.q
deleted file mode 100644
index 2003373409..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_max_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT max(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_min_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_min_syntax.q
deleted file mode 100644
index 584283a08a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_min_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT min(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column.q
deleted file mode 100644
index 106ba42213..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- Create table
-create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
-select * from test_invalid_column where column1=123;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_subquery.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_subquery.q
deleted file mode 100644
index bc70dbca20..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_subquery.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- Create table
-create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
-select * from (select * from test_invalid_column) subq where subq = 123;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_tablename.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_tablename.q
deleted file mode 100644
index b821e6129a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_column_with_tablename.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- Create table
-create table if not exists test_invalid_column(key string, value string ) partitioned by (year string, month string) stored as textfile ;
-
-select * from test_invalid_column where test_invalid_column=123;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_expression.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_expression.q
deleted file mode 100644
index 01617f9363..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_select_expression.q
+++ /dev/null
@@ -1 +0,0 @@
-select foo from a a where foo > .foo;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_std_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_std_syntax.q
deleted file mode 100644
index 13104198a6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_std_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT std(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q
deleted file mode 100644
index c6a1252655..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_stddev_samp_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT stddev_samp(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_sum_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_sum_syntax.q
deleted file mode 100644
index 2d591baa24..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_sum_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT sum(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter1.q
deleted file mode 100644
index bb19cff8a9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE TABLE alter_test (d STRING);
-ALTER TABLE alter_test CHANGE d d DATETIME;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter2.q
deleted file mode 100644
index aa01b35872..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_alter2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE TABLE alter_test (d STRING);
-ALTER TABLE alter_test ADD COLUMNS (ds DATETIME);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_create2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_create2.q
deleted file mode 100644
index 978f4244a6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_create2.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TABLE datetime_test (d DATETIME);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_transform.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_transform.q
deleted file mode 100644
index dfc4864acf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_t_transform.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT TRANSFORM(*) USING 'cat' AS (key DATETIME) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_tbl_name.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_tbl_name.q
deleted file mode 100644
index 09394e71ad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_tbl_name.q
+++ /dev/null
@@ -1 +0,0 @@
-create table invalid-name(a int, b string);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q
deleted file mode 100644
index ce2a8c4769..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_var_samp_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT var_samp(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_1.q
deleted file mode 100644
index 43de018c9f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-drop table if exists invalid_varchar_length_1;
-create table invalid_varchar_length_1 (c1 varchar(1000000));
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q
deleted file mode 100644
index 3c199d31e7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_2.q
+++ /dev/null
@@ -1 +0,0 @@
-select cast(value as varchar(100000)) from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_3.q
deleted file mode 100644
index fed04764a9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_varchar_length_3.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists invalid_varchar_length_3;
-create table invalid_varchar_length_3 (c1 varchar(0));
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_variance_syntax.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_variance_syntax.q
deleted file mode 100644
index 5b47829931..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalid_variance_syntax.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT variance(*) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalidate_view1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalidate_view1.q
deleted file mode 100644
index dd39c5eb4a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/invalidate_view1.q
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP VIEW xxx8;
-DROP VIEW xxx9;
-
--- create two levels of view reference, then invalidate intermediate view
--- by dropping a column from underlying table, and verify that
--- querying outermost view results in full error context
-CREATE TABLE xxx10 (key int, value int);
-CREATE VIEW xxx9 AS SELECT * FROM xxx10;
-CREATE VIEW xxx8 AS SELECT * FROM xxx9 xxx;
-ALTER TABLE xxx10 REPLACE COLUMNS (key int);
-SELECT * FROM xxx8 yyy;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join2.q
deleted file mode 100644
index 98a5f1e662..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join2.q
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT /*+ MAPJOIN(x) */ x.key, x.value, y.value
-FROM src1 x LEFT OUTER JOIN src y ON (x.key = y.key);
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join28.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join28.q
deleted file mode 100644
index 32ff105c2e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join28.q
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE dest_j1(key STRING, value STRING) STORED AS TEXTFILE;
-
--- Mapjoin followed by mapjoin is not supported.
--- The same query would work fine without the hint.
--- Note that there is a positive test with the same name in clientpositive
-EXPLAIN
-INSERT OVERWRITE TABLE dest_j1
-SELECT /*+ MAPJOIN(z) */ subq.key1, z.value
-FROM
-(SELECT /*+ MAPJOIN(x) */ x.key as key1, x.value as value1, y.key as key2, y.value as value2
- FROM src1 x JOIN src y ON (x.key = y.key)) subq
- JOIN srcpart z ON (subq.key1 = z.key and z.ds='2008-04-08' and z.hr=11);
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join29.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join29.q
deleted file mode 100644
index 53a1652d25..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join29.q
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE TABLE dest_j1(key STRING, cnt1 INT, cnt2 INT);
-
--- Mapjoin followed by group by is not supported.
--- The same query would work without the hint
--- Note that there is a positive test with the same name in clientpositive
-EXPLAIN
-INSERT OVERWRITE TABLE dest_j1
-SELECT /*+ MAPJOIN(subq1) */ subq1.key, subq1.cnt, subq2.cnt
-FROM (select x.key, count(1) as cnt from src1 x group by x.key) subq1 JOIN
- (select y.key, count(1) as cnt from src y group by y.key) subq2 ON (subq1.key = subq2.key);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join32.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join32.q
deleted file mode 100644
index 54a4dcd9af..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join32.q
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE dest_j1(key STRING, value STRING, val2 STRING) STORED AS TEXTFILE;
-
--- Mapjoin followed by Mapjoin is not supported.
--- The same query would work without the hint
--- Note that there is a positive test with the same name in clientpositive
-EXPLAIN EXTENDED
-INSERT OVERWRITE TABLE dest_j1
-SELECT /*+ MAPJOIN(x,z) */ x.key, z.value, y.value
-FROM src1 x JOIN src y ON (x.key = y.key)
-JOIN srcpart z ON (x.value = z.value and z.ds='2008-04-08' and z.hr=11);
-
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join35.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join35.q
deleted file mode 100644
index fc8f77ca12..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join35.q
+++ /dev/null
@@ -1,18 +0,0 @@
-CREATE TABLE dest_j1(key STRING, value STRING, val2 INT) STORED AS TEXTFILE;
-
--- Mapjoin followed by union is not supported.
--- The same query would work without the hint
--- Note that there is a positive test with the same name in clientpositive
-EXPLAIN EXTENDED
-INSERT OVERWRITE TABLE dest_j1
-SELECT /*+ MAPJOIN(x) */ x.key, x.value, subq1.cnt
-FROM
-( SELECT x.key as key, count(1) as cnt from src x where x.key < 20 group by x.key
- UNION ALL
- SELECT x1.key as key, count(1) as cnt from src x1 where x1.key > 100 group by x1.key
-) subq1
-JOIN src1 x ON (x.key = subq1.key);
-
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
deleted file mode 100644
index e39a38e2fc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_alt_syntax_comma_on.q
+++ /dev/null
@@ -1,3 +0,0 @@
-explain select *
-from src s1 ,
-src s2 on s1.key = s2.key; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
deleted file mode 100644
index c0da913c28..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-explain select s1.key, s2.key
-from src s1, src s2
-where key = s2.key
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
deleted file mode 100644
index 8e219637eb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_cond_unqual_ambiguous_vc.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-explain select s1.key, s2.key
-from src s1, src s2
-where INPUT__FILE__NAME = s2.INPUT__FILE__NAME
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_nonexistent_part.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_nonexistent_part.q
deleted file mode 100644
index b4a4757d22..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/join_nonexistent_part.q
+++ /dev/null
@@ -1,4 +0,0 @@
-SET hive.security.authorization.enabled = true;
-SELECT *
-FROM srcpart s1 join src s2 on s1.key == s2.key
-WHERE s1.ds='non-existent'; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/joinneg.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/joinneg.q
deleted file mode 100644
index a4967fd5df..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/joinneg.q
+++ /dev/null
@@ -1,6 +0,0 @@
-EXPLAIN FROM
-(SELECT src.* FROM src) x
-JOIN
-(SELECT src.* FROM src) Y
-ON (x.key = b.key)
-SELECT Y.*;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_alias.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_alias.q
deleted file mode 100644
index 50d535e6e1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_alias.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- Check alias count for LATERAL VIEW syntax:
--- explode returns a table with only 1 col - should be an error if query specifies >1 col aliases
-SELECT * FROM src LATERAL VIEW explode(array(1,2,3)) myTable AS myCol1, myCol2 LIMIT 3; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_join.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_join.q
deleted file mode 100644
index 818754ecbf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lateral_view_join.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT src.key FROM src LATERAL VIEW explode(array(1,2,3)) AS myTable JOIN src b ON src.key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition.q
deleted file mode 100644
index d59394544c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition.q
+++ /dev/null
@@ -1,7 +0,0 @@
-set hive.limit.query.max.table.partition=1;
-
-explain select * from srcpart limit 1;
-select * from srcpart limit 1;
-
-explain select * from srcpart;
-select * from srcpart;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition_stats.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition_stats.q
deleted file mode 100644
index 0afd4a965a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/limit_partition_stats.q
+++ /dev/null
@@ -1,18 +0,0 @@
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set hive.stats.autogather=true;
-set hive.compute.query.using.stats=true;
-
-create table part (c int) partitioned by (d string);
-insert into table part partition (d)
-select hr,ds from srcpart;
-
-set hive.limit.query.max.table.partition=1;
-
-explain select count(*) from part;
-select count(*) from part;
-
-set hive.compute.query.using.stats=false;
-
-explain select count(*) from part;
-select count(*) from part;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/line_terminator.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/line_terminator.q
deleted file mode 100644
index ad3542c40a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/line_terminator.q
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE TABLE mytable (col1 STRING, col2 INT)
-ROW FORMAT DELIMITED
-LINES TERMINATED BY ',';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_exist_part_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_exist_part_authfail.q
deleted file mode 100644
index eb72d940a5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_exist_part_authfail.q
+++ /dev/null
@@ -1,4 +0,0 @@
-create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile;
-alter table hive_test_src add partition (pcol1 = 'test_part');
-set hive.security.authorization.enabled=true;
-load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_non_native.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_non_native.q
deleted file mode 100644
index 75a5216e00..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_non_native.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-CREATE TABLE non_native2(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
-
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE non_native2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_nonpart_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_nonpart_authfail.q
deleted file mode 100644
index 32653631ad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_nonpart_authfail.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table hive_test_src ( col1 string ) stored as textfile;
-set hive.security.authorization.enabled=true;
-load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src ;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_authfail.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_authfail.q
deleted file mode 100644
index 315988dc0a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_authfail.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile;
-set hive.security.authorization.enabled=true;
-load data local inpath '../../data/files/test.dat' overwrite into table hive_test_src partition (pcol1 = 'test_part');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_nospec.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_nospec.q
deleted file mode 100644
index 81517991b2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_part_nospec.q
+++ /dev/null
@@ -1,2 +0,0 @@
-create table hive_test_src ( col1 string ) partitioned by (pcol1 string) stored as textfile;
-load data local inpath '../../data/files/test.dat' into table hive_test_src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_stored_as_dirs.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_stored_as_dirs.q
deleted file mode 100644
index c56f0d408d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_stored_as_dirs.q
+++ /dev/null
@@ -1,7 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-
--- Load data can't work with table with stored as directories
-CREATE TABLE if not exists stored_as_dirs_multiple (col1 STRING, col2 int, col3 STRING)
-SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78)) stored as DIRECTORIES;
-
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE stored_as_dirs_multiple;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_view_failure.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_view_failure.q
deleted file mode 100644
index 64182eac83..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_view_failure.q
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP VIEW xxx11;
-CREATE VIEW xxx11 AS SELECT * FROM src;
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE xxx11;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat.q
deleted file mode 100644
index f0c3b59d30..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- test for loading into tables with the correct file format
--- test for loading into partitions with the correct file format
-
-
-CREATE TABLE load_wrong_fileformat_T1(name STRING) STORED AS SEQUENCEFILE;
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE load_wrong_fileformat_T1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_rc_seq.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_rc_seq.q
deleted file mode 100644
index 4d79bbeb10..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_rc_seq.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- test for loading into tables with the correct file format
--- test for loading into partitions with the correct file format
-
-
-CREATE TABLE T1(name STRING) STORED AS RCFILE;
-LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T1; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_txt_seq.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_txt_seq.q
deleted file mode 100644
index 050c819a2f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_fileformat_txt_seq.q
+++ /dev/null
@@ -1,6 +0,0 @@
--- test for loading into tables with the correct file format
--- test for loading into partitions with the correct file format
-
-
-CREATE TABLE T1(name STRING) STORED AS TEXTFILE;
-LOAD DATA LOCAL INPATH '../../data/files/kv1.seq' INTO TABLE T1; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_noof_part.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_noof_part.q
deleted file mode 100644
index 7f5ad75414..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/load_wrong_noof_part.q
+++ /dev/null
@@ -1,3 +0,0 @@
-
-CREATE TABLE loadpart1(a STRING, b STRING) PARTITIONED BY (ds STRING,ds1 STRING);
-LOAD DATA LOCAL INPATH '../../data1/files/kv1.txt' INTO TABLE loadpart1 PARTITION(ds='2009-05-05');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/local_mapred_error_cache.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/local_mapred_error_cache.q
deleted file mode 100644
index ed9e21dd8a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/local_mapred_error_cache.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.exec.mode.local.auto=true;
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateLocalErrorsHook;
-
-FROM src SELECT TRANSFORM(key, value) USING 'python ../../data/scripts/cat_error.py' AS (key, value);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg1.q
deleted file mode 100644
index e1b58fca80..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg1.q
+++ /dev/null
@@ -1,10 +0,0 @@
-drop table tstsrc;
-create table tstsrc like src;
-insert overwrite table tstsrc select key, value from src;
-
-set hive.lock.numretries=0;
-set hive.unlock.numretries=0;
-
-LOCK TABLE tstsrc SHARED;
-LOCK TABLE tstsrc SHARED;
-LOCK TABLE tstsrc EXCLUSIVE;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg2.q
deleted file mode 100644
index a4604cd470..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg2.q
+++ /dev/null
@@ -1,6 +0,0 @@
-drop table tstsrc;
-create table tstsrc like src;
-insert overwrite table tstsrc select key, value from src;
-
-set hive.unlock.numretries=0;
-UNLOCK TABLE tstsrc;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg3.q
deleted file mode 100644
index f2252f7bdf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg3.q
+++ /dev/null
@@ -1,9 +0,0 @@
-drop table tstsrcpart;
-create table tstsrcpart like srcpart;
-
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11')
-select key, value from srcpart where ds='2008-04-08' and hr='11';
-
-set hive.lock.numretries=0;
-set hive.unlock.numretries=0;
-UNLOCK TABLE tstsrcpart PARTITION(ds='2008-04-08', hr='11');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg4.q
deleted file mode 100644
index b47644cca3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg4.q
+++ /dev/null
@@ -1,12 +0,0 @@
-drop table tstsrcpart;
-create table tstsrcpart like srcpart;
-
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11')
-select key, value from srcpart where ds='2008-04-08' and hr='11';
-
-set hive.lock.numretries=0;
-set hive.unlock.numretries=0;
-
-LOCK TABLE tstsrcpart PARTITION(ds='2008-04-08', hr='11') EXCLUSIVE;
-SHOW LOCKS tstsrcpart PARTITION(ds='2008-04-08', hr='12');
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg5.q
deleted file mode 100644
index 19c1ce28c2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg5.q
+++ /dev/null
@@ -1,2 +0,0 @@
-drop table tstsrcpart;
-show locks tstsrcpart extended; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q
deleted file mode 100644
index 4966f2b9b2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_query_tbl_in_locked_db.q
+++ /dev/null
@@ -1,17 +0,0 @@
-create database lockneg1;
-use lockneg1;
-
-create table tstsrcpart like default.srcpart;
-
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11')
-select key, value from default.srcpart where ds='2008-04-08' and hr='11';
-
-lock database lockneg1 shared;
-show locks database lockneg1;
-select count(1) from tstsrcpart where ds='2008-04-08' and hr='11';
-
-unlock database lockneg1;
-show locks database lockneg1;
-lock database lockneg1 exclusive;
-show locks database lockneg1;
-select count(1) from tstsrcpart where ds='2008-04-08' and hr='11';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_db_lock_conflict.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_db_lock_conflict.q
deleted file mode 100644
index 1f9ad90898..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_db_lock_conflict.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.lock.numretries=0;
-
-create database lockneg4;
-
-lock database lockneg4 exclusive;
-lock database lockneg4 shared;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_drop_locked_db.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_drop_locked_db.q
deleted file mode 100644
index 8cbe31083b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_drop_locked_db.q
+++ /dev/null
@@ -1,8 +0,0 @@
-set hive.lock.numretries=0;
-
-create database lockneg9;
-
-lock database lockneg9 shared;
-show locks database lockneg9;
-
-drop database lockneg9;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q
deleted file mode 100644
index 4127a6f150..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/lockneg_try_lock_db_in_use.q
+++ /dev/null
@@ -1,15 +0,0 @@
-set hive.lock.numretries=0;
-
-create database lockneg2;
-use lockneg2;
-
-create table tstsrcpart like default.srcpart;
-
-insert overwrite table tstsrcpart partition (ds='2008-04-08', hr='11')
-select key, value from default.srcpart where ds='2008-04-08' and hr='11';
-
-lock table tstsrcpart shared;
-show locks;
-
-lock database lockneg2 exclusive;
-show locks;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/macro_unused_parameter.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/macro_unused_parameter.q
deleted file mode 100644
index 523710ddf3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/macro_unused_parameter.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TEMPORARY MACRO BAD_MACRO (x INT, y INT) x;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q
deleted file mode 100644
index 76c7ae94d4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.exec.mode.local.auto=false;
-set hive.exec.job.debug.capture.stacktraces=true;
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateStackTracesHook;
-
-FROM src SELECT TRANSFORM(key, value) USING 'script_does_not_exist' AS (key, value);
-
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
--- Hadoop 0.23 changes the getTaskDiagnostics behavior
--- The Error Code of hive failure MapReduce job changes
--- In Hadoop 0.20
--- Hive failure MapReduce job gets 20000 as Error Code
--- In Hadoop 0.23
--- Hive failure MapReduce job gets 2 as Error Code
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_hadoop20.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_hadoop20.q
deleted file mode 100644
index 9d0548cc10..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_hadoop20.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.exec.mode.local.auto=false;
-set hive.exec.job.debug.capture.stacktraces=true;
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateStackTracesHook;
-
-FROM src SELECT TRANSFORM(key, value) USING 'script_does_not_exist' AS (key, value);
-
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
--- Hadoop 0.23 changes the getTaskDiagnostics behavior
--- The Error Code of hive failure MapReduce job changes
--- In Hadoop 0.20
--- Hive failure MapReduce job gets 20000 as Error Code
--- In Hadoop 0.23
--- Hive failure MapReduce job gets 2 as Error Code
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q
deleted file mode 100644
index c93aedb313..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.exec.mode.local.auto=false;
-set hive.exec.job.debug.capture.stacktraces=false;
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateStackTracesHook;
-
-FROM src SELECT TRANSFORM(key, value) USING 'script_does_not_exist' AS (key, value);
-
--- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
--- Hadoop 0.23 changes the getTaskDiagnostics behavior
--- The Error Code of hive failure MapReduce job changes
--- In Hadoop 0.20
--- Hive failure MapReduce job gets 20000 as Error Code
--- In Hadoop 0.23
--- Hive failure MapReduce job gets 2 as Error Code
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff_hadoop20.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff_hadoop20.q
deleted file mode 100644
index e319944958..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/mapreduce_stack_trace_turnoff_hadoop20.q
+++ /dev/null
@@ -1,13 +0,0 @@
-set hive.exec.mode.local.auto=false;
-set hive.exec.job.debug.capture.stacktraces=false;
-set hive.exec.failure.hooks=org.apache.hadoop.hive.ql.hooks.VerifySessionStateStackTracesHook;
-
-FROM src SELECT TRANSFORM(key, value) USING 'script_does_not_exist' AS (key, value);
-
--- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
--- Hadoop 0.23 changes the getTaskDiagnostics behavior
--- The Error Code of hive failure MapReduce job changes
--- In Hadoop 0.20
--- Hive failure MapReduce job gets 20000 as Error Code
--- In Hadoop 0.23
--- Hive failure MapReduce job gets 2 as Error Code
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_1.q
deleted file mode 100644
index 0a48c01546..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table src2 like src;
-CREATE INDEX src_index_merge_test ON TABLE src2(key) as 'COMPACT' WITH DEFERRED REBUILD;
-alter table src2 concatenate;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_2.q
deleted file mode 100644
index a4fab1c8b8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-create table srcpart2 (key int, value string) partitioned by (ds string);
-insert overwrite table srcpart2 partition (ds='2011') select * from src;
-alter table srcpart2 concatenate;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_3.q
deleted file mode 100644
index 6bc645e4c2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/merge_negative_3.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.enforce.bucketing=true;
-set hive.enforce.sorting=true;
-
-create table srcpart2 (key int, value string) partitioned by (ds string) clustered by (key) sorted by (key) into 2 buckets stored as RCFILE;
-insert overwrite table srcpart2 partition (ds='2011') select * from src;
-alter table srcpart2 partition (ds = '2011') concatenate;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/minimr_broken_pipe.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/minimr_broken_pipe.q
deleted file mode 100644
index 8dda9cdf4a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/minimr_broken_pipe.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-set hive.exec.script.allow.partial.consumption = false;
--- Tests exception in ScriptOperator.close() by passing to the operator a small amount of data
-SELECT TRANSFORM(*) USING 'true' AS a, b FROM (SELECT TRANSFORM(*) USING 'echo' AS a, b FROM src LIMIT 1) tmp; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nested_complex_neg.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nested_complex_neg.q
deleted file mode 100644
index 09f13f52ae..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nested_complex_neg.q
+++ /dev/null
@@ -1,15 +0,0 @@
-
-create table nestedcomplex (
-simple_int int,
-max_nested_array array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<int>>>>>>>>>>>>>>>>>>>>>>>,
-max_nested_map array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<map<string,string>>>>>>>>>>>>>>>>>>>>>>,
-max_nested_struct array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<array<struct<s:string, i:bigint>>>>>>>>>>>>>>>>>>>>>>>,
-simple_string string)
-
-;
-
-
--- This should fail in as extended nesting levels are not enabled using the serdeproperty hive.serialization.extend.nesting.levels
-load data local inpath '../../data/files/nested_complex.txt' overwrite into table nestedcomplex;
-
-select * from nestedcomplex sort by simple_int;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/no_matching_udf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/no_matching_udf.q
deleted file mode 100644
index 0c24b1626a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/no_matching_udf.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT percentile(3.5, 0.99) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nonkey_groupby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nonkey_groupby.q
deleted file mode 100644
index 431e04efd9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nonkey_groupby.q
+++ /dev/null
@@ -1 +0,0 @@
-EXPLAIN SELECT key, count(1) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_insert.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_insert.q
deleted file mode 100644
index 6669bf62d8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_insert.q
+++ /dev/null
@@ -1,7 +0,0 @@
-
-CREATE TABLE nopart_insert(a STRING, b STRING) PARTITIONED BY (ds STRING);
-
-INSERT OVERWRITE TABLE nopart_insert
-SELECT TRANSFORM(src.key, src.value) USING '../../data/scripts/error_script' AS (tkey, tvalue)
-FROM src;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_load.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_load.q
deleted file mode 100644
index 966982fd5c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/nopart_load.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-CREATE TABLE nopart_load(a STRING, b STRING) PARTITIONED BY (ds STRING);
-
-load data local inpath '../../data/files/kv1.txt' overwrite into table nopart_load ;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/notable_alias4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/notable_alias4.q
deleted file mode 100644
index e7ad6b79d3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/notable_alias4.q
+++ /dev/null
@@ -1,4 +0,0 @@
-EXPLAIN
-SELECT key from src JOIN src1 on src1.key=src.key;
-
-SELECT key from src JOIN src1 on src1.key=src.key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_invalid_position.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_invalid_position.q
deleted file mode 100644
index 4dbf2a6d56..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_invalid_position.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.groupby.orderby.position.alias=true;
-
--- invalid position alias in order by
-SELECT src.key, src.value FROM src ORDER BY 0;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_position_unsupported.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_position_unsupported.q
deleted file mode 100644
index a490c2306e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderby_position_unsupported.q
+++ /dev/null
@@ -1,4 +0,0 @@
-set hive.groupby.orderby.position.alias=true;
-
--- position alias is not supported when SELECT *
-SELECT src.* FROM src ORDER BY 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderbysortby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderbysortby.q
deleted file mode 100644
index 5dff69fdbb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/orderbysortby.q
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE dest1(key INT, ten INT, one INT, value STRING) STORED AS TEXTFILE;
-
-FROM src
-INSERT OVERWRITE TABLE dest1
-MAP src.key, CAST(src.key / 10 AS INT), CAST(src.key % 10 AS INT), src.value
-USING 'cat' AS (tkey, ten, one, tvalue)
-ORDER BY tvalue, tkey
-SORT BY ten, one;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_char.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_char.q
deleted file mode 100644
index 745a786726..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_char.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists parquet_char;
-
-create table parquet_char (t char(10)) stored as parquet;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_date.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_date.q
deleted file mode 100644
index 89d3602fd3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_date.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists parquet_date;
-
-create table parquet_date (t date) stored as parquet;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_decimal.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_decimal.q
deleted file mode 100644
index 8a4973110a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_decimal.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists parquet_decimal;
-
-create table parquet_decimal (t decimal(4,2)) stored as parquet;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_timestamp.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_timestamp.q
deleted file mode 100644
index 4ef36fa0ef..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_timestamp.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists parquet_timestamp;
-
-create table parquet_timestamp (t timestamp) stored as parquet;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_varchar.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_varchar.q
deleted file mode 100644
index 55825f76dc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/parquet_varchar.q
+++ /dev/null
@@ -1,3 +0,0 @@
-drop table if exists parquet_varchar;
-
-create table parquet_varchar (t varchar(10)) stored as parquet;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/part_col_complex_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/part_col_complex_type.q
deleted file mode 100644
index 4b9eb847db..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/part_col_complex_type.q
+++ /dev/null
@@ -1 +0,0 @@
-create table t (a string) partitioned by (b map<string,string>);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part.q
deleted file mode 100644
index 541599915a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part.q
+++ /dev/null
@@ -1,15 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode3;
-
-create table tbl_protectmode3 (col string) partitioned by (p string);
-alter table tbl_protectmode3 add partition (p='p1');
-alter table tbl_protectmode3 add partition (p='p2');
-
-select * from tbl_protectmode3 where p='p1';
-select * from tbl_protectmode3 where p='p2';
-
-alter table tbl_protectmode3 partition (p='p1') enable offline;
-
-select * from tbl_protectmode3 where p='p2';
-select * from tbl_protectmode3 where p='p1';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part1.q
deleted file mode 100644
index 99256da285..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part1.q
+++ /dev/null
@@ -1,21 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode5;
-
-create table tbl_protectmode5_1 (col string);
-
-create table tbl_protectmode5 (col string) partitioned by (p string);
-alter table tbl_protectmode5 add partition (p='p1');
-alter table tbl_protectmode5 add partition (p='p2');
-
-insert overwrite table tbl_protectmode5_1
-select col from tbl_protectmode5 where p='p1';
-insert overwrite table tbl_protectmode5_1
-select col from tbl_protectmode5 where p='p2';
-
-alter table tbl_protectmode5 partition (p='p1') enable offline;
-
-insert overwrite table tbl_protectmode5_1
-select col from tbl_protectmode5 where p='p2';
-insert overwrite table tbl_protectmode5_1
-select col from tbl_protectmode5 where p='p1';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part2.q
deleted file mode 100644
index 3fdc036996..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part2.q
+++ /dev/null
@@ -1,9 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode6;
-
-create table tbl_protectmode6 (c1 string,c2 string) partitioned by (p string);
-alter table tbl_protectmode6 add partition (p='p1');
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE tbl_protectmode6 partition (p='p1');
-alter table tbl_protectmode6 partition (p='p1') enable offline;
-LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' OVERWRITE INTO TABLE tbl_protectmode6 partition (p='p1');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part_no_drop.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part_no_drop.q
deleted file mode 100644
index b4e508ff98..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_part_no_drop.q
+++ /dev/null
@@ -1,10 +0,0 @@
--- protect mode: syntax to change protect mode works and queries to drop partitions are blocked if it is marked no drop
-
-drop table tbl_protectmode_no_drop;
-
-create table tbl_protectmode_no_drop (c1 string,c2 string) partitioned by (p string);
-alter table tbl_protectmode_no_drop add partition (p='p1');
-alter table tbl_protectmode_no_drop partition (p='p1') enable no_drop;
-desc extended tbl_protectmode_no_drop partition (p='p1');
-
-alter table tbl_protectmode_no_drop drop partition (p='p1');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl1.q
deleted file mode 100644
index 236129902c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl1.q
+++ /dev/null
@@ -1,8 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_1;
-
-create table tbl_protectmode_1 (col string);
-select * from tbl_protectmode_1;
-alter table tbl_protectmode_1 enable offline;
-select * from tbl_protectmode_1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl2.q
deleted file mode 100644
index 05964c35e9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl2.q
+++ /dev/null
@@ -1,12 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode2;
-
-create table tbl_protectmode2 (col string) partitioned by (p string);
-alter table tbl_protectmode2 add partition (p='p1');
-alter table tbl_protectmode2 enable no_drop;
-alter table tbl_protectmode2 enable offline;
-alter table tbl_protectmode2 disable no_drop;
-desc extended tbl_protectmode2;
-
-select * from tbl_protectmode2 where p='p1';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl3.q
deleted file mode 100644
index bbaa267087..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl3.q
+++ /dev/null
@@ -1,10 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_4;
-
-create table tbl_protectmode_4 (col string);
-select col from tbl_protectmode_4;
-alter table tbl_protectmode_4 enable offline;
-desc extended tbl_protectmode_4;
-
-select col from tbl_protectmode_4;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl4.q
deleted file mode 100644
index c7880de6d8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl4.q
+++ /dev/null
@@ -1,15 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_tbl4;
-drop table tbl_protectmode_tbl4_src;
-
-create table tbl_protectmode_tbl4_src (col string);
-
-create table tbl_protectmode_tbl4 (col string) partitioned by (p string);
-alter table tbl_protectmode_tbl4 add partition (p='p1');
-alter table tbl_protectmode_tbl4 enable no_drop;
-alter table tbl_protectmode_tbl4 enable offline;
-alter table tbl_protectmode_tbl4 disable no_drop;
-desc extended tbl_protectmode_tbl4;
-
-select col from tbl_protectmode_tbl4 where p='not_exist';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl5.q
deleted file mode 100644
index cd848fd4a1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl5.q
+++ /dev/null
@@ -1,15 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_tbl5;
-drop table tbl_protectmode_tbl5_src;
-
-create table tbl_protectmode_tbl5_src (col string);
-
-create table tbl_protectmode_tbl5 (col string) partitioned by (p string);
-alter table tbl_protectmode_tbl5 add partition (p='p1');
-alter table tbl_protectmode_tbl5 enable no_drop;
-alter table tbl_protectmode_tbl5 enable offline;
-alter table tbl_protectmode_tbl5 disable no_drop;
-desc extended tbl_protectmode_tbl5;
-
-insert overwrite table tbl_protectmode_tbl5 partition (p='not_exist') select col from tbl_protectmode_tbl5_src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl6.q
deleted file mode 100644
index 26248cc6b4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl6.q
+++ /dev/null
@@ -1,8 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_tbl6;
-
-create table tbl_protectmode_tbl6 (col string);
-alter table tbl_protectmode_tbl6 enable no_drop cascade;
-
-drop table tbl_protectmode_tbl6;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl7.q
deleted file mode 100644
index afff8404ed..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl7.q
+++ /dev/null
@@ -1,13 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_tbl7;
-create table tbl_protectmode_tbl7 (col string) partitioned by (p string);
-alter table tbl_protectmode_tbl7 add partition (p='p1');
-alter table tbl_protectmode_tbl7 enable no_drop;
-
-alter table tbl_protectmode_tbl7 drop partition (p='p1');
-
-alter table tbl_protectmode_tbl7 add partition (p='p1');
-alter table tbl_protectmode_tbl7 enable no_drop cascade;
-
-alter table tbl_protectmode_tbl7 drop partition (p='p1');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl8.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl8.q
deleted file mode 100644
index 809c287fc5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl8.q
+++ /dev/null
@@ -1,13 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode_tbl8;
-create table tbl_protectmode_tbl8 (col string) partitioned by (p string);
-alter table tbl_protectmode_tbl8 add partition (p='p1');
-alter table tbl_protectmode_tbl8 enable no_drop;
-
-alter table tbl_protectmode_tbl8 drop partition (p='p1');
-
-alter table tbl_protectmode_tbl8 enable no_drop cascade;
-
-alter table tbl_protectmode_tbl8 add partition (p='p1');
-alter table tbl_protectmode_tbl8 drop partition (p='p1');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl_no_drop.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl_no_drop.q
deleted file mode 100644
index a4ef2acbfd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/protectmode_tbl_no_drop.q
+++ /dev/null
@@ -1,9 +0,0 @@
--- protect mode: syntax to change protect mode works and queries are not blocked if a table or partition is not in protect mode
-
-drop table tbl_protectmode__no_drop;
-
-create table tbl_protectmode__no_drop (col string);
-select * from tbl_protectmode__no_drop;
-alter table tbl_protectmode__no_drop enable no_drop;
-desc extended tbl_protectmode__no_drop;
-drop table tbl_protectmode__no_drop;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q
deleted file mode 100644
index ef372259ed..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AggrFuncsWithNoGBYNoPartDef.q
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
-
--- testAggrFuncsWithNoGBYNoPartDef
-select p_mfgr,
-sum(p_retailprice) as s1
-from part; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q
deleted file mode 100644
index 5843042343..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_AmbiguousWindowDefn.q
+++ /dev/null
@@ -1,28 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
-
--- testAmbiguousWindowDefn
-select p_mfgr, p_name, p_size,
-sum(p_size) over (w1) as s1,
-sum(p_size) over (w2) as s2,
-sum(p_size) over (w3) as s3
-from part
-distribute by p_mfgr
-sort by p_mfgr
-window w1 as (rows between 2 preceding and 2 following),
- w2 as (rows between unbounded preceding and current row),
- w3 as w3;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q
deleted file mode 100644
index caebebf8ea..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DistributeByOrderBy.q
+++ /dev/null
@@ -1,19 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testPartitonBySortBy
-select p_mfgr, p_name, p_size,
-sum(p_retailprice) over (distribute by p_mfgr order by p_mfgr) as s1
-from part
-;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q
deleted file mode 100644
index 3a0304188d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_DuplicateWindowAlias.q
+++ /dev/null
@@ -1,22 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testDuplicateWindowAlias
-select p_mfgr, p_name, p_size,
-sum(p_size) over (w1) as s1,
-sum(p_size) over (w2) as s2
-from part
-window w1 as (partition by p_mfgr order by p_mfgr rows between 2 preceding and 2 following),
- w2 as w1,
- w2 as (rows between unbounded preceding and current row);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q
deleted file mode 100644
index f351a1448b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testHavingLeadWithNoGBYNoWindowing
-select p_mfgr,p_name, p_size
-from part
-having lead(p_size, 1) over() <= p_size
-distribute by p_mfgr
-sort by p_name;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
deleted file mode 100644
index d0d3d3fae2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_HavingLeadWithPTF.q
+++ /dev/null
@@ -1,22 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testHavingLeadWithPTF
-select p_mfgr,p_name, p_size
-from noop(on part
-partition by p_mfgr
-order by p_name)
-having lead(p_size, 1) over() <= p_size
-distribute by p_mfgr
-sort by p_name;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
deleted file mode 100644
index 40a39cb68b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_InvalidValueBoundary.q
+++ /dev/null
@@ -1,21 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING,
- p_complex array<int>
-);
-
--- testInvalidValueBoundary
-select p_mfgr,p_name, p_size,
-sum(p_size) over (w1) as s ,
-dense_rank() over(w1) as dr
-from part
-window w1 as (partition by p_mfgr order by p_complex range between 2 preceding and current row);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
deleted file mode 100644
index 80441e4f57..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_JoinWithAmbigousAlias.q
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testJoinWithAmbigousAlias
-select abc.*
-from noop(on part
-partition by p_mfgr
-order by p_name
-) abc join part on abc.p_partkey = p1.p_partkey;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q
deleted file mode 100644
index 1c98b8743c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_PartitionBySortBy.q
+++ /dev/null
@@ -1,19 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testPartitonBySortBy
-select p_mfgr, p_name, p_size,
-sum(p_retailprice) over (partition by p_mfgr sort by p_mfgr) as s1
-from part
-;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q
deleted file mode 100644
index 8f4a21bd6c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_negative_WhereWithRankCond.q
+++ /dev/null
@@ -1,21 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
--- testWhereWithRankCond
-select p_mfgr,p_name, p_size,
-rank() over() as r
-from part
-where r < 4
-distribute by p_mfgr
-sort by p_mfgr;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries.q
deleted file mode 100644
index ddab4367bb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries.q
+++ /dev/null
@@ -1,17 +0,0 @@
--- data setup
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-select p_mfgr, p_name, p_size,
- sum(p_retailprice) over (rows unbounded following) as s1
- from part distribute by p_mfgr sort by p_name;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q
deleted file mode 100644
index 16cb52ca84..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/ptf_window_boundaries2.q
+++ /dev/null
@@ -1,17 +0,0 @@
--- data setup
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-select p_mfgr, p_name, p_size,
- sum(p_retailprice) over (range unbounded following) as s1
- from part distribute by p_mfgr sort by p_name;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/recursive_view.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/recursive_view.q
deleted file mode 100644
index 590523e9b6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/recursive_view.q
+++ /dev/null
@@ -1,15 +0,0 @@
--- Can't have recursive views
-
-drop table t;
-drop view r0;
-drop view r1;
-drop view r2;
-drop view r3;
-create table t (id int);
-create view r0 as select * from t;
-create view r1 as select * from r0;
-create view r2 as select * from r1;
-create view r3 as select * from r2;
-drop view r0;
-alter view r3 rename to r0;
-select * from r0; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_1.q
deleted file mode 100644
index a171961a68..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.support.quoted.identifiers=none;
-EXPLAIN
-SELECT `+++` FROM srcpart;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_2.q
deleted file mode 100644
index 7bac1c7755..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.support.quoted.identifiers=none;
-EXPLAIN
-SELECT `.a.` FROM srcpart;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_groupby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_groupby.q
deleted file mode 100644
index 300d145508..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/regex_col_groupby.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.support.quoted.identifiers=none;
-EXPLAIN
-SELECT `..`, count(1) FROM srcpart GROUP BY `..`;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sa_fail_hook3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sa_fail_hook3.q
deleted file mode 100644
index e54201c09e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sa_fail_hook3.q
+++ /dev/null
@@ -1,4 +0,0 @@
-create table mp2 (a string) partitioned by (b string);
-alter table mp2 add partition (b='1');
-alter table mp2 partition (b='1') enable NO_DROP;
-alter table mp2 drop partition (b='1');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sample.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sample.q
deleted file mode 100644
index 0086352f8c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sample.q
+++ /dev/null
@@ -1 +0,0 @@
-explain extended SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 5 OUT OF 4 on key) s \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe2.q
deleted file mode 100644
index 1c3093c0e7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.exec.script.allow.partial.consumption = false;
--- Tests exception in ScriptOperator.processOp() by passing extra data needed to fill pipe buffer
-SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value, key, value) USING 'true' as a,b,c,d FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe3.q
deleted file mode 100644
index 60f93d2098..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_broken_pipe3.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.exec.script.allow.partial.consumption = true;
--- Test to ensure that a script with a bad error code still fails even with partial consumption
-SELECT TRANSFORM(*) USING 'false' AS a, b FROM (SELECT TRANSFORM(*) USING 'echo' AS a, b FROM src LIMIT 1) tmp;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_error.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_error.q
deleted file mode 100644
index 8ca849b82d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/script_error.q
+++ /dev/null
@@ -1,7 +0,0 @@
-EXPLAIN
-SELECT TRANSFORM(src.key, src.value) USING '../../data/scripts/error_script' AS (tkey, tvalue)
-FROM src;
-
-SELECT TRANSFORM(src.key, src.value) USING '../../data/scripts/error_script' AS (tkey, tvalue)
-FROM src;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_charliteral.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_charliteral.q
deleted file mode 100644
index 1e4c70e663..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_charliteral.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- Check that charSetLiteral syntax conformance
--- Check that a sane error message with correct line/column numbers is emitted with helpful context tokens.
-select _c17, count(1) from tmp_tl_foo group by _c17
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_udtf_alias.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_udtf_alias.q
deleted file mode 100644
index 8ace4414fc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/select_udtf_alias.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- Check alias count for SELECT UDTF() syntax:
--- explode returns a table with only 1 col - should be an error if query specifies >1 col aliases
-SELECT explode(array(1,2,3)) AS (myCol1, myCol2) LIMIT 3; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin1.q
deleted file mode 100644
index 06e6cad34b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- reference rhs of semijoin in select-clause
-select b.value from src a left semi join src b on (b.key = a.key and b.key = '100');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin2.q
deleted file mode 100644
index 46faae6416..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- rhs table reference in the where clause
-select a.value from src a left semi join src b on a.key = b.key where b.value = 'val_18';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin3.q
deleted file mode 100644
index 35b455a729..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- rhs table reference in group by
-select * from src a left semi join src b on a.key = b.key group by b.value;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin4.q
deleted file mode 100644
index 4e52ebfb3c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/semijoin4.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- rhs table is a view and reference the view in where clause
-select a.value from src a left semi join (select key , value from src where key > 100) b on a.key = b.key where b.value = 'val_108' ;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex.q
deleted file mode 100644
index 13b3f165b9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex.q
+++ /dev/null
@@ -1,17 +0,0 @@
-USE default;
--- This should fail because Regex SerDe doesn't support STRUCT
-CREATE TABLE serde_regex(
- host STRING,
- identity STRING,
- user STRING,
- time TIMESTAMP,
- request STRING,
- status INT,
- size INT,
- referer STRING,
- agent STRING,
- strct STRUCT<a:INT, b:STRING>)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.RegexSerDe'
-WITH SERDEPROPERTIES (
- "input.regex" = "([^ ]*) ([^ ]*) ([^ ]*) (-|\\[[^\\]]*\\]) ([^ \"]*|\"[^\"]*\") (-|[0-9]*) (-|[0-9]*)(?: ([^ \"]*|\"[^\"]*\") ([^ \"]*|\"[^\"]*\"))?")
-STORED AS TEXTFILE;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex2.q
deleted file mode 100644
index d523d03e90..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex2.q
+++ /dev/null
@@ -1,23 +0,0 @@
-USE default;
--- Mismatch between the number of matching groups and columns, throw run time exception. Ideally this should throw a compile time exception. See JIRA-3023 for more details.
- CREATE TABLE serde_regex(
- host STRING,
- identity STRING,
- user STRING,
- time STRING,
- request STRING,
- status STRING,
- size STRING,
- referer STRING,
- agent STRING)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.RegexSerDe'
-WITH SERDEPROPERTIES (
- "input.regex" = "([^ ]*) ([^ ]*) ([^ ]*) (-|\\[[^\\]]*\\]) ([^ \"]*|\"[^\"]*\") (-|[0-9]*) (-|[0-9]*)"
-)
-STORED AS TEXTFILE;
-
-LOAD DATA LOCAL INPATH "../../data/files/apache.access.log" INTO TABLE serde_regex;
-LOAD DATA LOCAL INPATH "../../data/files/apache.access.2.log" INTO TABLE serde_regex;
-
--- raise an exception
-SELECT * FROM serde_regex ORDER BY time; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex3.q
deleted file mode 100644
index 5a0295c971..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/serde_regex3.q
+++ /dev/null
@@ -1,14 +0,0 @@
-USE default;
--- null input.regex, raise an exception
- CREATE TABLE serde_regex(
- host STRING,
- identity STRING,
- user STRING,
- time STRING,
- request STRING,
- status STRING,
- size STRING,
- referer STRING,
- agent STRING)
-ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.RegexSerDe'
-STORED AS TEXTFILE;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q
deleted file mode 100644
index 4cb48664b6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation0.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- should fail: hive.join.cache.size accepts int type
-desc src;
-
-set hive.conf.validation=true;
-set hive.join.cache.size=test;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q
deleted file mode 100644
index 330aafd198..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation1.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- should fail: hive.map.aggr.hash.min.reduction accepts float type
-desc src;
-
-set hive.conf.validation=true;
-set hive.map.aggr.hash.min.reduction=false;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
deleted file mode 100644
index 579e9408b6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_hiveconf_validation2.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- should fail: hive.fetch.task.conversion accepts minimal or more
-desc src;
-
-set hive.conf.validation=true;
-set hive.fetch.task.conversion=true;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_table_property.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_table_property.q
deleted file mode 100644
index d582aaeb38..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/set_table_property.q
+++ /dev/null
@@ -1,4 +0,0 @@
-create table testTable(col1 int, col2 int);
-
--- set a table property = null, it should be caught by the grammar
-alter table testTable set tblproperties ('a'=);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns1.q
deleted file mode 100644
index 25705dc3d5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-SHOW COLUMNS from shcol_test;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns2.q
deleted file mode 100644
index c55b449a0b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-SHOW COLUMNS from shcol_test foo;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns3.q
deleted file mode 100644
index 508a786609..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_columns3.q
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE DATABASE test_db;
-USE test_db;
-CREATE TABLE foo(a INT);
-
-use default;
-SHOW COLUMNS from test_db.foo from test_db;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_does_not_exist.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_does_not_exist.q
deleted file mode 100644
index 83e5093aa1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_does_not_exist.q
+++ /dev/null
@@ -1,2 +0,0 @@
-SHOW CREATE TABLE tmp_nonexist;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_index.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_index.q
deleted file mode 100644
index 0dd0ef9a25..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_create_table_index.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE tmp_showcrt (key int, value string);
-CREATE INDEX tmp_index on table tmp_showcrt(key) as 'compact' WITH DEFERRED REBUILD;
-SHOW CREATE TABLE default__tmp_showcrt_tmp_index__;
-DROP INDEX tmp_index on tmp_showcrt;
-DROP TABLE tmp_showcrt;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_partitions1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_partitions1.q
deleted file mode 100644
index 71f68c894f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_partitions1.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW PARTITIONS NonExistentTable;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tableproperties1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tableproperties1.q
deleted file mode 100644
index 254a1d3a5a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tableproperties1.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TBLPROPERTIES NonExistentTable;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad1.q
deleted file mode 100644
index 1bc94d6392..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad1.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TABLES JOIN;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad2.q
deleted file mode 100644
index 5e828b647a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad2.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TABLES FROM default LIKE a b;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db1.q
deleted file mode 100644
index d0141f6c29..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db1.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TABLES FROM nonexistent; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db2.q
deleted file mode 100644
index ee0deba87a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tables_bad_db2.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TABLES FROM nonexistent LIKE 'test'; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus.q
deleted file mode 100644
index 283b5836e2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TABLE EXTENDED LIKE `srcpar*` PARTITION(ds='2008-04-08', hr=11); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q
deleted file mode 100644
index 242e165285..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/show_tablestatus_not_existing_part.q
+++ /dev/null
@@ -1 +0,0 @@
-SHOW TABLE EXTENDED LIKE `srcpart` PARTITION(ds='2008-14-08', hr=11); \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q
deleted file mode 100644
index 880323c604..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_bucketmapjoin.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.enforce.bucketing = true;
-set hive.enforce.sorting = true;
-set hive.exec.reducers.max = 1;
-
-
-CREATE TABLE smb_bucket4_1(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS;
-
-
-CREATE TABLE smb_bucket4_2(key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS;
-
-insert overwrite table smb_bucket4_1
-select * from src;
-
-insert overwrite table smb_bucket4_2
-select * from src;
-
-set hive.optimize.bucketmapjoin = true;
-set hive.optimize.bucketmapjoin.sortedmerge = true;
-
-select /*+mapjoin(a)*/ * from smb_bucket4_1 a left outer join smb_bucket4_2 b on a.key = b.key;
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_mapjoin_14.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
deleted file mode 100644
index 54bfba03d8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/smb_mapjoin_14.q
+++ /dev/null
@@ -1,38 +0,0 @@
-set hive.enforce.bucketing = true;
-set hive.enforce.sorting = true;
-set hive.exec.reducers.max = 1;
-
-CREATE TABLE tbl1(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
-CREATE TABLE tbl2(key int, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS;
-
-insert overwrite table tbl1
-select * from src where key < 10;
-
-insert overwrite table tbl2
-select * from src where key < 10;
-
-set hive.optimize.bucketmapjoin = true;
-set hive.optimize.bucketmapjoin.sortedmerge = true;
-set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
-
--- A join is being performed across different sub-queries, where a mapjoin is being performed in each of them.
--- Each sub-query should be converted to a sort-merge join.
--- A join followed by mapjoin is not allowed, so this query should fail.
--- Once HIVE-3403 is in, this should be automatically converted to a sort-merge join without the hint
-explain
-select src1.key, src1.cnt1, src2.cnt1 from
-(
- select key, count(*) as cnt1 from
- (
- select /*+mapjoin(a)*/ a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
- ) subq1 group by key
-) src1
-join
-(
- select key, count(*) as cnt1 from
- (
- select /*+mapjoin(a)*/ a.key as key, a.value as val1, b.value as val2 from tbl1 a join tbl2 b on a.key = b.key
- ) subq2 group by key
-) src2
-on src1.key = src2.key
-order by src1.key, src1.cnt1, src2.cnt1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q
deleted file mode 100644
index 7d11f450ed..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/sortmerge_mapjoin_mismatch_1.q
+++ /dev/null
@@ -1,28 +0,0 @@
-create table table_asc(key int, value string) CLUSTERED BY (key) SORTED BY (key asc)
-INTO 1 BUCKETS STORED AS RCFILE;
-create table table_desc(key int, value string) CLUSTERED BY (key) SORTED BY (key desc)
-INTO 1 BUCKETS STORED AS RCFILE;
-
-set hive.enforce.bucketing = true;
-set hive.enforce.sorting = true;
-
-insert overwrite table table_asc select key, value from src;
-insert overwrite table table_desc select key, value from src;
-set hive.optimize.bucketmapjoin = true;
-set hive.optimize.bucketmapjoin.sortedmerge = true;
-set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
-
--- If the user asked for sort merge join to be enforced (by setting
--- hive.enforce.sortmergebucketmapjoin to true), an error should be thrown, since
--- one of the tables is in ascending order and the other is in descending order,
--- and sort merge bucket mapjoin cannot be performed. In the default mode, the
--- query would succeed, although a regular map-join would be performed instead of
--- what the user asked.
-
-explain
-select /*+mapjoin(a)*/ * from table_asc a join table_desc b on a.key = b.key;
-
-set hive.enforce.sortmergebucketmapjoin=true;
-
-explain
-select /*+mapjoin(a)*/ * from table_asc a join table_desc b on a.key = b.key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_out_of_range.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_out_of_range.q
deleted file mode 100644
index 66af1fd7da..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_out_of_range.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
-
-select key from src tablesample(105 percent);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format.q
deleted file mode 100644
index f71cc44879..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
-select key from src tablesample(1 percent);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q
deleted file mode 100644
index 1a13c0ff4c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/split_sample_wrong_format2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
-select key from src tablesample(1K);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
deleted file mode 100644
index 1b2872d3d7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
+++ /dev/null
@@ -1,18 +0,0 @@
--- In this test, there is a dummy stats aggregator which throws an error when the
--- method connect is called (as indicated by the parameter hive.test.dummystats.aggregator)
--- If stats need not be reliable, the statement succeeds. However, if stats are supposed
--- to be reliable (by setting hive.stats.reliable to true), the insert statement fails
--- because stats cannot be collected for this statement
-
-create table tmptable(key string, value string);
-
-set hive.stats.dbclass=custom;
-set hive.stats.default.publisher=org.apache.hadoop.hive.ql.stats.DummyStatsPublisher;
-set hive.stats.default.aggregator=org.apache.hadoop.hive.ql.stats.DummyStatsAggregator;
-set hive.test.dummystats.aggregator=connect;
-
-set hive.stats.reliable=false;
-INSERT OVERWRITE TABLE tmptable select * from src;
-
-set hive.stats.reliable=true;
-INSERT OVERWRITE TABLE tmptable select * from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
deleted file mode 100644
index 0fa9ff6820..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
+++ /dev/null
@@ -1,16 +0,0 @@
--- In this test, the stats aggregator does not exists.
--- If stats need not be reliable, the statement succeeds. However, if stats are supposed
--- to be reliable (by setting hive.stats.reliable to true), the insert statement fails
--- because stats cannot be collected for this statement
-
-create table tmptable(key string, value string);
-
-set hive.stats.dbclass=custom;
-set hive.stats.default.publisher=org.apache.hadoop.hive.ql.stats.DummyStatsPublisher;
-set hive.stats.default.aggregator="";
-
-set hive.stats.reliable=false;
-INSERT OVERWRITE TABLE tmptable select * from src;
-
-set hive.stats.reliable=true;
-INSERT OVERWRITE TABLE tmptable select * from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_noscan_non_native.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_noscan_non_native.q
deleted file mode 100644
index bde6627836..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_noscan_non_native.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-CREATE TABLE non_native1(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
-
--- we do not support analyze table ... noscan on non-native tables yet
-analyze table non_native1 compute statistics noscan;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
deleted file mode 100644
index 47a8148e08..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_autogether.q
+++ /dev/null
@@ -1,31 +0,0 @@
-set datanucleus.cache.collections=false;
-set hive.stats.autogather=false;
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-set mapred.min.split.size=256;
-set mapred.min.split.size.per.node=256;
-set mapred.min.split.size.per.rack=256;
-set mapred.max.split.size=256;
-
--- test analyze table ... compute statistics partialscan
-
--- 1. prepare data
-CREATE table analyze_srcpart_partial_scan (key STRING, value STRING)
-partitioned by (ds string, hr string)
-stored as rcfile;
-insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null;
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-
-
--- 2. partialscan
-explain
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-
--- 3. confirm result
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11);
-describe formatted analyze_srcpart_partial_scan PARTITION(ds='2008-04-09',hr=11);
-drop table analyze_srcpart_partial_scan;
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q
deleted file mode 100644
index c206b8b5d7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_external.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-CREATE EXTERNAL TABLE external_table (key int, value string);
-
--- we do not support analyze table ... partialscan on EXTERNAL tables yet
-analyze table external_table compute statistics partialscan;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q
deleted file mode 100644
index 8e02ced85e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partialscan_non_native.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-CREATE TABLE non_native1(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
-
--- we do not support analyze table ... partialscan on non-native tables yet
-analyze table non_native1 compute statistics partialscan;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q
deleted file mode 100644
index 56d93d08aa..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_partscan_norcfile.q
+++ /dev/null
@@ -1,12 +0,0 @@
-set datanucleus.cache.collections=false;
-set hive.stats.autogather=true;
-set hive.exec.dynamic.partition=true;
-set hive.exec.dynamic.partition.mode=nonstrict;
-
--- test analyze table ... compute statistics partialscan
-
-create table analyze_srcpart_partial_scan like srcpart;
-insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null;
-analyze table analyze_srcpart_partial_scan PARTITION(ds='2008-04-08',hr=11) compute statistics partialscan;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
deleted file mode 100644
index be7c4f72fe..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
+++ /dev/null
@@ -1,18 +0,0 @@
--- In this test, there is a dummy stats publisher which throws an error when the
--- method connect is called (as indicated by the parameter hive.test.dummystats.publisher)
--- If stats need not be reliable, the statement succeeds. However, if stats are supposed
--- to be reliable (by setting hive.stats.reliable to true), the insert statement fails
--- because stats cannot be collected for this statement
-
-create table tmptable(key string, value string);
-
-set hive.stats.dbclass=custom;
-set hive.stats.default.publisher=org.apache.hadoop.hive.ql.stats.DummyStatsPublisher;
-set hive.stats.default.aggregator=org.apache.hadoop.hive.ql.stats.DummyStatsAggregator;
-set hive.test.dummystats.publisher=connect;
-
-set hive.stats.reliable=false;
-INSERT OVERWRITE TABLE tmptable select * from src;
-
-set hive.stats.reliable=true;
-INSERT OVERWRITE TABLE tmptable select * from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
deleted file mode 100644
index 652afe7c5b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
+++ /dev/null
@@ -1,16 +0,0 @@
--- In this test, the stats publisher does not exists.
--- If stats need not be reliable, the statement succeeds. However, if stats are supposed
--- to be reliable (by setting hive.stats.reliable to true), the insert statement fails
--- because stats cannot be collected for this statement
-
-create table tmptable(key string, value string);
-
-set hive.stats.dbclass=custom;
-set hive.stats.default.publisher="";
-set hive.stats.default.aggregator=org.apache.hadoop.hive.ql.stats.DummyStatsAggregator;
-
-set hive.stats.reliable=false;
-INSERT OVERWRITE TABLE tmptable select * from src;
-
-set hive.stats.reliable=true;
-INSERT OVERWRITE TABLE tmptable select * from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_join.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_join.q
deleted file mode 100644
index d618ee28fd..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_join.q
+++ /dev/null
@@ -1,3 +0,0 @@
-set hive.mapred.mode=strict;
-
-SELECT * FROM src src1 JOIN src src2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_orderby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_orderby.q
deleted file mode 100644
index 781cdbb050..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_orderby.q
+++ /dev/null
@@ -1,7 +0,0 @@
-set hive.mapred.mode=strict;
-
-EXPLAIN
-SELECT src.key, src.value from src order by src.key;
-
-SELECT src.key, src.value from src order by src.key;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_pruning.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_pruning.q
deleted file mode 100644
index 270ab2f593..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/strict_pruning.q
+++ /dev/null
@@ -1,6 +0,0 @@
-set hive.mapred.mode=strict;
-
-EXPLAIN
-SELECT count(1) FROM srcPART;
-
-SELECT count(1) FROM srcPART;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subq_insert.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subq_insert.q
deleted file mode 100644
index 0bc9e24e48..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subq_insert.q
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPLAIN
-SELECT * FROM (INSERT OVERWRITE TABLE src1 SELECT * FROM src ) y;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
deleted file mode 100644
index 9013df6f93..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-select *
-from src b
-where exists
- (select count(*)
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_9'
- )
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_groupby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_groupby.q
deleted file mode 100644
index a9bc6ee6a3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_groupby.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-select count(*)
-from src
-group by src.key in (select key from src s1 where s1.key > '9') \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_select.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_select.q
deleted file mode 100644
index 1365389cb2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_in_select.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-select src.key in (select key from src s1 where s1.key > '9')
-from src
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
deleted file mode 100644
index 6805c5b16b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-explain
- select *
-from src
-where src.key in (select * from src s1 where s1.key > '9')
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_nested_subquery.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_nested_subquery.q
deleted file mode 100644
index e8c41e6b17..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_nested_subquery.q
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-select *
-from part x
-where x.p_name in (select y.p_name from part y where exists (select z.p_name from part z where y.p_name = z.p_name))
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
deleted file mode 100644
index 852b2953ff..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-select *
-from src b
-where not exists
- (select sum(1)
- from src a
- where b.value = a.value and a.key = b.key and a.value > 'val_9'
- )
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_shared_alias.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_shared_alias.q
deleted file mode 100644
index d442f077c0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_shared_alias.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-select *
-from src
-where src.key in (select key from src where key > '9')
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_subquery_chain.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
deleted file mode 100644
index 8ea94c5fc6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-explain
-select *
-from src
-where src.key in (select key from src) in (select key from src)
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_unqual_corr_expr.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_unqual_corr_expr.q
deleted file mode 100644
index 99ff9ca703..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_unqual_corr_expr.q
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-select *
-from src
-where key in (select key from src)
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_windowing_corr.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
deleted file mode 100644
index 105d3d22d9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
+++ /dev/null
@@ -1,26 +0,0 @@
-DROP TABLE part;
-
--- data setup
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
-
-
--- corr and windowing
-select p_mfgr, p_name, p_size
-from part a
-where a.p_size in
- (select first_value(p_size) over(partition by p_mfgr order by p_size)
- from part b
- where a.p_brand = b.p_brand)
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_with_or_cond.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_with_or_cond.q
deleted file mode 100644
index c2c322178f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/subquery_with_or_cond.q
+++ /dev/null
@@ -1,5 +0,0 @@
-
-select count(*)
-from src
-where src.key in (select key from src s1 where s1.key > '9') or src.value is not null
-; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch1.q
deleted file mode 100644
index 9efbba0082..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch1.q
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE srcpart TOUCH PARTITION (ds='2008-04-08', hr='13');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch2.q
deleted file mode 100644
index 923a171e04..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/touch2.q
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE src TOUCH PARTITION (ds='2008-04-08', hr='12');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_bucketed_column.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
deleted file mode 100644
index e53665695a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- Tests truncating a bucketed column
-
-CREATE TABLE test_tab (key STRING, value STRING) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE test_tab SELECT * FROM src;
-
-TRUNCATE TABLE test_tab COLUMNS (key);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_indexed_table.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_indexed_table.q
deleted file mode 100644
index 13f32c8968..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_indexed_table.q
+++ /dev/null
@@ -1,9 +0,0 @@
--- Tests truncating a column from an indexed table
-
-CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE test_tab SELECT * FROM src;
-
-CREATE INDEX test_tab_index ON TABLE test_tab (key) as 'COMPACT' WITH DEFERRED REBUILD;
-
-TRUNCATE TABLE test_tab COLUMNS (value);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
deleted file mode 100644
index 0ece6007f7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.mapred.supports.subdirectories=true;
-set mapred.input.dir.recursive=true;
-
--- Tests truncating a column on which a table is list bucketed
-
-CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE;
-
-ALTER TABLE test_tab
-SKEWED BY (key) ON ("484")
-STORED AS DIRECTORIES;
-
-INSERT OVERWRITE TABLE test_tab SELECT * FROM src;
-
-TRUNCATE TABLE test_tab COLUMNS (key);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_seqfile.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
deleted file mode 100644
index 903540dae8..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- Tests truncating a column from a table stored as a sequence file
-
-CREATE TABLE test_tab (key STRING, value STRING) STORED AS SEQUENCEFILE;
-
-INSERT OVERWRITE TABLE test_tab SELECT * FROM src;
-
-TRUNCATE TABLE test_tab COLUMNS (key);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
deleted file mode 100644
index 5509552811..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- Tests attempting to truncate a column in a table that doesn't exist
-
-CREATE TABLE test_tab (key STRING, value STRING) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE test_tab SELECT * FROM src;
-
-TRUNCATE TABLE test_tab COLUMNS (doesnt_exist);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column.q
deleted file mode 100644
index 134743ac13..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- Tests truncating a partition column
-
-CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE test_tab PARTITION (part = '1') SELECT * FROM src;
-
-TRUNCATE TABLE test_tab COLUMNS (part);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column2.q
deleted file mode 100644
index 47635208a7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_partition_column2.q
+++ /dev/null
@@ -1,7 +0,0 @@
--- Tests truncating a partition column
-
-CREATE TABLE test_tab (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE test_tab PARTITION (part = '1') SELECT * FROM src;
-
-TRUNCATE TABLE test_tab PARTITION (part = '1') COLUMNS (part);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure1.q
deleted file mode 100644
index f6cfa44bbb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- partition spec for non-partitioned table
-TRUNCATE TABLE src partition (ds='2008-04-08', hr='11');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure2.q
deleted file mode 100644
index 1137d893eb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- full partition spec for not existing partition
-TRUNCATE TABLE srcpart partition (ds='2012-12-17', hr='15');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure3.q
deleted file mode 100644
index c5cf58775b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure3.q
+++ /dev/null
@@ -1,4 +0,0 @@
-create external table external1 (a int, b int) partitioned by (ds string);
-
--- trucate for non-managed table
-TRUNCATE TABLE external1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure4.q
deleted file mode 100644
index a7f1e92d55..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/truncate_table_failure4.q
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE non_native(key int, value string)
-STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler';
-
--- trucate for non-native table
-TRUNCATE TABLE non_native;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udaf_invalid_place.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udaf_invalid_place.q
deleted file mode 100644
index f37ce72ae4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udaf_invalid_place.q
+++ /dev/null
@@ -1 +0,0 @@
-select distinct key, sum(key) from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q
deleted file mode 100644
index c2a132d4db..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid first argument
-SELECT array_contains(1, 2) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q
deleted file mode 100644
index 36f85d34a6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_array_contains_wrong2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid second argument
-SELECT array_contains(array(1, 2, 3), '2') FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true.q
deleted file mode 100644
index 73b3f9654f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true.q
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIBE FUNCTION ASSERT_TRUE;
-
-EXPLAIN SELECT ASSERT_TRUE(x > 0) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
-SELECT ASSERT_TRUE(x > 0) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
-
-EXPLAIN SELECT ASSERT_TRUE(x < 2) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
-SELECT ASSERT_TRUE(x < 2) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true2.q
deleted file mode 100644
index 4b62220764..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_assert_true2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPLAIN SELECT 1 + ASSERT_TRUE(x < 2) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
-SELECT 1 + ASSERT_TRUE(x < 2) FROM src LATERAL VIEW EXPLODE(ARRAY(1, 2)) a AS x LIMIT 2;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_coalesce.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_coalesce.q
deleted file mode 100644
index 7405e387ca..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_coalesce.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT COALESCE(array('a', 'b'), '2.0') FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q
deleted file mode 100644
index 8c2017bc63..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument number
-SELECT concat_ws('-') FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q
deleted file mode 100644
index c49e7868bb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT concat_ws('[]', array(100, 200, 50)) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q
deleted file mode 100644
index 72b86271f5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_concat_ws_wrong3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT concat_ws(1234, array('www', 'facebook', 'com')) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q
deleted file mode 100644
index fbe4902d64..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_args_len.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT elt(3) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q
deleted file mode 100644
index bb1fdbf789..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_elt_wrong_type.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM src_thrift
-SELECT elt(1, src_thrift.lintstring)
-WHERE src_thrift.lintstring IS NOT NULL;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q
deleted file mode 100644
index 9703c82d8a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_args_len.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT field(3) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_type.q
deleted file mode 100644
index 61b2cd0649..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_field_wrong_type.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM src_thrift
-SELECT field(1, src_thrift.lintstring)
-WHERE src_thrift.lintstring IS NOT NULL;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q
deleted file mode 100644
index 18c985c606..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument length
-SELECT format_number(12332.123456) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q
deleted file mode 100644
index 7959c20b28..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument length
-SELECT format_number(12332.123456, 2, 3) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q
deleted file mode 100644
index 7d90ef86da..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument(second argument should be >= 0)
-SELECT format_number(12332.123456, -4) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q
deleted file mode 100644
index e545f4aa14..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong4.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT format_number(12332.123456, 4.01) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q
deleted file mode 100644
index a6f71778f1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong5.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT format_number(array(12332.123456, 321.23), 5) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong6.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong6.q
deleted file mode 100644
index e5b11b9b71..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong6.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT format_number(12332.123456, "4") FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q
deleted file mode 100644
index aa4a3a4475..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_format_number_wrong7.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type(format_number returns the result as a string)
-SELECT format_number(format_number(12332.123456, 4), 2) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_function_does_not_implement_udf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_function_does_not_implement_udf.q
deleted file mode 100644
index 21ca6e7d36..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_function_does_not_implement_udf.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TEMPORARY FUNCTION moo AS 'org.apache.hadoop.hive.ql.Driver';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_not_bool.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_not_bool.q
deleted file mode 100644
index 74458d0c3d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_not_bool.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT IF('STRING', 1, 1) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q
deleted file mode 100644
index ad19364c33..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_if_wrong_args_len.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT IF(TRUE, 1) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_in.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_in.q
deleted file mode 100644
index ce9ce54fac..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_in.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT 3 IN (array(1,2,3)) FROM src; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q
deleted file mode 100644
index ac8253fb1e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_args_len.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT instr('abcd') FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q
deleted file mode 100644
index 9ac3ed6614..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_instr_wrong_type.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM src_thrift
-SELECT instr('abcd', src_thrift.lintstring)
-WHERE src_thrift.lintstring IS NOT NULL;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_invalid.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_invalid.q
deleted file mode 100644
index 68050fd95c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_invalid.q
+++ /dev/null
@@ -1 +0,0 @@
-select default.nonexistfunc() from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_local_resource.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_local_resource.q
deleted file mode 100644
index bcfa217737..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_local_resource.q
+++ /dev/null
@@ -1 +0,0 @@
-create function lookup as 'org.apache.hadoop.hive.ql.udf.UDFFileLookup' using file '../../data/files/sales.txt';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q
deleted file mode 100644
index ca7caad54d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_args_len.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT locate('a', 'b', 1, 2) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q
deleted file mode 100644
index 4bbf79a310..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_locate_wrong_type.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM src_thrift
-SELECT locate('abcd', src_thrift.lintstring)
-WHERE src_thrift.lintstring IS NOT NULL;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q
deleted file mode 100644
index ebb6c2ab41..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_num.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map_keys(map("a", "1"), map("b", "2")) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q
deleted file mode 100644
index 0757d1494f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_keys_arg_type.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map_keys(array(1, 2, 3)) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q
deleted file mode 100644
index c97476a126..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_num.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map_values(map("a", "1"), map("b", "2")) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q
deleted file mode 100644
index cc060ea0f0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_map_values_arg_type.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map_values(array(1, 2, 3, 4)) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_max.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_max.q
deleted file mode 100644
index 7282e07596..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_max.q
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT max(map("key", key, "value", value))
-FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_min.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_min.q
deleted file mode 100644
index b9528fa6da..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_min.q
+++ /dev/null
@@ -1,2 +0,0 @@
-SELECT min(map("key", key, "value", value))
-FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_nonexistent_resource.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_nonexistent_resource.q
deleted file mode 100644
index d37665dde6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_nonexistent_resource.q
+++ /dev/null
@@ -1 +0,0 @@
-create function lookup as 'org.apache.hadoop.hive.ql.udf.UDFFileLookup' using file 'nonexistent_file.txt';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong1.q
deleted file mode 100644
index 88ca4fefc3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument length
-SELECT printf() FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong2.q
deleted file mode 100644
index 01ed2ffcf0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT printf(100) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong3.q
deleted file mode 100644
index 71f118b8dc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT printf("Hello World %s", array("invalid", "argument")) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong4.q
deleted file mode 100644
index 71f118b8dc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_printf_wrong4.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT printf("Hello World %s", array("invalid", "argument")) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_qualified_name.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_qualified_name.q
deleted file mode 100644
index 476dfa21a2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_qualified_name.q
+++ /dev/null
@@ -1 +0,0 @@
-create temporary function default.myfunc as 'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFSum';
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_reflect_neg.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_reflect_neg.q
deleted file mode 100644
index 67efb64505..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_reflect_neg.q
+++ /dev/null
@@ -1,9 +0,0 @@
-SELECT reflect("java.lang.StringClassThatDoesNotExist", "valueOf", 1),
- reflect("java.lang.String", "methodThatDoesNotExist"),
- reflect("java.lang.Math", "max", "overloadthatdoesnotexist", 3),
- reflect("java.lang.Math", "min", 2, 3),
- reflect("java.lang.Math", "round", 2.5),
- reflect("java.lang.Math", "exp", 1.0),
- reflect("java.lang.Math", "floor", 1.9)
-FROM src LIMIT 1;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q
deleted file mode 100644
index c628ff8aa1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_args_len.q
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM src_thrift
-SELECT size(src_thrift.lint, src_thrift.lintstring),
- size()
-WHERE src_thrift.lint IS NOT NULL
- AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_type.q
deleted file mode 100644
index 16695f6adc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_size_wrong_type.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT SIZE('wrong type: string') FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q
deleted file mode 100644
index 9954f4ab4d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong1.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument number
-SELECT sort_array(array(2, 5, 4), 3) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q
deleted file mode 100644
index 32c2645519..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong2.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT sort_array("Invalid") FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q
deleted file mode 100644
index 034de06b8e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_sort_array_wrong3.q
+++ /dev/null
@@ -1,2 +0,0 @@
--- invalid argument type
-SELECT sort_array(array(array(10, 20), array(5, 15), array(3, 13))) FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error.q
deleted file mode 100644
index 846f87c2e5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error.q
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE TEMPORARY FUNCTION test_error AS 'org.apache.hadoop.hive.ql.udf.UDFTestErrorOnFalse';
-
-SELECT test_error(key < 125 OR key > 130) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error_reduce.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error_reduce.q
deleted file mode 100644
index b1a06f2a07..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_test_error_reduce.q
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TEMPORARY FUNCTION test_error AS 'org.apache.hadoop.hive.ql.udf.UDFTestErrorOnFalse';
-
-
-SELECT test_error(key < 125 OR key > 130)
-FROM (
- SELECT *
- FROM src
- DISTRIBUTE BY rand()
-) map_output;
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_when_type_wrong.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_when_type_wrong.q
deleted file mode 100644
index d4d2d2e485..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udf_when_type_wrong.q
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT CASE
- WHEN TRUE THEN 2
- WHEN '1' THEN 4
- ELSE 5
- END
-FROM src LIMIT 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q
deleted file mode 100644
index 942ae5d831..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported1.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal) FROM src GROUP BY key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q
deleted file mode 100644
index 00d359a75c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported2.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT explode(map(1,'one',2,'two',3,'three')) as (myKey,myVal,myVal2) FROM src; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q
deleted file mode 100644
index 51df8fa862..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported3.q
+++ /dev/null
@@ -1 +0,0 @@
-select explode(array(1),array(2)) as myCol from src; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q
deleted file mode 100644
index ae8dff7bad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_explode_not_supported4.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT explode(null) as myNull FROM src GROUP BY key; \ No newline at end of file
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_invalid_place.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_invalid_place.q
deleted file mode 100644
index ab84a801e9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_invalid_place.q
+++ /dev/null
@@ -1 +0,0 @@
-select distinct key, explode(key) from src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported1.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported1.q
deleted file mode 100644
index 04e98d52c5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported1.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT explode(array(1,2,3)) as myCol, key FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported3.q
deleted file mode 100644
index f4fe0dde3e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/udtf_not_supported3.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT explode(array(1,2,3)) as myCol FROM src GROUP BY key;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union2.q
deleted file mode 100644
index 38db488eaf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union2.q
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-create table if not exists union2_t1(r string, c string, v array<string>);
-create table if not exists union2_t2(s string, c string, v string);
-
-explain
-SELECT s.r, s.c, sum(s.v)
-FROM (
- SELECT a.r AS r, a.c AS c, a.v AS v FROM union2_t1 a
- UNION ALL
- SELECT b.s AS r, b.c AS c, 0 + b.v AS v FROM union2_t2 b
-) s
-GROUP BY s.r, s.c;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union22.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union22.q
deleted file mode 100644
index 72f3314bda..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union22.q
+++ /dev/null
@@ -1,26 +0,0 @@
-create table dst_union22(k1 string, k2 string, k3 string, k4 string) partitioned by (ds string);
-create table dst_union22_delta(k0 string, k1 string, k2 string, k3 string, k4 string, k5 string) partitioned by (ds string);
-
-insert overwrite table dst_union22 partition (ds='1')
-select key, value, key , value from src;
-
-insert overwrite table dst_union22_delta partition (ds='1')
-select key, key, value, key, value, value from src;
-
-set hive.merge.mapfiles=false;
-
--- Union followed by Mapjoin is not supported.
--- The same query would work without the hint
--- Note that there is a positive test with the same name in clientpositive
-explain extended
-insert overwrite table dst_union22 partition (ds='2')
-select * from
-(
-select k1 as k1, k2 as k2, k3 as k3, k4 as k4 from dst_union22_delta where ds = '1' and k0 <= 50
-union all
-select /*+ MAPJOIN(b) */ a.k1 as k1, a.k2 as k2, b.k3 as k3, b.k4 as k4
-from dst_union22 a left outer join (select * from dst_union22_delta where ds = '1' and k0 > 50) b on
-a.k1 = b.k1 and a.ds='1'
-where a.k1 > 20
-)
-subq;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union3.q
deleted file mode 100644
index ce657478c1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/union3.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- Ensure that UNION ALL columns are in the correct order on both sides
--- Ensure that the appropriate error message is propagated
-CREATE TABLE IF NOT EXISTS union3 (bar int, baz int);
-SELECT * FROM ( SELECT f.bar, f.baz FROM union3 f UNION ALL SELECT b.baz, b.bar FROM union3 b ) c;
-DROP TABLE union3;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin.q
deleted file mode 100644
index d6a19c397d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM UNIQUEJOIN (SELECT src.key from src WHERE src.key<4) a (a.key), PRESERVE src b(b.key)
-SELECT a.key, b.key;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin2.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin2.q
deleted file mode 100644
index 6e9a082514..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM UNIQUEJOIN src a (a.key), PRESERVE src b (b.key, b.val)
-SELECT a.key, b.key;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin3.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin3.q
deleted file mode 100644
index 89a8f1b2aa..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/uniquejoin3.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM UNIQUEJOIN src a (a.key), PRESERVE src b (b.key) JOIN src c ON c.key
-SELECT a.key;
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_table_property.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_table_property.q
deleted file mode 100644
index 7a24e652b4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_table_property.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE TABLE testTable(col1 INT, col2 INT);
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3');
-SHOW TBLPROPERTIES testTable;
-
--- unset a subset of the properties and some non-existed properties without if exists
-ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'x', 'y', 'z');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_view_property.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_view_property.q
deleted file mode 100644
index 11131006e9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/unset_view_property.q
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE VIEW testView AS SELECT value FROM src WHERE key=86;
-ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200');
-SHOW TBLPROPERTIES testView;
-
--- unset a subset of the properties and some non-existed properties without if exists
-ALTER VIEW testView UNSET TBLPROPERTIES ('propB', 'propX', 'propY', 'propZ');
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q
deleted file mode 100644
index c5b593e4bb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_invalid_udaf.q
+++ /dev/null
@@ -1 +0,0 @@
-select nonexistfunc(key) over () from src limit 1;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q
deleted file mode 100644
index b54b7a5321..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_leadlag_in_udaf.q
+++ /dev/null
@@ -1,15 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-select sum(lead(p_retailprice,1)) as s1 from part;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
deleted file mode 100644
index 15f8fae292..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
+++ /dev/null
@@ -1,26 +0,0 @@
-DROP TABLE IF EXISTS part;
-
--- data setup
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
-
-
-select p_mfgr, p_name, p_size,
-min(p_retailprice),
-rank() over(distribute by p_mfgr sort by p_name)as r,
-dense_rank() over(distribute by p_mfgr sort by p_name) as dr,
-p_size, p_size - lag(p_size,-1,p_size) over(distribute by p_mfgr sort by p_name) as deltaSz
-from part
-group by p_mfgr, p_name, p_size
-;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_over.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_over.q
deleted file mode 100644
index 3ca1104b01..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/windowing_ll_no_over.q
+++ /dev/null
@@ -1,17 +0,0 @@
-DROP TABLE part;
-
-CREATE TABLE part(
- p_partkey INT,
- p_name STRING,
- p_mfgr STRING,
- p_brand STRING,
- p_type STRING,
- p_size INT,
- p_container STRING,
- p_retailprice DOUBLE,
- p_comment STRING
-);
-
-select p_mfgr,
-lead(p_retailprice,1) as s1
-from part;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/wrong_column_type.q b/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/wrong_column_type.q
deleted file mode 100644
index 490f0c3b4d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/clientnegative/wrong_column_type.q
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE dest1(a float);
-
-INSERT OVERWRITE TABLE dest1
-SELECT array(1.0,2.0) FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/ambiguous_join_col.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/ambiguous_join_col.q
deleted file mode 100644
index e70aae4627..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/ambiguous_join_col.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src src1 JOIN src src2 ON src1.key = src2.key
-INSERT OVERWRITE TABLE dest1 SELECT key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/duplicate_alias.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/duplicate_alias.q
deleted file mode 100644
index 5fd22460c0..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/duplicate_alias.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src a JOIN src a ON (a.key = a.key)
-INSERT OVERWRITE TABLE dest1 SELECT a.key, a.value
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/garbage.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/garbage.q
deleted file mode 100644
index 6c8c751f21..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/garbage.q
+++ /dev/null
@@ -1 +0,0 @@
-this is totally garbage SELECT src.key WHERE a lot of garbage
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/insert_wrong_number_columns.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/insert_wrong_number_columns.q
deleted file mode 100644
index aadfbde338..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/insert_wrong_number_columns.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value, 1 WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_create_table.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_create_table.q
deleted file mode 100644
index 899bbd368b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_create_table.q
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE TABLE mytable (
- a INT
- b STRING
-);
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_dot.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_dot.q
deleted file mode 100644
index 36b9bd2a3b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_dot.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.value.member WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_function_param2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_function_param2.q
deleted file mode 100644
index 3543449b88..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_function_param2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT substr('1234', 'abc'), src.value WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_index.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_index.q
deleted file mode 100644
index 146bc5dc9f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_index.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key[0], src.value
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index.q
deleted file mode 100644
index c40f079f60..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src_thrift
-INSERT OVERWRITE TABLE dest1 SELECT src_thrift.lint[0], src_thrift.lstring['abc']
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index2.q
deleted file mode 100644
index 99d0b3d416..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_list_index2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src_thrift
-INSERT OVERWRITE TABLE dest1 SELECT src_thrift.lint[0], src_thrift.lstring[1 + 2]
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index.q
deleted file mode 100644
index c2b9eab61b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src_thrift
-INSERT OVERWRITE TABLE dest1 SELECT src_thrift.lint[0], src_thrift.mstringstring[0]
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index2.q
deleted file mode 100644
index 5828f0709f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_map_index2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src_thrift
-INSERT OVERWRITE TABLE dest1 SELECT src_thrift.lint[0], src_thrift.mstringstring[concat('abc', 'abc')]
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_select.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_select.q
deleted file mode 100644
index fd1298577b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/invalid_select.q
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT
- trim(trim(a))
- trim(b)
-FROM src;
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/macro_reserved_word.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/macro_reserved_word.q
deleted file mode 100644
index 359eb9de93..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/macro_reserved_word.q
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TEMPORARY MACRO DOUBLE (x DOUBLE) 1.0 / (1.0 + EXP(-x));
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/missing_overwrite.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/missing_overwrite.q
deleted file mode 100644
index 1bfeee382e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/missing_overwrite.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT TABLE dest1 SELECT '1234', src.value WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/nonkey_groupby.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/nonkey_groupby.q
deleted file mode 100644
index ad0f4415cb..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/nonkey_groupby.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100 group by src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/quoted_string.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/quoted_string.q
deleted file mode 100644
index 0252a9e11c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/quoted_string.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234", src.value WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column1.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column1.q
deleted file mode 100644
index 429cead63b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.dummycol WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column2.q
deleted file mode 100644
index 3767dc4e65..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.dummykey < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column3.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column3.q
deleted file mode 100644
index 2fc5f490f1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column3.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100 group by src.dummycol
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column4.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column4.q
deleted file mode 100644
index 8ad8dd12e4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column4.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100 group by dummysrc.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column5.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column5.q
deleted file mode 100644
index 766b0e5255..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column5.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE dummysrc.key < 100 group by src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column6.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column6.q
deleted file mode 100644
index bb76c28623..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_column6.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', dummysrc.value WHERE src.key < 100 group by src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function1.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function1.q
deleted file mode 100644
index d8ff6325b9..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', dummyfn(src.value, 10) WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function2.q
deleted file mode 100644
index f7d255934d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE anotherdummyfn('abc', src.key) + 10 < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function3.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function3.q
deleted file mode 100644
index 87d4edc987..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function3.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE anotherdummyfn('abc', src.key) + 10 < 100 group by src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function4.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function4.q
deleted file mode 100644
index cfe70e4f2f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_function4.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT '1234', dummyfn(src.key) WHERE src.key < 100 group by src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table1.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table1.q
deleted file mode 100644
index 585ef6d7f2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM dummySrc
-INSERT OVERWRITE TABLE dest1 SELECT '1234', src.value WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table2.q
deleted file mode 100644
index 2c69c16be5..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/unknown_table2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dummyDest SELECT '1234', src.value WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct1.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct1.q
deleted file mode 100755
index d92c3bb8df..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT DISTINCT src.key, substr(src.value,4,1) GROUP BY src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct2.q b/sql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct2.q
deleted file mode 100755
index 53fb550b3d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/negative/wrong_distinct2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, DISTINCT substr(src.value,4,1) GROUP BY src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/case_sensitivity.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/case_sensitivity.q
deleted file mode 100644
index d7f7371507..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/case_sensitivity.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM SRC_THRIFT
-INSERT OVERWRITE TABLE dest1 SELECT src_Thrift.LINT[1], src_thrift.lintstring[0].MYSTRING where src_thrift.liNT[0] > 0
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/cast1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/cast1.q
deleted file mode 100644
index 6269c6a4e7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/cast1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-SELECT 3 + 2, 3.0 + 2, 3 + 2.0, 3.0 + 2.0, 3 + CAST(2.0 AS INT), CAST(1 AS BOOLEAN), CAST(TRUE AS INT) WHERE src.key = 86
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby1.q
deleted file mode 100755
index 96b29b05cc..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, sum(substr(src.value,5)) GROUP BY src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby2.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby2.q
deleted file mode 100755
index d741eb60b6..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-SELECT substr(src.key,1,1), count(DISTINCT substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))) GROUP BY substr(src.key,1,1)
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby3.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby3.q
deleted file mode 100755
index 03b1248a11..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby3.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-SELECT sum(substr(src.value,5)), avg(substr(src.value,5)), avg(DISTINCT substr(src.value,5)), max(substr(src.value,5)), min(substr(src.value,5))
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby4.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby4.q
deleted file mode 100755
index 85271a9caf..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby4.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-SELECT substr(src.key,1,1) GROUP BY substr(src.key,1,1)
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby5.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby5.q
deleted file mode 100755
index ebd65b3069..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby5.q
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SELECT src.key, sum(substr(src.value,5))
-FROM src
-GROUP BY src.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby6.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby6.q
deleted file mode 100755
index 80654f2a9c..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/groupby6.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-SELECT DISTINCT substr(src.value,5,1)
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input1.q
deleted file mode 100644
index fdd290d6b1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input2.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input2.q
deleted file mode 100644
index 4e1612ea97..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input2.q
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.* WHERE src.key < 100
-INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key >= 100 and src.key < 200
-INSERT OVERWRITE TABLE dest3 PARTITION(ds='2008-04-08', hr='12') SELECT src.key, 2 WHERE src.key >= 200
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input20.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input20.q
deleted file mode 100644
index f30cf27017..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input20.q
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM (
- FROM src
- MAP src.key % 2, src.key % 5
- USING 'cat'
- CLUSTER BY key
-) tmap
-REDUCE tmap.key, tmap.value
-USING 'uniq -c | sed "s@^ *@@" | sed "s@\t@_@" | sed "s@ @\t@"'
-AS key, value
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input3.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input3.q
deleted file mode 100644
index fc53e94d39..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input3.q
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest1 SELECT src.* WHERE src.key < 100
-INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key >= 100 and src.key < 200
-INSERT OVERWRITE TABLE dest3 PARTITION(ds='2008-04-08', hr='12') SELECT src.key, 2 WHERE src.key >= 200 and src.key < 300
-INSERT OVERWRITE DIRECTORY '../../../../build/contrib/hive/ql/test/data/warehouse/dest4.out' SELECT src.value WHERE src.key >= 300
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input4.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input4.q
deleted file mode 100644
index 03e6de48fa..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input4.q
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM (
- FROM src
- SELECT TRANSFORM(src.key, src.value)
- USING '/bin/cat' AS (tkey, tvalue)
- CLUSTER BY tkey
-) tmap
-INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue WHERE tmap.tkey < 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input5.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input5.q
deleted file mode 100644
index a46abc7583..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input5.q
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM (
- FROM src_thrift
- SELECT TRANSFORM(src_thrift.lint, src_thrift.lintstring)
- USING '/bin/cat' AS (tkey, tvalue)
- CLUSTER BY tkey
-) tmap
-INSERT OVERWRITE TABLE dest1 SELECT tmap.tkey, tmap.tvalue
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input6.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input6.q
deleted file mode 100644
index d6f25a935a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input6.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src1
-INSERT OVERWRITE TABLE dest1 SELECT src1.key, src1.value WHERE src1.key is null
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input7.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input7.q
deleted file mode 100644
index 33a82953c2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input7.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src1
-INSERT OVERWRITE TABLE dest1 SELECT NULL, src1.key
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input8.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input8.q
deleted file mode 100644
index 0843b9ba4e..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input8.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src1
-SELECT 4 + NULL, src1.key - NULL, NULL + NULL
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input9.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input9.q
deleted file mode 100644
index 2892f0b2df..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input9.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src1
-INSERT OVERWRITE TABLE dest1 SELECT NULL, src1.key where NULL = NULL
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_part1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input_part1.q
deleted file mode 100644
index d45d1cd0b4..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_part1.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM srcpart
-SELECT srcpart.key, srcpart.value, srcpart.hr, srcpart.ds WHERE srcpart.key < 100 and srcpart.ds = '2008-04-08' and srcpart.hr = '12'
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testsequencefile.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testsequencefile.q
deleted file mode 100755
index cf9a092417..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testsequencefile.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src
-INSERT OVERWRITE TABLE dest4_sequencefile SELECT src.key, src.value
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath.q
deleted file mode 100755
index 7699bff755..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src_thrift
-SELECT src_thrift.lint[1], src_thrift.lintstring[0].mystring, src_thrift.mstringstring['key_2']
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath2.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath2.q
deleted file mode 100644
index 08abaf4fad..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/input_testxpath2.q
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM src_thrift
-SELECT size(src_thrift.lint), size(src_thrift.lintstring), size(src_thrift.mstringstring) where src_thrift.lint IS NOT NULL AND NOT (src_thrift.mstringstring IS NULL)
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join1.q
deleted file mode 100644
index 739c39dd8f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join1.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM src src1 JOIN src src2 ON (src1.key = src2.key)
-INSERT OVERWRITE TABLE dest1 SELECT src1.key, src2.value
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join2.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join2.q
deleted file mode 100644
index a02d87f09f..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join2.q
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key + src2.key = src3.key)
-INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join3.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join3.q
deleted file mode 100644
index b57c9569d7..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join3.q
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src src3 ON (src1.key = src3.key)
-INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join4.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join4.q
deleted file mode 100644
index 2e5967fb7d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join4.q
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM (
- FROM
- (
- FROM src src1 SELECT src1.key AS c1, src1.value AS c2 WHERE src1.key > 10 and src1.key < 20
- ) a
- LEFT OUTER JOIN
- (
- FROM src src2 SELECT src2.key AS c3, src2.value AS c4 WHERE src2.key > 15 and src2.key < 25
- ) b
- ON (a.c1 = b.c3)
- SELECT a.c1 AS c1, a.c2 AS c2, b.c3 AS c3, b.c4 AS c4
-) c
-SELECT c.c1, c.c2, c.c3, c.c4
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join5.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join5.q
deleted file mode 100644
index 63a38f554a..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join5.q
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM (
- FROM
- (
- FROM src src1 SELECT src1.key AS c1, src1.value AS c2 WHERE src1.key > 10 and src1.key < 20
- ) a
- RIGHT OUTER JOIN
- (
- FROM src src2 SELECT src2.key AS c3, src2.value AS c4 WHERE src2.key > 15 and src2.key < 25
- ) b
- ON (a.c1 = b.c3)
- SELECT a.c1 AS c1, a.c2 AS c2, b.c3 AS c3, b.c4 AS c4
-) c
-SELECT c.c1, c.c2, c.c3, c.c4
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join6.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join6.q
deleted file mode 100644
index 110451cf30..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join6.q
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM (
- FROM
- (
- FROM src src1 SELECT src1.key AS c1, src1.value AS c2 WHERE src1.key > 10 and src1.key < 20
- ) a
- FULL OUTER JOIN
- (
- FROM src src2 SELECT src2.key AS c3, src2.value AS c4 WHERE src2.key > 15 and src2.key < 25
- ) b
- ON (a.c1 = b.c3)
- SELECT a.c1 AS c1, a.c2 AS c2, b.c3 AS c3, b.c4 AS c4
-) c
-SELECT c.c1, c.c2, c.c3, c.c4
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join7.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join7.q
deleted file mode 100644
index 65797b44a2..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join7.q
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM (
- FROM
- (
- FROM src src1 SELECT src1.key AS c1, src1.value AS c2 WHERE src1.key > 10 and src1.key < 20
- ) a
- FULL OUTER JOIN
- (
- FROM src src2 SELECT src2.key AS c3, src2.value AS c4 WHERE src2.key > 15 and src2.key < 25
- ) b
- ON (a.c1 = b.c3)
- LEFT OUTER JOIN
- (
- FROM src src3 SELECT src3.key AS c5, src3.value AS c6 WHERE src3.key > 20 and src3.key < 25
- ) c
- ON (a.c1 = c.c5)
- SELECT a.c1 AS c1, a.c2 AS c2, b.c3 AS c3, b.c4 AS c4, c.c5 AS c5, c.c6 AS c6
-) c
-SELECT c.c1, c.c2, c.c3, c.c4, c.c5, c.c6
-
-
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/join8.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/join8.q
deleted file mode 100644
index d215b07a67..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/join8.q
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM (
- FROM
- (
- FROM src src1 SELECT src1.key AS c1, src1.value AS c2 WHERE src1.key > 10 and src1.key < 20
- ) a
- LEFT OUTER JOIN
- (
- FROM src src2 SELECT src2.key AS c3, src2.value AS c4 WHERE src2.key > 15 and src2.key < 25
- ) b
- ON (a.c1 = b.c3)
- SELECT a.c1 AS c1, a.c2 AS c2, b.c3 AS c3, b.c4 AS c4
-) c
-SELECT c.c1, c.c2, c.c3, c.c4 where c.c3 IS NULL AND c.c1 IS NOT NULL
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample1.q
deleted file mode 100644
index 3a168b999d..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample1.q
+++ /dev/null
@@ -1,5 +0,0 @@
--- no input pruning, no sample filter
-SELECT s.*
-FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
-WHERE s.ds='2008-04-08' and s.hr='11'
-
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample2.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample2.q
deleted file mode 100644
index b505b896fa..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample2.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- input pruning, no sample filter
--- default table sample columns
-INSERT OVERWRITE TABLE dest1 SELECT s.*
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2) s
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample3.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample3.q
deleted file mode 100644
index 42d5a2bbec..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample3.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- sample columns not same as bucket columns
--- no input pruning, sample filter
-INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key, value) s
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample4.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample4.q
deleted file mode 100644
index 7b5ab03380..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample4.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- bucket column is the same as table sample
--- No need for sample filter
-INSERT OVERWRITE TABLE dest1 SELECT s.*
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample5.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample5.q
deleted file mode 100644
index b9b48fdc71..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample5.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- no input pruning, sample filter
-INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample6.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample6.q
deleted file mode 100644
index 0ee026f0f3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample6.q
+++ /dev/null
@@ -1,3 +0,0 @@
--- both input pruning and sample filter
-INSERT OVERWRITE TABLE dest1 SELECT s.*
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample7.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/sample7.q
deleted file mode 100644
index f17ce105c3..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/sample7.q
+++ /dev/null
@@ -1,4 +0,0 @@
--- both input pruning and sample filter
-INSERT OVERWRITE TABLE dest1 SELECT s.*
-FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
-WHERE s.key > 100
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/subq.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/subq.q
deleted file mode 100644
index 6392dbcc43..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/subq.q
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM (
- FROM src select src.* WHERE src.key < 100
-) unioninput
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf1.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/udf1.q
deleted file mode 100644
index 2ecf46e742..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf1.q
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM src SELECT 'a' LIKE '%a%', 'b' LIKE '%a%', 'ab' LIKE '%a%', 'ab' LIKE '%a_',
- '%_' LIKE '\%\_', 'ab' LIKE '\%\_', 'ab' LIKE '_a%', 'ab' LIKE 'a',
- '' RLIKE '.*', 'a' RLIKE '[ab]', '' RLIKE '[ab]', 'hadoop' RLIKE '[a-z]*', 'hadoop' RLIKE 'o*',
- REGEXP_REPLACE('abc', 'b', 'c'), REGEXP_REPLACE('abc', 'z', 'a'), REGEXP_REPLACE('abbbb', 'bb', 'b'), REGEXP_REPLACE('hadoop', '(.)[a-z]*', '$1ive')
- WHERE src.key = 86
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf4.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/udf4.q
deleted file mode 100644
index f3a7598e17..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf4.q
+++ /dev/null
@@ -1 +0,0 @@
-SELECT round(1.0), round(1.5), round(-1.5), floor(1.0), floor(1.5), floor(-1.5), sqrt(1.0), sqrt(-1.0), sqrt(0.0), ceil(1.0), ceil(1.5), ceil(-1.5), ceiling(1.0), rand(3), +3, -3, 1++2, 1+-2, ~1 FROM dest1
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf6.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/udf6.q
deleted file mode 100644
index 65791c41c1..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf6.q
+++ /dev/null
@@ -1 +0,0 @@
-FROM src SELECT CONCAT('a', 'b'), IF(TRUE, 1 ,2)
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf_case.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/udf_case.q
deleted file mode 100644
index 0c86da2198..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf_case.q
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT CASE 1
- WHEN 1 THEN 2
- WHEN 3 THEN 4
- ELSE 5
- END,
- CASE 11
- WHEN 12 THEN 13
- WHEN 14 THEN 15
- END
-FROM src LIMIT 1
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf_when.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/udf_when.q
deleted file mode 100644
index 99ed09990b..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/udf_when.q
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT CASE
- WHEN 1=1 THEN 2
- WHEN 3=5 THEN 4
- ELSE 5
- END,
- CASE
- WHEN 12=11 THEN 13
- WHEN 14=10 THEN 15
- END
-FROM src LIMIT 1
diff --git a/sql/hive/src/test/resources/ql/src/test/queries/positive/union.q b/sql/hive/src/test/resources/ql/src/test/queries/positive/union.q
deleted file mode 100644
index 6a6b9882ae..0000000000
--- a/sql/hive/src/test/resources/ql/src/test/queries/positive/union.q
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM (
- FROM src select src.key, src.value WHERE src.key < 100
- UNION ALL
- FROM src SELECT src.* WHERE src.key > 100
-) unioninput
-INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*