HIVE-17550: Remove unreferenced q.out-s (Zoltan Haindrich, reviewed by Ashutosh 
Chauhan)

Signed-off-by: Zoltan Haindrich <k...@rxd.hu>


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

Branch: refs/heads/master
Commit: 6f5c11357e76d6779bbe87ee78fa6686cbd64a60
Parents: d72121f
Author: Zoltan Haindrich <k...@rxd.hu>
Authored: Thu Sep 21 10:14:06 2017 +0200
Committer: Zoltan Haindrich <k...@rxd.hu>
Committed: Thu Sep 21 10:14:42 2017 +0200

----------------------------------------------------------------------
 .../hive/cli/control/TestDanglingQOuts.java     |   120 +
 .../authorization_uri_import.q.out              |    40 -
 .../results/clientnegative/orc_merge1.q.out     |    75 -
 .../results/clientnegative/orc_merge2.q.out     |    75 -
 .../results/clientnegative/orc_merge3.q.out     |    75 -
 .../results/clientnegative/orc_merge4.q.out     |    87 -
 .../results/clientnegative/orc_merge5.q.out     |    75 -
 .../clientnegative/subquery_shared_alias.q.out  |     1 -
 .../clientpositive/alter_merge_orc.q.out        |   263 -
 .../clientpositive/alter_merge_stats_orc.q.out  |   382 -
 .../clientpositive/authorization_2.q.out        |   667 -
 .../clientpositive/autoColumnStats_1.q.out      |  1379 -
 .../clientpositive/autoColumnStats_2.q.out      |  1500 -
 .../results/clientpositive/auto_join30.q.out    |  2183 --
 .../clientpositive/auto_join_filters.q.out      |   540 -
 .../clientpositive/auto_join_nulls.q.out        |   217 -
 .../clientpositive/auto_smb_mapjoin_14.q.out    |  1792 -
 .../clientpositive/auto_sortmerge_join_16.q.out |   256 -
 .../clientpositive/auto_sortmerge_join_6.q.out  |  1353 -
 .../clientpositive/auto_sortmerge_join_8.q.out  |  1459 -
 .../clientpositive/auto_sortmerge_join_9.q.out  |  4820 ---
 .../test/results/clientpositive/bucket4.q.out   |   467 -
 .../test/results/clientpositive/bucket5.q.out   |   610 -
 .../test/results/clientpositive/bucket6.q.out   |   189 -
 .../results/clientpositive/bucket_groupby.q.out |  1635 -
 .../results/clientpositive/bucket_many.q.out    |   222 -
 .../bucketizedhiveinputformat.q.out             |   116 -
 .../results/clientpositive/bucketmapjoin1.q.out |  1341 -
 .../results/clientpositive/bucketmapjoin2.q.out |  1738 -
 .../results/clientpositive/bucketmapjoin3.q.out |  1168 -
 .../results/clientpositive/bucketmapjoin4.q.out |  1050 -
 .../results/clientpositive/bucketmapjoin6.q.out |   146 -
 .../results/clientpositive/bucketmapjoin7.q.out |   298 -
 .../results/clientpositive/bucketpruning1.q.out |  2282 --
 .../bucketsortoptimize_insert_2.q.out           |  1244 -
 .../bucketsortoptimize_insert_6.q.out           |  1323 -
 .../bucketsortoptimize_insert_7.q.out           |   468 -
 .../test/results/clientpositive/cbo_gby.q.out   |   124 -
 .../test/results/clientpositive/cbo_join.q.out  | 15028 --------
 .../test/results/clientpositive/cbo_limit.q.out |    90 -
 .../results/clientpositive/cbo_rp_gby.q.out     |   124 -
 .../results/clientpositive/cbo_rp_join.q.out    | 15028 --------
 .../results/clientpositive/cbo_rp_limit.q.out   |    90 -
 .../clientpositive/cbo_rp_lineage2.q.out        |   675 -
 .../clientpositive/cbo_rp_semijoin.q.out        |   440 -
 .../clientpositive/cbo_rp_subq_exists.q.out     |   283 -
 .../results/clientpositive/cbo_rp_subq_in.q.out |   151 -
 .../clientpositive/cbo_rp_subq_not_in.q.out     |   365 -
 .../clientpositive/cbo_rp_udf_udaf.q.out        |   123 -
 .../cbo_rp_udf_udaf_stats_opt.q.out             |   124 -
 .../clientpositive/cbo_rp_unionDistinct_2.q.out |   551 -
 .../results/clientpositive/cbo_rp_views.q.out   |   237 -
 .../clientpositive/cbo_rp_windowing_2.q.out     |  2339 --
 .../results/clientpositive/cbo_semijoin.q.out   |   440 -
 .../results/clientpositive/cbo_subq_in.q.out    |   151 -
 .../clientpositive/cbo_subq_not_in.q.out        |   365 -
 .../results/clientpositive/cbo_udf_udaf.q.out   |   125 -
 .../test/results/clientpositive/cbo_views.q.out |   237 -
 .../test/results/clientpositive/cluster.q.out   |  1449 -
 .../columnStatsUpdateForStatsOptimizer_1.q.out  |   961 -
 .../clientpositive/column_access_stats.q.out    |   869 -
 .../columnstats_part_coltype.q.out              |   441 -
 .../clientpositive/constprog_semijoin.q.out     |   812 -
 .../clientpositive/correlationoptimizer1.q.out  |  3091 --
 .../clientpositive/correlationoptimizer2.q.out  |  2257 --
 .../clientpositive/correlationoptimizer3.q.out  |  1422 -
 .../clientpositive/correlationoptimizer4.q.out  |  1862 -
 .../clientpositive/correlationoptimizer6.q.out  |  3918 ---
 ql/src/test/results/clientpositive/count.q.out  |   752 -
 .../test/results/clientpositive/database.q.out  |  1484 -
 .../disable_merge_for_bucketing.q.out           |   474 -
 .../drop_partition_with_stats.q.out             |   496 -
 .../dynpart_sort_opt_vectorization.q.out        |  2430 --
 .../dynpart_sort_optimization.q.out             |  3041 --
 .../dynpart_sort_optimization2.q.out            |  1750 -
 .../clientpositive/empty_dir_in_table.q.out     |    46 -
 .../test/results/clientpositive/escape1.q.out   |   Bin 54831 -> 0 bytes
 .../test/results/clientpositive/escape2.q.out   |   Bin 78516 -> 0 bytes
 .../clientpositive/exchgpartition2lel.q.out     |   203 -
 ...rnal_table_with_space_in_location_path.q.out |    88 -
 .../extrapolate_part_stats_partial_ndv.q.out    |  1307 -
 .../file_with_header_footer.q.out               |   184 -
 .../results/clientpositive/global_limit.q.out   |  1677 -
 .../test/results/clientpositive/groupby2.q.out  |   130 -
 .../clientpositive/groupby_grouping_id2.q.out   |   234 -
 .../clientpositive/groupby_resolution.q.out     |   792 -
 .../clientpositive/import_exported_table.q.out  |    28 -
 .../infer_bucket_sort_bucketed_table.q.out      |   121 -
 .../results/clientpositive/input16_cc.q.out     |   534 -
 .../clientpositive/insert_dir_distcp.q.out      |    14 -
 .../insert_into_with_schema.q.out               |   348 -
 ql/src/test/results/clientpositive/join1.q.out  |  1143 -
 .../clientpositive/join32_lessSize.q.out        |  2651 --
 .../clientpositive/join_acid_non_acid.q.out     |    54 -
 .../results/clientpositive/join_filters.q.out   |  1484 -
 .../results/clientpositive/join_nulls.q.out     |   652 -
 .../results/clientpositive/join_nullsafe.q.out  |  1589 -
 .../results/clientpositive/lateral_view.q.out   |   900 -
 .../clientpositive/leftsemijoin_mr.q.out        |    98 -
 .../clientpositive/limit_join_transpose.q.out   |  1813 -
 .../results/clientpositive/limit_pushdown.q.out |  1432 -
 .../clientpositive/limit_pushdown3.q.out        |  1407 -
 .../test/results/clientpositive/lineage2.q.out  |   705 -
 .../test/results/clientpositive/lineage3.q.out  |   388 -
 .../clientpositive/list_bucket_dml_10.q.out     |   357 -
 .../llap/acid_vectorization.q.out               |   120 -
 .../llap/acid_vectorization_partition.q.out     |    60 -
 .../llap/acid_vectorization_project.q.out       |    73 -
 .../alter_table_invalidate_column_stats.q.out   |   966 -
 .../clientpositive/llap/cbo_rp_subq_in.q.out    |   123 -
 .../llap/cbo_rp_subq_not_in.q.out               |   345 -
 .../clientpositive/llap/delete_orig_table.q.out |    61 -
 .../clientpositive/llap/explainuser_3.q.out     |   522 -
 .../clientpositive/llap/groupby_sort_1_23.q.out |  4310 ---
 .../llap/groupby_sort_skew_1_23.q.out           |  4482 ---
 .../llap/insert_acid_dynamic_partition.q.out    |    48 -
 .../llap/insert_acid_not_bucketed.q.out         |    36 -
 .../llap/insert_values_acid_not_bucketed.q.out  |    26 -
 .../llap/insert_values_orig_table.q.out         |    80 -
 .../results/clientpositive/llap/join43.q.out    |   616 -
 .../clientpositive/llap/llap_reader.q.out       |   167 -
 ...i_insert_move_tasks_share_dependencies.q.out |  3765 --
 .../results/clientpositive/llap/orc_llap.q.out  |  1205 -
 .../clientpositive/llap/orc_merge12.q.out       |   822 -
 .../llap/orc_vectorization_ppd.q.out            |   288 -
 .../llap/parquet_ppd_decimal.q.out              |   856 -
 .../test/results/clientpositive/llap/pcs.q.out  |  1780 -
 .../clientpositive/llap/script_env_var1.q.out   |    14 -
 .../clientpositive/llap/script_env_var2.q.out   |    14 -
 .../clientpositive/llap/script_pipe.q.out       |   125 -
 .../clientpositive/llap/scriptfile1.q.out       |    59 -
 .../llap/show_create_database.q.out             |    19 -
 .../clientpositive/llap/transform1.q.out        |   138 -
 .../clientpositive/llap/transform2.q.out        |     9 -
 .../clientpositive/llap/transform_ppr1.q.out    |   493 -
 .../clientpositive/llap/transform_ppr2.q.out    |   399 -
 .../clientpositive/llap/union_view.q.out        |  1209 -
 .../clientpositive/llap/update_orig_table.q.out |    62 -
 .../clientpositive/llap/vector_const.q.out      |    64 -
 .../llap/vector_empty_where.q.out               |   676 -
 .../clientpositive/llap/vector_join.q.out       |   104 -
 .../llap/vector_join_part_col_char.q.out        |   173 -
 .../llap/vector_non_constant_in_expr.q.out      |    51 -
 .../llap/vector_non_string_partition.q.out      |   276 -
 .../vector_orc_string_reader_empty_dict.q.out   |    62 -
 .../clientpositive/llap/vector_order_null.q.out |  1382 -
 .../llap/vector_outer_reference_windowed.q.out  |  1435 -
 .../llap/vector_string_decimal.q.out            |   135 -
 .../llap/vector_tablesample_rows.q.out          |   403 -
 .../clientpositive/llap/vector_udf2.q.out       |   188 -
 .../clientpositive/llap/vector_windowing.q.out  |  9768 ------
 .../llap/vector_windowing_expressions.q.out     |  2022 --
 .../llap/vector_windowing_gby.q.out             |   314 -
 .../llap/vector_windowing_gby2.q.out            |  1158 -
 .../vector_windowing_multipartitioning.q.out    | 11587 ------
 .../llap/vector_windowing_order_null.q.out      |  1232 -
 .../vector_windowing_range_multiorder.q.out     | 12584 -------
 .../llap/vector_windowing_rank.q.out            |  1860 -
 .../llap/vector_windowing_streaming.q.out       |  1036 -
 .../llap/vector_windowing_windowspec.q.out      |  2374 --
 .../llap/vector_windowing_windowspec4.q.out     |   223 -
 .../llap/vectorization_div0.q.out               |   615 -
 .../llap/vectorization_limit.q.out              |   942 -
 .../llap/vectorization_offset_limit.q.out       |   187 -
 .../llap/vectorized_mapjoin2.q.out              |   213 -
 .../llap/windowing_windowspec.q.out             |   955 -
 .../clientpositive/llap_partitioned.q.out       |  2003 --
 .../results/clientpositive/load_dyn_part5.q.out |  1033 -
 .../test/results/clientpositive/load_fs2.q.out  |   121 -
 .../load_hdfs_file_with_space_in_the_name.q.out |    25 -
 .../results/clientpositive/metadataonly1.q.out  |  1956 --
 .../clientpositive/min_structvalue.q.out        |    45 -
 .../results/clientpositive/multiMapJoin1.q.out  |  3081 --
 .../results/clientpositive/multiMapJoin2.q.out  |  3464 --
 .../clientpositive/multi_column_in.q.out        |   408 -
 .../clientpositive/multi_column_in_single.q.out |   370 -
 .../results/clientpositive/multi_insert.q.out   |  2749 --
 .../multi_insert_lateral_view.q.out             |  1586 -
 .../clientpositive/non_native_window_udf.q.out  |    52 -
 .../results/clientpositive/offset_limit.q.out   |   276 -
 .../offset_limit_ppd_optimizer.q.out            |  1387 -
 .../clientpositive/optimize_nullscan.q.out      |  2054 --
 .../results/clientpositive/orc_analyze.q.out    |  1544 -
 .../results/clientpositive/orc_create.q.out     |   782 -
 .../test/results/clientpositive/orc_llap.q.out  |  1153 -
 .../clientpositive/orc_llap_nonvector.q.out     |  1302 -
 .../results/clientpositive/orc_merge7.q.out     |   605 -
 .../results/clientpositive/orc_ppd_date.q.out   |   301 -
 .../clientpositive/orc_ppd_decimal.q.out        |   490 -
 .../clientpositive/orc_ppd_schema_evol_3a.q.out |   544 -
 .../clientpositive/orc_ppd_timestamp.q.out      |   292 -
 .../clientpositive/orc_ppd_varchar.q.out        |   220 -
 .../clientpositive/orc_predicate_pushdown.q.out |  1132 -
 .../clientpositive/orc_split_elimination.q.out  |   532 -
 .../results/clientpositive/order_null.q.out     |   210 -
 .../parquet_int96_timestamp.q.out               |   535 -
 .../parquet_predicate_pushdown.q.out            |  1276 -
 .../results/clientpositive/parquet_types.q.out  |   379 -
 .../clientpositive/partition_multilevels.q.out  |  1624 -
 .../clientpositive/partition_pruning.q.out      |   396 -
 .../results/clientpositive/perf/query62.q.out   |   164 -
 .../results/clientpositive/ppd_union_view.q.out |   744 -
 .../results/clientpositive/ppr_pushdown.q.out   |   328 -
 ql/src/test/results/clientpositive/ptf.q.out    |  5014 ---
 .../results/clientpositive/ptf_streaming.q.out  |  2724 --
 .../clientpositive/ql_rewrite_gbtoidx.q.out     |  2531 --
 .../ql_rewrite_gbtoidx_cbo_1.q.out              |  2527 --
 .../ql_rewrite_gbtoidx_cbo_2.q.out              |  3863 --
 .../results/clientpositive/quotedid_smb.q.out   |    81 -
 .../clientpositive/rcfile_createas1.q.out       |   205 -
 .../results/clientpositive/rcfile_merge1.q.out  |  1270 -
 .../results/clientpositive/rcfile_merge2.q.out  |   255 -
 .../results/clientpositive/rcfile_merge3.q.out  |   194 -
 .../results/clientpositive/rcfile_merge4.q.out  |   204 -
 .../clientpositive/reduce_deduplicate.q.out     |   360 -
 .../reduce_deduplicate_extended.q.out           |  4976 ---
 .../results/clientpositive/remote_script.q.out  |    49 -
 .../test/results/clientpositive/sample10.q.out  |   473 -
 .../clientpositive/schema_evol_stats.q.out      |   384 -
 .../clientpositive/schemeAuthority.q.out        |    84 -
 .../clientpositive/schemeAuthority2.q.out       |    53 -
 .../clientpositive/selectDistinctStar.q.out     |  4856 ---
 .../test/results/clientpositive/semijoin.q.out  |  2601 --
 .../results/clientpositive/skewjoinopt15.q.out  |   740 -
 .../results/clientpositive/skiphf_aggr.q.out    |   255 -
 .../results/clientpositive/smb_mapjoin_14.q.out |  1233 -
 .../results/clientpositive/smb_mapjoin_15.q.out |   766 -
 .../results/clientpositive/smb_mapjoin_17.q.out |   674 -
 .../results/clientpositive/smb_mapjoin_18.q.out |   448 -
 .../results/clientpositive/smb_mapjoin_19.q.out |   250 -
 .../results/clientpositive/smb_mapjoin_4.q.out  |   829 -
 .../results/clientpositive/smb_mapjoin_5.q.out  |   829 -
 .../results/clientpositive/smb_mapjoin_6.q.out  |  2719 --
 .../results/clientpositive/smb_mapjoin_8.q.out  |   468 -
 .../clientpositive/spark/auto_join25.q.out      |   116 -
 .../clientpositive/spark/auto_join32.q.out      |   580 -
 .../spark/auto_sortmerge_join_11.q.out          |  1548 -
 .../spark/auto_sortmerge_join_2.q.out           |   644 -
 .../clientpositive/spark/char_join1.q.out       |   153 -
 .../spark/infer_bucket_sort_convert_join.q.out  |   128 -
 .../results/clientpositive/spark/insert1.q.out  |   420 -
 .../results/clientpositive/spark/join40.q.out   |  3846 --
 .../clientpositive/spark/join_empty.q.out       |    56 -
 .../clientpositive/spark/join_filters.q.out     |  1364 -
 .../clientpositive/spark/join_nulls.q.out       |   652 -
 .../clientpositive/spark/mapjoin_hook.q.out     |    61 -
 .../spark/multi_insert_union_src.q.out          |   372 -
 .../spark/multi_insert_with_join2.q.out         |  1006 -
 .../clientpositive/spark/orc_analyze.q.out      |  1038 -
 .../clientpositive/spark/ppd_join4.q.out        |   137 -
 .../spark/ql_rewrite_gbtoidx.q.out              |  2645 --
 .../spark/ql_rewrite_gbtoidx_cbo_1.q.out        |  2641 --
 .../clientpositive/spark/smb_mapjoin9.q.out     |   402 -
 .../spark/sort_merge_join_desc_1.q.out          |   127 -
 .../spark/sort_merge_join_desc_2.q.out          |   133 -
 .../spark/sort_merge_join_desc_3.q.out          |   133 -
 .../spark/sort_merge_join_desc_4.q.out          |   155 -
 .../spark/sort_merge_join_desc_5.q.out          |   262 -
 .../spark/sort_merge_join_desc_6.q.out          |   355 -
 .../spark/sort_merge_join_desc_7.q.out          |   479 -
 .../spark/sort_merge_join_desc_8.q.out          |   283 -
 .../spark/spark_use_file_size_for_mapjoin.q.out |   257 -
 .../clientpositive/spark/transform1.q.out       |   138 -
 .../spark/vector_tablesample_rows.q.out         |   424 -
 .../clientpositive/spark/vectorization_7.q.out  |   480 -
 .../clientpositive/spark/vectorization_8.q.out  |   454 -
 .../spark/vectorized_bucketmapjoin1.q.out       |   375 -
 .../special_character_in_tabnames_1.q.out       | 19607 -----------
 .../test/results/clientpositive/stats11.q.out   |  1291 -
 .../results/clientpositive/subquery_in.q.out    |   956 -
 .../results/clientpositive/subquery_notin.q.out |  1620 -
 .../results/clientpositive/subquery_views.q.out |   595 -
 .../table_access_keys_stats.q.out               |   606 -
 .../clientpositive/table_nonprintable.q.out     |    72 -
 .../results/clientpositive/temp_table.q.out     |   634 -
 .../clientpositive/temp_table_external.q.out    |    34 -
 .../clientpositive/tez/stats_filemetadata.q.out |    54 -
 .../clientpositive/tez/vector_acid3.q.out       |    29 -
 .../tez/vector_adaptor_usage_mode.q.out         |   706 -
 .../clientpositive/tez/vector_aggregate_9.q.out |   201 -
 .../tez/vector_aggregate_without_gby.q.out      |    70 -
 .../tez/vector_auto_smb_mapjoin_14.q.out        |  2314 --
 .../tez/vector_between_columns.q.out            |   365 -
 .../clientpositive/tez/vector_between_in.q.out  |  1691 -
 .../tez/vector_binary_join_groupby.q.out        |   586 -
 .../clientpositive/tez/vector_bround.q.out      |    67 -
 .../clientpositive/tez/vector_bucket.q.out      |   125 -
 .../tez/vector_cast_constant.q.out              |   262 -
 .../clientpositive/tez/vector_char_2.q.out      |   430 -
 .../clientpositive/tez/vector_char_4.q.out      |   198 -
 .../clientpositive/tez/vector_char_cast.q.out   |    33 -
 .../tez/vector_char_mapjoin1.q.out              |   678 -
 .../clientpositive/tez/vector_char_simple.q.out |   311 -
 .../clientpositive/tez/vector_coalesce.q.out    |   601 -
 .../clientpositive/tez/vector_coalesce_2.q.out  |   393 -
 .../tez_join_result_complex.q.out               |  1337 -
 .../results/clientpositive/uber_reduce.q.out    |    31 -
 .../clientpositive/udaf_collect_set_2.q.out     |   742 -
 .../clientpositive/unionDistinct_1.q.out        | 16654 ---------
 .../clientpositive/unionDistinct_2.q.out        |   551 -
 .../clientpositive/union_fast_stats.q.out       |   646 -
 .../clientpositive/union_remove_26.q.out        |   823 -
 .../clientpositive/union_top_level.q.out        |  1396 -
 .../results/clientpositive/varchar_udf1.q.out   |   453 -
 .../vector_adaptor_usage_mode.q.out             |   931 -
 .../vector_auto_smb_mapjoin_14.q.out            |  1805 -
 .../clientpositive/vector_between_in.q.out      |   943 -
 .../clientpositive/vector_complex_all.q.out     |   229 -
 .../clientpositive/vector_count_distinct.q.out  |  1356 -
 .../clientpositive/vector_decimal_2.q.out       |  1458 -
 .../clientpositive/vector_decimal_udf.q.out     |  2638 --
 .../clientpositive/vector_inner_join.q.out      |   851 -
 .../clientpositive/vector_interval_2.q.out      |  1550 -
 .../results/clientpositive/vector_join30.q.out  |  2220 --
 .../clientpositive/vector_join_filters.q.out    |   224 -
 .../clientpositive/vector_join_nulls.q.out      |   197 -
 .../vector_leftsemi_mapjoin.q.out               | 13610 --------
 .../clientpositive/vector_nullsafe_join.q.out   |  1210 -
 .../vector_number_compare_projection.q.out      |   716 -
 .../clientpositive/vector_outer_join5.q.out     |  1308 -
 .../vector_partition_diff_num_cols.q.out        |   579 -
 .../vector_partitioned_date_time.q.out          |  2048 --
 .../clientpositive/vector_ptf_part_simple.q.out |  2895 --
 .../results/clientpositive/vector_udf1.q.out    |  1641 -
 .../clientpositive/vectorization_0.q.out        | 30981 -----------------
 .../vectorization_short_regress.q.out           |  3336 --
 .../vectorized_nested_mapjoin.q.out             |   129 -
 .../clientpositive/vectorized_parquet.q.out     |   333 -
 .../results/clientpositive/vectorized_ptf.q.out |  8440 -----
 .../test/results/clientpositive/windowing.q.out |  2439 --
 .../clientpositive/windowing_windowspec2.q.out  |  3084 --
 331 files changed, 120 insertions(+), 435080 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/itests/util/src/test/java/org/apache/hadoop/hive/cli/control/TestDanglingQOuts.java
----------------------------------------------------------------------
diff --git 
a/itests/util/src/test/java/org/apache/hadoop/hive/cli/control/TestDanglingQOuts.java
 
b/itests/util/src/test/java/org/apache/hadoop/hive/cli/control/TestDanglingQOuts.java
new file mode 100644
index 0000000..e314ffc
--- /dev/null
+++ 
b/itests/util/src/test/java/org/apache/hadoop/hive/cli/control/TestDanglingQOuts.java
@@ -0,0 +1,120 @@
+/**
+ * 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.
+ */
+package org.apache.hadoop.hive.cli.control;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Sets.SetView;
+
+/**
+ * This test ensures that there are no dangling q.out files in the project
+ *
+ * It has a cli functionlity to remove them if there are any.
+ */
+public class TestDanglingQOuts {
+
+  public static class QOutFilter implements FilenameFilter {
+
+    Pattern pattern = Pattern.compile(".*q.out$");
+
+    @Override
+    public boolean accept(File dir, String fileName) {
+      return pattern.matcher(fileName).matches();
+    }
+  }
+
+  public static class Params {
+    @Parameter(names = "--delete", description = "Removes any unreferenced 
q.out")
+    private boolean delete = false;
+
+  }
+
+  private Set<File> outsFound = new HashSet<>();
+  private Map<File, AbstractCliConfig> outsNeeded = new HashMap<>();
+
+  public TestDanglingQOuts() throws Exception {
+
+    for (Class<?> clz : CliConfigs.class.getDeclaredClasses()) {
+      if (clz == CliConfigs.DummyConfig.class) {
+        continue;
+      }
+      AbstractCliConfig config = (AbstractCliConfig) clz.newInstance();
+      Set<File> qfiles = config.getQueryFiles();
+      for (File file : qfiles) {
+        String baseName = file.getName();
+        String rd = config.getResultsDir();
+        File of = new File(rd, baseName + ".out");
+        if (outsNeeded.containsKey(of)) {
+          System.err.printf("duplicate: [%s;%s] %s\n", 
config.getClass().getSimpleName(), 
outsNeeded.get(of).getClass().getSimpleName(), of);
+          // throw new RuntimeException("duplicate?!");
+        }
+        outsNeeded.put(of, config);
+      }
+
+      File od = new File(config.getResultsDir());
+      for (File file : od.listFiles(new QOutFilter())) {
+        outsFound.add(file);
+      }
+    }
+  }
+
+  @Test
+  public void checkDanglingQOut() {
+    SetView<File> dangling = Sets.difference(outsFound, outsNeeded.keySet());
+    assertTrue("dangling qouts: "+dangling,dangling.isEmpty());
+  }
+
+  @Ignore("Seems like there are some from this class as well...")
+  @Test
+  public void checkMissingQOut() {
+    SetView<File> missing = Sets.difference(outsNeeded.keySet(), outsFound);
+    System.out.println(missing);
+    assertTrue(missing.isEmpty());
+  }
+
+  public static void main(String[] args) throws Exception {
+
+    Params params = new Params();
+    new JCommander(params, args);
+
+    TestDanglingQOuts c = new TestDanglingQOuts();
+
+    Set<File> unused = Sets.difference(c.outsFound, c.outsNeeded.keySet());
+
+    for (File file : unused) {
+      System.out.println(file);
+      if (params.delete) {
+        file.delete();
+      }
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/authorization_uri_import.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/authorization_uri_import.q.out 
b/ql/src/test/results/clientnegative/authorization_uri_import.q.out
deleted file mode 100644
index 7ad8023..0000000
--- a/ql/src/test/results/clientnegative/authorization_uri_import.q.out
+++ /dev/null
@@ -1,40 +0,0 @@
-PREHOOK: query: create table import_auth_uri ( dep_id int comment "department 
id")
-       stored as textfile
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@import_auth_uri
-POSTHOOK: query: create table import_auth_uri ( dep_id int comment "department 
id")
-       stored as textfile
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@import_auth_uri
-#### A masked pattern was here ####
-PREHOOK: query: export table import_auth_uri to 
'ql/test/data/exports/import_auth_uri'
-PREHOOK: type: EXPORT
-PREHOOK: Input: default@import_auth_uri
-#### A masked pattern was here ####
-POSTHOOK: query: export table import_auth_uri to 
'ql/test/data/exports/import_auth_uri'
-POSTHOOK: type: EXPORT
-POSTHOOK: Input: default@import_auth_uri
-#### A masked pattern was here ####
-PREHOOK: query: drop table import_auth_uri
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@import_auth_uri
-PREHOOK: Output: default@import_auth_uri
-POSTHOOK: query: drop table import_auth_uri
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@import_auth_uri
-POSTHOOK: Output: default@import_auth_uri
-PREHOOK: query: create database importer
-PREHOOK: type: CREATEDATABASE
-PREHOOK: Output: database:importer
-POSTHOOK: query: create database importer
-POSTHOOK: type: CREATEDATABASE
-POSTHOOK: Output: database:importer
-PREHOOK: query: use importer
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:importer
-POSTHOOK: query: use importer
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:importer
-#### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/orc_merge1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/orc_merge1.q.out 
b/ql/src/test/results/clientnegative/orc_merge1.q.out
deleted file mode 100644
index acf2969..0000000
--- a/ql/src/test/results/clientnegative/orc_merge1.q.out
+++ /dev/null
@@ -1,75 +0,0 @@
-PREHOOK: query: DROP TABLE orcfile_merge
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE orcfile_merge
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@orcfile_merge
-PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) SELECT 
* FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) 
SELECT * FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- will fail because of different compression buffer size
-ALTER TABLE orcfile_merge PARTITION(ds='2008-04-08',part=11) CONCATENATE
-PREHOOK: type: ALTER_PARTITION_MERGE
-PREHOOK: Input: default@orcfile_merge
-PREHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-#### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from 
org.apache.hadoop.hive.ql.exec.DDLTask

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/orc_merge2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/orc_merge2.q.out 
b/ql/src/test/results/clientnegative/orc_merge2.q.out
deleted file mode 100644
index 3775c77..0000000
--- a/ql/src/test/results/clientnegative/orc_merge2.q.out
+++ /dev/null
@@ -1,75 +0,0 @@
-PREHOOK: query: DROP TABLE orcfile_merge
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE orcfile_merge
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@orcfile_merge
-PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) SELECT 
* FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) 
SELECT * FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- will fail because of different compression codec
-ALTER TABLE orcfile_merge PARTITION(ds='2008-04-08',part=11) CONCATENATE
-PREHOOK: type: ALTER_PARTITION_MERGE
-PREHOOK: Input: default@orcfile_merge
-PREHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-#### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from 
org.apache.hadoop.hive.ql.exec.DDLTask

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/orc_merge3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/orc_merge3.q.out 
b/ql/src/test/results/clientnegative/orc_merge3.q.out
deleted file mode 100644
index 592485f..0000000
--- a/ql/src/test/results/clientnegative/orc_merge3.q.out
+++ /dev/null
@@ -1,75 +0,0 @@
-PREHOOK: query: DROP TABLE orcfile_merge
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE orcfile_merge
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@orcfile_merge
-PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) SELECT 
* FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) 
SELECT * FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- will fail because of different row index stride
-ALTER TABLE orcfile_merge PARTITION(ds='2008-04-08',part=11) CONCATENATE
-PREHOOK: type: ALTER_PARTITION_MERGE
-PREHOOK: Input: default@orcfile_merge
-PREHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-#### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from 
org.apache.hadoop.hive.ql.exec.DDLTask

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/orc_merge4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/orc_merge4.q.out 
b/ql/src/test/results/clientnegative/orc_merge4.q.out
deleted file mode 100644
index ba54295..0000000
--- a/ql/src/test/results/clientnegative/orc_merge4.q.out
+++ /dev/null
@@ -1,87 +0,0 @@
-PREHOOK: query: DROP TABLE orcfile_merge
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE orcfile_merge
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@orcfile_merge
-PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) SELECT 
* FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) 
SELECT * FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: ALTER TABLE orcfile_merge ADD COLUMNS (newkey int)
-PREHOOK: type: ALTERTABLE_ADDCOLS
-PREHOOK: Input: default@orcfile_merge
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: ALTER TABLE orcfile_merge ADD COLUMNS (newkey int)
-POSTHOOK: type: ALTERTABLE_ADDCOLS
-POSTHOOK: Input: default@orcfile_merge
-POSTHOOK: Output: default@orcfile_merge
-PREHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT 
key,value,key,ds,hr FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT 
key,value,key,ds,hr FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).newkey 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).newkey 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).newkey 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).newkey 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- will fail because of different column count
-ALTER TABLE orcfile_merge PARTITION(ds='2008-04-08',part=11) CONCATENATE
-PREHOOK: type: ALTER_PARTITION_MERGE
-PREHOOK: Input: default@orcfile_merge
-PREHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-#### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from 
org.apache.hadoop.hive.ql.exec.DDLTask

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/orc_merge5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/orc_merge5.q.out 
b/ql/src/test/results/clientnegative/orc_merge5.q.out
deleted file mode 100644
index a95b424..0000000
--- a/ql/src/test/results/clientnegative/orc_merge5.q.out
+++ /dev/null
@@ -1,75 +0,0 @@
-PREHOOK: query: DROP TABLE orcfile_merge
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE orcfile_merge
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: CREATE TABLE orcfile_merge (key INT, value STRING)
-    PARTITIONED BY (ds STRING, part STRING) STORED AS ORC
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@orcfile_merge
-PREHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) SELECT 
* FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT OVERWRITE TABLE orcfile_merge PARTITION(ds,part) 
SELECT * FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-PREHOOK: type: QUERY
-PREHOOK: Input: default@srcpart
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@orcfile_merge
-POSTHOOK: query: INSERT INTO TABLE orcfile_merge PARTITION(ds,part) SELECT * 
FROM srcpart
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@srcpart
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=12
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=11
-POSTHOOK: Output: default@orcfile_merge@ds=2008-04-09/part=12
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-08,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=11).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).key 
EXPRESSION [(srcpart)srcpart.FieldSchema(name:key, type:string, 
comment:default), ]
-POSTHOOK: Lineage: orcfile_merge PARTITION(ds=2008-04-09,part=12).value SIMPLE 
[(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- will fail because of different write format
-ALTER TABLE orcfile_merge PARTITION(ds='2008-04-08',part=11) CONCATENATE
-PREHOOK: type: ALTER_PARTITION_MERGE
-PREHOOK: Input: default@orcfile_merge
-PREHOOK: Output: default@orcfile_merge@ds=2008-04-08/part=11
-#### A masked pattern was here ####
-FAILED: Execution Error, return code 2 from 
org.apache.hadoop.hive.ql.exec.DDLTask

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientnegative/subquery_shared_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subquery_shared_alias.q.out 
b/ql/src/test/results/clientnegative/subquery_shared_alias.q.out
deleted file mode 100644
index 2d94bef..0000000
--- a/ql/src/test/results/clientnegative/subquery_shared_alias.q.out
+++ /dev/null
@@ -1 +0,0 @@
-FAILED: SemanticException [Error 10249]: Line 5:44 Unsupported SubQuery 
Expression 'key': SubQuery cannot use the table alias: src; this is also an 
alias in the Outer Query and SubQuery contains a unqualified column reference

http://git-wip-us.apache.org/repos/asf/hive/blob/6f5c1135/ql/src/test/results/clientpositive/alter_merge_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_merge_orc.q.out 
b/ql/src/test/results/clientpositive/alter_merge_orc.q.out
deleted file mode 100644
index b5a6d04..0000000
--- a/ql/src/test/results/clientpositive/alter_merge_orc.q.out
+++ /dev/null
@@ -1,263 +0,0 @@
-PREHOOK: query: create table src_orc_merge_test(key int, value string) stored 
as orc
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@src_orc_merge_test
-POSTHOOK: query: create table src_orc_merge_test(key int, value string) stored 
as orc
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@src_orc_merge_test
-PREHOOK: query: insert overwrite table src_orc_merge_test select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@src_orc_merge_test
-POSTHOOK: query: insert overwrite table src_orc_merge_test select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_orc_merge_test
-POSTHOOK: Lineage: src_orc_merge_test.key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: src_orc_merge_test.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert into table src_orc_merge_test select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@src_orc_merge_test
-POSTHOOK: query: insert into table src_orc_merge_test select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_orc_merge_test
-POSTHOOK: Lineage: src_orc_merge_test.key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: src_orc_merge_test.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert into table src_orc_merge_test select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@src_orc_merge_test
-POSTHOOK: query: insert into table src_orc_merge_test select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_orc_merge_test
-POSTHOOK: Lineage: src_orc_merge_test.key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: src_orc_merge_test.value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: show table extended like `src_orc_merge_test`
-PREHOOK: type: SHOW_TABLESTATUS
-POSTHOOK: query: show table extended like `src_orc_merge_test`
-POSTHOOK: type: SHOW_TABLESTATUS
-tableName:src_orc_merge_test
-#### A masked pattern was here ####
-inputformat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-outputformat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-columns:struct columns { i32 key, string value}
-partitioned:false
-partitionColumns:
-totalNumberFiles:3
-totalFileSize:7545
-maxFileSize:2515
-minFileSize:2515
-#### A masked pattern was here ####
-
-PREHOOK: query: select count(1) from src_orc_merge_test
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-POSTHOOK: query: select count(1) from src_orc_merge_test
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-1500
-PREHOOK: query: select sum(hash(key)), sum(hash(value)) from src_orc_merge_test
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-POSTHOOK: query: select sum(hash(key)), sum(hash(value)) from 
src_orc_merge_test
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-390273 108631194210
-PREHOOK: query: alter table src_orc_merge_test concatenate
-PREHOOK: type: ALTER_TABLE_MERGE
-PREHOOK: Input: default@src_orc_merge_test
-PREHOOK: Output: default@src_orc_merge_test
-POSTHOOK: query: alter table src_orc_merge_test concatenate
-POSTHOOK: type: ALTER_TABLE_MERGE
-POSTHOOK: Input: default@src_orc_merge_test
-POSTHOOK: Output: default@src_orc_merge_test
-PREHOOK: query: show table extended like `src_orc_merge_test`
-PREHOOK: type: SHOW_TABLESTATUS
-POSTHOOK: query: show table extended like `src_orc_merge_test`
-POSTHOOK: type: SHOW_TABLESTATUS
-tableName:src_orc_merge_test
-#### A masked pattern was here ####
-inputformat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-outputformat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-columns:struct columns { i32 key, string value}
-partitioned:false
-partitionColumns:
-totalNumberFiles:1
-totalFileSize:7198
-maxFileSize:7198
-minFileSize:7198
-#### A masked pattern was here ####
-
-PREHOOK: query: select count(1) from src_orc_merge_test
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-POSTHOOK: query: select count(1) from src_orc_merge_test
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-1500
-PREHOOK: query: select sum(hash(key)), sum(hash(value)) from src_orc_merge_test
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-POSTHOOK: query: select sum(hash(key)), sum(hash(value)) from 
src_orc_merge_test
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test
-#### A masked pattern was here ####
-390273 108631194210
-PREHOOK: query: create table src_orc_merge_test_part(key int, value string) 
partitioned by (ds string) stored as orc
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@src_orc_merge_test_part
-POSTHOOK: query: create table src_orc_merge_test_part(key int, value string) 
partitioned by (ds string) stored as orc
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@src_orc_merge_test_part
-PREHOOK: query: alter table src_orc_merge_test_part add partition (ds='2011')
-PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@src_orc_merge_test_part
-POSTHOOK: query: alter table src_orc_merge_test_part add partition (ds='2011')
-POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@src_orc_merge_test_part
-POSTHOOK: Output: default@src_orc_merge_test_part@ds=2011
-PREHOOK: query: insert overwrite table src_orc_merge_test_part partition 
(ds='2011') select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: query: insert overwrite table src_orc_merge_test_part partition 
(ds='2011') select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2011).key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2011).value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert into table src_orc_merge_test_part partition 
(ds='2011') select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: query: insert into table src_orc_merge_test_part partition 
(ds='2011') select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2011).key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2011).value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: insert into table src_orc_merge_test_part partition 
(ds='2011') select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: query: insert into table src_orc_merge_test_part partition 
(ds='2011') select * from src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2011).key EXPRESSION 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: src_orc_merge_test_part PARTITION(ds=2011).value SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: show table extended like `src_orc_merge_test_part` partition 
(ds='2011')
-PREHOOK: type: SHOW_TABLESTATUS
-POSTHOOK: query: show table extended like `src_orc_merge_test_part` partition 
(ds='2011')
-POSTHOOK: type: SHOW_TABLESTATUS
-tableName:src_orc_merge_test_part
-#### A masked pattern was here ####
-inputformat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-outputformat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-columns:struct columns { i32 key, string value}
-partitioned:true
-partitionColumns:struct partition_columns { string ds}
-totalNumberFiles:3
-totalFileSize:7545
-maxFileSize:2515
-minFileSize:2515
-#### A masked pattern was here ####
-
-PREHOOK: query: select count(1) from src_orc_merge_test_part
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test_part
-PREHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-POSTHOOK: query: select count(1) from src_orc_merge_test_part
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test_part
-POSTHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-1500
-PREHOOK: query: select sum(hash(key)), sum(hash(value)) from 
src_orc_merge_test_part
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test_part
-PREHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-POSTHOOK: query: select sum(hash(key)), sum(hash(value)) from 
src_orc_merge_test_part
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test_part
-POSTHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-390273 108631194210
-PREHOOK: query: alter table src_orc_merge_test_part partition (ds='2011') 
concatenate
-PREHOOK: type: ALTER_PARTITION_MERGE
-PREHOOK: Input: default@src_orc_merge_test_part
-PREHOOK: Output: default@src_orc_merge_test_part@ds=2011
-POSTHOOK: query: alter table src_orc_merge_test_part partition (ds='2011') 
concatenate
-POSTHOOK: type: ALTER_PARTITION_MERGE
-POSTHOOK: Input: default@src_orc_merge_test_part
-POSTHOOK: Output: default@src_orc_merge_test_part@ds=2011
-PREHOOK: query: show table extended like `src_orc_merge_test_part` partition 
(ds='2011')
-PREHOOK: type: SHOW_TABLESTATUS
-POSTHOOK: query: show table extended like `src_orc_merge_test_part` partition 
(ds='2011')
-POSTHOOK: type: SHOW_TABLESTATUS
-tableName:src_orc_merge_test_part
-#### A masked pattern was here ####
-inputformat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-outputformat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-columns:struct columns { i32 key, string value}
-partitioned:true
-partitionColumns:struct partition_columns { string ds}
-totalNumberFiles:1
-totalFileSize:7198
-maxFileSize:7198
-minFileSize:7198
-#### A masked pattern was here ####
-
-PREHOOK: query: select count(1) from src_orc_merge_test_part
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test_part
-PREHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-POSTHOOK: query: select count(1) from src_orc_merge_test_part
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test_part
-POSTHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-1500
-PREHOOK: query: select sum(hash(key)), sum(hash(value)) from 
src_orc_merge_test_part
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src_orc_merge_test_part
-PREHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-POSTHOOK: query: select sum(hash(key)), sum(hash(value)) from 
src_orc_merge_test_part
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src_orc_merge_test_part
-POSTHOOK: Input: default@src_orc_merge_test_part@ds=2011
-#### A masked pattern was here ####
-390273 108631194210
-PREHOOK: query: drop table src_orc_merge_test
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@src_orc_merge_test
-PREHOOK: Output: default@src_orc_merge_test
-POSTHOOK: query: drop table src_orc_merge_test
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@src_orc_merge_test
-POSTHOOK: Output: default@src_orc_merge_test
-PREHOOK: query: drop table src_orc_merge_test_part
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@src_orc_merge_test_part
-PREHOOK: Output: default@src_orc_merge_test_part
-POSTHOOK: query: drop table src_orc_merge_test_part
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@src_orc_merge_test_part
-POSTHOOK: Output: default@src_orc_merge_test_part

Reply via email to