You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ng...@apache.org on 2023/08/01 13:46:48 UTC
[hive] branch master updated: HIVE-27195:Add database authorization for drop table command (#4304)
This is an automated email from the ASF dual-hosted git repository.
ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 53104f07211 HIVE-27195:Add database authorization for drop table command (#4304)
53104f07211 is described below
commit 53104f07211139a0597159a1b18a3f2554b0c43f
Author: rtrivedi12 <32...@users.noreply.github.com>
AuthorDate: Tue Aug 1 19:16:41 2023 +0530
HIVE-27195:Add database authorization for drop table command (#4304)
---
.../results/clientpositive/fileformat_base64.q.out | 4 +
.../test/results/clientpositive/serde_regex.q.out | 2 +
.../src/test/results/clientpositive/serde_s3.q.out | 4 +
.../results/clientpositive/serde_typedbytes.q.out | 4 +
.../results/clientpositive/serde_typedbytes2.q.out | 4 +
.../results/clientpositive/serde_typedbytes3.q.out | 4 +
.../results/clientpositive/serde_typedbytes4.q.out | 4 +
.../results/clientpositive/serde_typedbytes5.q.out | 4 +
.../results/clientpositive/serde_typedbytes6.q.out | 12 +
.../clientpositive/serde_typedbytes_null.q.out | 4 +
.../generatehfiles_require_family_path.q.out | 2 +
.../src/test/results/negative/hbase_ddl.q.out | 2 +
.../test/results/positive/external_table_ppd.q.out | 4 +
.../results/positive/hbase_binary_binary.q.out | 4 +
.../hbase_binary_external_table_queries.q.out | 12 +
.../positive/hbase_binary_map_queries.q.out | 36 +++
.../positive/hbase_binary_map_queries_prefix.q.out | 12 +
.../positive/hbase_binary_storage_queries.q.out | 20 ++
.../src/test/results/positive/hbase_bulk.q.out | 8 +
.../src/test/results/positive/hbase_ddl.q.out | 2 +
.../results/positive/hbase_decimal_decimal.q.out | Bin 1872 -> 1941 bytes
.../results/positive/hbase_disable_limitopt.q.out | 4 +
.../test/results/positive/hbase_handler_bulk.q.out | 6 +
.../src/test/results/positive/hbase_joins.q.out | 18 ++
.../results/positive/hbase_null_first_col.q.out | 8 +
.../src/test/results/positive/hbase_ppd_join.q.out | 4 +
.../src/test/results/positive/hbase_queries.q.out | 62 +++++
.../test/results/positive/hbase_timestamp.q.out | 8 +
.../results/positive/hbase_timestamp_format.q.out | 4 +
.../test/results/positive/hbase_viewjoins.q.out | 8 +
.../src/test/results/positive/hbasestats.q.out | 2 +
.../src/test/results/positive/ppd_key_ranges.q.out | 2 +
.../alter_acid_table_to_iceberg_failure.q.out | 2 +
.../alter_managed_table_to_iceberg_failure.q.out | 2 +
...le_stored_as_with_serdeproperties_failure.q.out | 2 +
...le_stored_as_with_tableproperties_failure.q.out | 2 +
.../describe_non_existing_metadata_table.q.out | 2 +
.../results/negative/merge_split_update_off.q.out | 4 +
.../negative/mv_iceberg_orc_timetravel.q.out | 2 +
.../test/results/negative/mv_mixed_sources.q.out | 4 +
.../query_non_existing_metadata_table.q.out | 2 +
...runcate_iceberg_table_with_partition_spec.q.out | 2 +
.../results/negative/update_split_update_off.q.out | 2 +
.../alter_multi_part_table_to_iceberg.q.out | 12 +
.../positive/alter_part_table_to_iceberg.q.out | 12 +
.../results/positive/alter_table_to_iceberg.q.out | 16 ++
.../src/test/results/positive/col_stats.q.out | 8 +
.../results/positive/create_iceberg_table.q.out | 2 +
...create_iceberg_table_stored_as_fileformat.q.out | 18 ++
.../create_iceberg_table_stored_by_iceberg.q.out | 2 +
...le_stored_by_iceberg_with_serdeproperties.q.out | 2 +
.../test/results/positive/delete_all_iceberg.q.out | 2 +
.../positive/delete_iceberg_partitioned_avro.q.out | 6 +
.../positive/delete_iceberg_partitioned_orc.q.out | 6 +
.../delete_iceberg_partitioned_parquet.q.out | 6 +
.../delete_iceberg_unpartitioned_parquet.q.out | 6 +
.../describe_iceberg_metadata_tables.q.out | 4 +
.../results/positive/describe_iceberg_table.q.out | 8 +
.../positive/dynamic_partition_pruning.q.out | 12 +
.../positive/dynamic_partition_writes.q.out | 10 +
.../positive/dynamic_semijoin_reduction.q.out | 4 +
.../results/positive/iceberg_copy_on_write.q.out | 2 +
.../results/positive/iceberg_merge_schema.q.out | 4 +
.../src/test/results/positive/iceberg_stats.q.out | 4 +
.../test/results/positive/iceberg_v2_deletes.q.out | 4 +
.../positive/llap/llap_iceberg_read_orc.q.out | 12 +
.../positive/llap/llap_iceberg_read_parquet.q.out | 6 +
.../llap/vectorized_iceberg_read_mixed.q.out | 8 +
.../llap/vectorized_iceberg_read_orc.q.out | 10 +
.../llap/vectorized_iceberg_read_parquet.q.out | 10 +
.../src/test/results/positive/mv_iceberg_orc.q.out | 4 +
.../test/results/positive/mv_iceberg_orc2.q.out | 2 +
.../test/results/positive/mv_iceberg_orc3.q.out | 2 +
.../test/results/positive/mv_iceberg_orc4.q.out | 2 +
.../test/results/positive/mv_iceberg_orc5.q.out | 2 +
.../test/results/positive/mv_iceberg_orc6.q.out | 2 +
.../test/results/positive/mv_iceberg_orc7.q.out | 2 +
.../positive/mv_iceberg_partitioned_orc.q.out | 2 +
.../positive/mv_iceberg_partitioned_orc2.q.out | 2 +
.../test/results/positive/puffin_col_stats.q.out | 2 +
...ery_iceberg_metadata_of_partitioned_table.q.out | 8 +
...y_iceberg_metadata_of_unpartitioned_table.q.out | Bin 39832 -> 39970 bytes
.../query_iceberg_metadata_with_joins.q.out | 4 +
.../test/results/positive/query_iceberg_tag.q.out | 2 +
.../positive/query_iceberg_virtualcol.q.out | 2 +
.../results/positive/rollback_iceberg_table.q.out | 2 +
.../src/test/results/positive/row_count.q.out | 2 +
.../positive/show_create_iceberg_table.q.out | 10 +
.../positive/show_iceberg_materialized_views.q.out | 10 +
.../positive/truncate_force_iceberg_table.q.out | 4 +
.../results/positive/truncate_iceberg_table.q.out | 4 +
.../truncate_partitioned_iceberg_table.q.out | 4 +
.../positive/update_iceberg_partitioned_avro.q.out | 6 +
.../positive/update_iceberg_partitioned_orc.q.out | 6 +
.../update_iceberg_partitioned_parquet.q.out | 6 +
.../update_iceberg_unpartitioned_parquet.q.out | 6 +
.../positive/use_basic_stats_from_iceberg.q.out | 12 +
.../positive/vectorized_iceberg_merge_mixed.q.out | 4 +
.../positive/vectorized_iceberg_read_mixed.q.out | 8 +
.../positive/vectorized_iceberg_read_orc.q.out | 10 +
.../positive/vectorized_iceberg_read_parquet.q.out | 10 +
.../results/positive/write_iceberg_branch.q.out | 4 +
.../clientnegative/select_dropped_table.q.out | 2 +
.../src/test/results/clientpositive/buckets.q.out | 4 +
.../results/clientpositive/create_database.q.out | 8 +
.../test/results/clientpositive/create_like.q.out | 6 +
.../ctas_blobstore_to_blobstore.q.out | 4 +
.../clientpositive/ctas_blobstore_to_hdfs.q.out | 4 +
.../clientpositive/ctas_hdfs_to_blobstore.q.out | 4 +
.../src/test/results/clientpositive/explain.q.out | 2 +
.../src/test/results/clientpositive/having.q.out | 2 +
...mport_addpartition_blobstore_to_blobstore.q.out | 4 +
.../import_addpartition_blobstore_to_local.q.out | 4 +
...mport_addpartition_blobstore_to_warehouse.q.out | 4 +
.../import_addpartition_local_to_blobstore.q.out | 4 +
.../import_blobstore_to_blobstore.q.out | 4 +
.../import_blobstore_to_blobstore_nonpart.q.out | 4 +
.../clientpositive/import_blobstore_to_local.q.out | 4 +
.../import_blobstore_to_warehouse.q.out | 4 +
.../import_blobstore_to_warehouse_nonpart.q.out | 4 +
.../clientpositive/import_local_to_blobstore.q.out | 4 +
.../insert_blobstore_to_blobstore.q.out | 4 +
.../insert_empty_into_blobstore.q.out | 6 +
.../insert_into_dynamic_partitions.q.out | 8 +
.../results/clientpositive/insert_into_table.q.out | 4 +
.../insert_overwrite_directory.q.out | 2 +
.../insert_overwrite_dynamic_partitions.q.out | 8 +
...t_overwrite_dynamic_partitions_merge_move.q.out | 4 +
...t_overwrite_dynamic_partitions_merge_only.q.out | 4 +
...rt_overwrite_dynamic_partitions_move_only.q.out | 4 +
.../clientpositive/insert_overwrite_table.q.out | 4 +
.../src/test/results/clientpositive/join.q.out | 8 +
.../src/test/results/clientpositive/join2.q.out | 2 +
.../test/results/clientpositive/load_data.q.out | 2 +
.../src/test/results/clientpositive/map_join.q.out | 4 +
.../clientpositive/map_join_on_filter.q.out | 2 +
.../test/results/clientpositive/multiple_agg.q.out | 2 +
.../test/results/clientpositive/multiple_db.q.out | 8 +
.../results/clientpositive/nested_outer_join.q.out | 2 +
.../test/results/clientpositive/orc_buckets.q.out | 4 +
.../clientpositive/orc_format_nonpart.q.out | 4 +
.../results/clientpositive/orc_format_part.q.out | 4 +
.../clientpositive/orc_nonstd_partitions_loc.q.out | 4 +
.../results/clientpositive/parquet_buckets.q.out | 4 +
.../clientpositive/parquet_format_nonpart.q.out | 4 +
.../clientpositive/parquet_format_part.q.out | 4 +
.../parquet_nonstd_partitions_loc.q.out | 4 +
.../clientpositive/ptf_general_queries.q.out | 2 +
.../results/clientpositive/ptf_matchpath.q.out | 2 +
.../test/results/clientpositive/ptf_orcfile.q.out | 2 +
.../results/clientpositive/ptf_parquetfile.q.out | 2 +
.../results/clientpositive/ptf_persistence.q.out | 2 +
.../test/results/clientpositive/ptf_rcfile.q.out | 2 +
.../test/results/clientpositive/ptf_seqfile.q.out | 2 +
.../results/clientpositive/rcfile_buckets.q.out | 4 +
.../clientpositive/rcfile_format_nonpart.q.out | 4 +
.../clientpositive/rcfile_format_part.q.out | 4 +
.../rcfile_nonstd_partitions_loc.q.out | 4 +
.../write_final_output_blobstore.q.out | 8 +
.../clientpositive/zero_rows_blobstore.q.out | 4 +
.../results/clientpositive/zero_rows_hdfs.q.out | 4 +
.../results/positive/kudu_complex_queries.q.out | 2 +
.../src/test/results/positive/kudu_queries.q.out | 8 +
.../hive/ql/ddl/table/drop/DropTableAnalyzer.java | 11 +-
.../hadoop/hive/ql/lockmgr/TestDbTxnManager2.java | 16 +-
.../authorization_droptable_fail_1.q | 9 +
.../authorization_droptable_fail_10.q | 11 +
.../authorization_droptable_fail_11.q | 12 +
.../authorization_droptable_fail_2.q | 9 +
.../authorization_droptable_fail_3.q | 9 +
.../authorization_droptable_fail_4.q | 9 +
.../authorization_droptable_fail_5.q | 9 +
.../authorization_droptable_fail_6.q | 9 +
.../authorization_droptable_fail_7.q | 11 +
.../authorization_droptable_fail_8.q | 11 +
.../authorization_droptable_fail_9.q | 11 +
.../alter_rename_partition_authorization.q | 1 +
.../test/queries/clientpositive/authorization_4.q | 1 +
.../clientpositive/authorization_drop_table.q | 89 +++++++
.../test/queries/clientpositive/encryption_ctas.q | 3 +-
...alter_table_non_partitioned_table_cascade.q.out | 2 +
.../clientnegative/alter_table_wrong_regex.q.out | 2 +
ql/src/test/results/clientnegative/archive2.q.out | 2 +
.../results/clientnegative/archive_corrupt.q.out | 2 +
.../results/clientnegative/archive_multi2.q.out | 2 +
.../authorization_droptable_fail_1.q.out | 7 +
.../authorization_droptable_fail_10.q.out | 21 ++
.../authorization_droptable_fail_11.q.out | 11 +
.../authorization_droptable_fail_2.q.out | 7 +
.../authorization_droptable_fail_3.q.out | 9 +
.../authorization_droptable_fail_4.q.out | 9 +
.../authorization_droptable_fail_5.q.out | 9 +
.../authorization_droptable_fail_6.q.out | 9 +
.../authorization_droptable_fail_7.q.out | 21 ++
.../authorization_droptable_fail_8.q.out | 21 ++
.../authorization_droptable_fail_9.q.out | 21 ++
.../clientnegative/authorization_import.q.out | 2 +
.../authorization_sba_drop_table.q.out | 1 +
.../test/results/clientnegative/avro_decimal.q.out | 2 +
.../results/clientnegative/avro_decimal1.q.out | 2 +
.../results/clientnegative/avro_decimal2.q.out | 2 +
.../clientnegative/avro_non_nullable_union.q.out | 4 +
.../results/clientnegative/column_rename1.q.out | 2 +
.../results/clientnegative/column_rename2.q.out | 2 +
.../results/clientnegative/column_rename4.q.out | 2 +
.../columnstats_partlvl_dp_lowercase.q.out | 2 +
.../columnstats_partlvl_invalid_values.q.out | 2 +
...mnstats_partlvl_invalid_values_autogather.q.out | 2 +
.../columnstats_partlvl_multiple_part_clause.q.out | 2 +
.../clientnegative/columnstats_tbllvl.q.out | 2 +
.../columnstats_tbllvl_complex_type.q.out | 2 +
.../columnstats_tbllvl_incorrect_column.q.out | 2 +
.../clientnegative/create_table_wrong_regex.q.out | 2 +
.../test/results/clientnegative/ctasnullcol.q.out | 2 +
.../clientnegative/dbtxnmgr_notablelock.q.out | 2 +
.../clientnegative/dbtxnmgr_notableunlock.q.out | 2 +
.../results/clientnegative/decimal_precision.q.out | 2 +
.../clientnegative/decimal_precision_1.q.out | 2 +
.../distinct_windowing_failure1.q.out | 2 +
.../distinct_windowing_failure2.q.out | 2 +
.../clientnegative/drop_table_failure1.q.out | 2 +-
.../clientnegative/drop_table_failure2.q.out | 1 +
.../clientnegative/drop_table_used_by_mv.q.out | 1 +
.../clientnegative/drop_table_used_by_mv2.q.out | 1 +
...xchange_partition_neg_with_fullacid_table.q.out | 4 +
.../exim_01_nonpart_over_loaded.q.out | 2 +
.../exim_02_all_part_over_overlap.q.out | 2 +
.../exim_03_nonpart_noncompat_colschema.q.out | 2 +
.../exim_04_nonpart_noncompat_colnumber.q.out | 2 +
.../exim_05_nonpart_noncompat_coltype.q.out | 2 +
.../exim_06_nonpart_noncompat_storage.q.out | 2 +
.../exim_07_nonpart_noncompat_ifof.q.out | 2 +
.../exim_08_nonpart_noncompat_serde.q.out | 2 +
.../exim_09_nonpart_noncompat_serdeparam.q.out | 2 +
.../exim_10_nonpart_noncompat_bucketing.q.out | 2 +
.../exim_11_nonpart_noncompat_sorting.q.out | 2 +
.../clientnegative/exim_13_nonnative_import.q.out | 2 +
.../clientnegative/exim_14_nonpart_part.q.out | 2 +
.../clientnegative/exim_15_part_nonpart.q.out | 2 +
.../exim_16_part_noncompat_schema.q.out | 2 +
.../exim_17_part_spec_underspec.q.out | 2 +
.../clientnegative/exim_18_part_spec_missing.q.out | 2 +
.../exim_19_external_over_existing.q.out | 2 +
.../exim_20_managed_location_over_existing.q.out | 2 +
.../exim_21_part_managed_external.q.out | 2 +
.../exim_23_import_exist_authfail.q.out | 2 +
.../exim_24_import_part_authfail.q.out | 2 +
.../exim_25_import_nonexist_authfail.q.out | 2 +
.../test/results/clientnegative/insert_into1.q.out | 2 +
.../test/results/clientnegative/insert_into2.q.out | 2 +
.../test/results/clientnegative/insert_into3.q.out | 2 +
.../test/results/clientnegative/insert_into4.q.out | 2 +
.../test/results/clientnegative/insert_into5.q.out | 2 +
.../test/results/clientnegative/insert_into6.q.out | 2 +
.../clientnegative/invalid_char_length_1.q.out | 2 +
.../clientnegative/invalid_char_length_3.q.out | 2 +
.../clientnegative/invalid_varchar_length_1.q.out | 2 +
.../clientnegative/invalid_varchar_length_3.q.out | 2 +
ql/src/test/results/clientnegative/lockneg1.q.out | 2 +
ql/src/test/results/clientnegative/lockneg2.q.out | 2 +
ql/src/test/results/clientnegative/lockneg3.q.out | 2 +
ql/src/test/results/clientnegative/lockneg4.q.out | 2 +
ql/src/test/results/clientnegative/lockneg5.q.out | 2 +
.../test/results/clientnegative/mm_convert.q.out | 2 +
ql/src/test/results/clientnegative/mm_delete.q.out | 2 +
ql/src/test/results/clientnegative/mm_update.q.out | 2 +
.../results/clientnegative/msck_repair_1.q.out | 2 +
.../results/clientnegative/msck_repair_2.q.out | 2 +
.../results/clientnegative/msck_repair_3.q.out | 2 +
.../results/clientnegative/msck_repair_4.q.out | 2 +
.../results/clientnegative/msck_repair_5.q.out | 2 +
.../results/clientnegative/msck_repair_6.q.out | 2 +
.../results/clientnegative/recursive_view.q.out | 2 +
ql/src/test/results/clientnegative/txnprops.q.out | 2 +
.../clientnegative/udf_sort_array_by_wrong3.q.out | 2 +
.../clientpositive/archive_excludeHadoop20.q.out | 8 +
.../beeline/colstats_all_nulls.q.out | 4 +
.../beeline/create_merge_compressed.q.out | 4 +
.../beeline/drop_with_concurrency.q.out | 4 +
.../insert_overwrite_local_directory_1.q.out | 6 +
.../beeline/udf_unix_timestamp.q.out | 2 +
.../results/clientpositive/bucket_map_join_1.q.out | 4 +
.../results/clientpositive/bucket_map_join_2.q.out | 4 +
.../clientpositive/bucketmapjoin_negative3.q.out | 8 +
.../encrypted/encryption_auto_purge_tables.q.out | 12 +
.../clientpositive/encrypted/encryption_ctas.q.out | 10 +-
.../encrypted/encryption_drop_partition.q.out | 6 +
.../encrypted/encryption_drop_table.q.out | 14 +
.../encryption_drop_table_in_encrypted_db.q.out | 4 +
.../encrypted/encryption_drop_view.q.out | 2 +
.../encryption_insert_partition_dynamic.q.out | 8 +
.../encryption_insert_partition_static.q.out | 8 +
.../encrypted/encryption_insert_values.q.out | 2 +
.../encryption_join_unencrypted_tbl.q.out | 4 +
...ption_join_with_different_encryption_keys.q.out | 8 +
.../encryption_load_data_to_encrypted_tables.q.out | 4 +
.../encrypted/encryption_move_tbl.q.out | 10 +
...encryption_select_read_only_encrypted_tbl.q.out | 4 +
...cryption_select_read_only_unencrypted_tbl.q.out | 4 +
...ption_unencrypted_nonhdfs_external_tables.q.out | 4 +
.../erasurecoding/erasure_simple.q.out | 2 +
.../results/clientpositive/hook_context_cs.q.out | 2 +
.../results/clientpositive/list_bucket_dml_8.q.out | 2 +
.../llap/acid_bloom_filter_orc_file_dump.q.out | 2 +
.../llap/acid_direct_insert_insert_overwrite.q.out | 42 +++
.../llap/acid_direct_update_delete.q.out | 4 +
.../acid_direct_update_delete_partitions.q.out | 12 +
.../acid_direct_update_delete_with_merge.q.out | 8 +
.../clientpositive/llap/acid_globallimit.q.out | 2 +
.../llap/acid_insert_overwrite.q.out | 16 ++
.../llap/acid_insert_overwrite_update.q.out | 4 +
.../clientpositive/llap/acid_locking_ctas.q.out | 6 +
.../results/clientpositive/llap/acid_mapjoin.q.out | 8 +
.../llap/acid_multiinsert_dyn_part.q.out | 32 +++
.../llap/acid_multiinsert_static_parts.q.out | 8 +
.../clientpositive/llap/acid_no_buckets.q.out | 16 ++
.../results/clientpositive/llap/acid_stats.q.out | 2 +
.../results/clientpositive/llap/acid_stats3.q.out | 4 +
.../results/clientpositive/llap/acid_stats4.q.out | 4 +
.../results/clientpositive/llap/acid_stats5.q.out | 2 +
.../clientpositive/llap/acid_subquery.q.out | 12 +
.../clientpositive/llap/acid_table_stats.q.out | 4 +
.../llap/acid_vectorization_missing_cols.q.out | 4 +
.../clientpositive/llap/acid_view_delete.q.out | 4 +
.../clientpositive/llap/add_part_exist.q.out | 4 +
.../test/results/clientpositive/llap/alter1.q.out | 4 +
.../test/results/clientpositive/llap/alter2.q.out | 8 +
.../test/results/clientpositive/llap/alter3.q.out | 6 +
.../test/results/clientpositive/llap/alter4.q.out | 4 +
.../test/results/clientpositive/llap/alter5.q.out | 4 +
.../clientpositive/llap/alterColumnStats.q.out | 2 +
.../clientpositive/llap/alterColumnStatsPart.q.out | 2 +
.../results/clientpositive/llap/alter_char1.q.out | 2 +
.../results/clientpositive/llap/alter_char2.q.out | 2 +
.../clientpositive/llap/alter_file_format.q.out | 4 +
.../results/clientpositive/llap/alter_merge.q.out | 4 +
.../clientpositive/llap/alter_merge_2.q.out | 2 +
.../clientpositive/llap/alter_merge_2_orc.q.out | 2 +
.../clientpositive/llap/alter_merge_3.q.out | 2 +
.../clientpositive/llap/alter_merge_orc.q.out | 4 +
.../clientpositive/llap/alter_merge_stats.q.out | 4 +
.../llap/alter_merge_stats_orc.q.out | 4 +
.../llap/alter_partition_change_col.q.out | 2 +
.../llap/alter_partition_clusterby_sortby.q.out | 2 +
.../llap/alter_partition_coltype.q.out | 4 +
.../llap/alter_partition_format_loc.q.out | 4 +
.../llap/alter_partition_onto_nocurrent_db.q.out | 2 +
.../llap/alter_rename_partition.q.out | 8 +
.../alter_rename_partition_authorization.q.out | 6 +
.../clientpositive/llap/alter_skewed_table.q.out | 6 +
.../clientpositive/llap/alter_table_cascade.q.out | 6 +
.../llap/alter_table_column_stats.q.out | 8 +
.../clientpositive/llap/alter_table_location.q.out | 2 +
.../llap/alter_table_not_sorted.q.out | 2 +
.../llap/alter_table_partition_drop.q.out | 2 +
.../clientpositive/llap/alter_table_serde.q.out | 4 +
.../llap/alter_table_stats_status.q.out | 4 +
.../clientpositive/llap/alter_varchar1.q.out | 2 +
.../clientpositive/llap/alter_varchar2.q.out | 2 +
.../clientpositive/llap/alter_view_rename.q.out | 2 +
.../results/clientpositive/llap/analyze_npe.q.out | 12 +
.../llap/analyze_table_null_partition.q.out | 8 +
.../llap/annotate_stats_groupby.q.out | 4 +
.../llap/annotate_stats_groupby2.q.out | 4 +
.../llap/annotate_stats_join_pkfk.q.out | 14 +
.../llap/annotate_stats_lateral_view_join.q.out | 2 +
.../clientpositive/llap/annotate_stats_udtf.q.out | 2 +
.../results/clientpositive/llap/antijoin2.q.out | 6 +
.../clientpositive/llap/antijoin_conversion.q.out | 4 +
.../clientpositive/llap/authorization_2.q.out | 2 +
.../clientpositive/llap/authorization_4.q.out | 6 +
.../clientpositive/llap/authorization_6.q.out | 2 +
.../clientpositive/llap/authorization_7.q.out | 4 +
.../clientpositive/llap/authorization_9.q.out | 3 +
.../llap/authorization_admin_almighty1.q.out | 2 +
.../llap/authorization_admin_almighty2.q.out | 2 +
.../llap/authorization_cli_nonsql.q.out | 2 +
.../llap/authorization_create_temp_table.q.out | 2 +
.../llap/authorization_drop_table.q.out | 194 ++++++++++++++
.../llap/authorization_functions_in_views.q.out | 4 +
.../clientpositive/llap/authorization_non_id.q.out | 4 +
.../llap/authorization_owner_actions.q.out | 2 +
.../llap/authorization_privilege_objects.q.out | 6 +
.../llap/authorization_show_grant.q.out | 1 +
.../clientpositive/llap/autoColumnStats_1.q.out | 34 +++
.../clientpositive/llap/autoColumnStats_10.q.out | 4 +
.../clientpositive/llap/autoColumnStats_2.q.out | 34 +++
.../clientpositive/llap/autoColumnStats_3.q.out | 4 +
.../clientpositive/llap/autoColumnStats_6.q.out | 4 +
.../clientpositive/llap/autoColumnStats_7.q.out | 4 +
.../results/clientpositive/llap/auto_join32.q.out | 12 +
.../llap/auto_join_reordering_values.q.out | 4 +
.../clientpositive/llap/auto_smb_mapjoin_14.q.out | 2 +
.../llap/auto_sortmerge_join_16.q.out | 4 +
.../clientpositive/llap/avro_charvarchar.q.out | 4 +
.../clientpositive/llap/avro_comments.q.out | 24 ++
.../results/clientpositive/llap/avro_date.q.out | 6 +
.../results/clientpositive/llap/avro_decimal.q.out | 14 +
.../clientpositive/llap/avro_decimal_native.q.out | 12 +
.../clientpositive/llap/avro_decimal_old.q.out | 4 +
.../llap/avro_deserialize_map_null.q.out | 4 +
.../llap/avro_extschema_insert.q.out | 4 +
.../llap/avro_hybrid_mixed_date.q.out | 2 +
.../llap/avro_hybrid_mixed_timestamp.q.out | 2 +
.../llap/avro_legacy_mixed_date.q.out | 2 +
.../llap/avro_legacy_mixed_timestamp.q.out | 2 +
.../clientpositive/llap/avro_nullable_union.q.out | 16 ++
.../llap/avro_proleptic_mixed_date.q.out | 2 +
.../llap/avro_proleptic_mixed_timestamp.q.out | 2 +
.../clientpositive/llap/avro_timestamp.q.out | 6 +
.../clientpositive/llap/avro_timestamp2.q.out | 2 +
.../clientpositive/llap/avro_type_evolution.q.out | 4 +
.../clientpositive/llap/avrocountemptytbl.q.out | 2 +
.../results/clientpositive/llap/avrotblsjoin.q.out | 4 +
.../results/clientpositive/llap/ba_table1.q.out | 4 +
.../results/clientpositive/llap/ba_table2.q.out | 4 +
.../results/clientpositive/llap/ba_table3.q.out | 4 +
.../clientpositive/llap/ba_table_union.q.out | 4 +
.../llap/binary_table_bincolserde.q.out | 4 +
.../llap/binary_table_colserde.q.out | 4 +
.../results/clientpositive/llap/bool_literal.q.out | 4 +
.../clientpositive/llap/bucket_groupby.q.out | 4 +
.../clientpositive/llap/bucket_num_reducers.q.out | 2 +
.../clientpositive/llap/bucket_num_reducers2.q.out | 2 +
.../llap/bucket_num_reducers_acid.q.out | 3 +
.../llap/bucket_num_reducers_acid2.q.out | 4 +
.../llap/bucketsortoptimize_insert_4.q.out | 4 +
.../llap/cardinality_preserving_join_opt2.q.out | 12 +
.../clientpositive/llap/cast_on_constant.q.out | 2 +
.../llap/cast_tinyint_to_double.q.out | 2 +
.../results/clientpositive/llap/cbo_no_stats.q.out | 6 +
.../test/results/clientpositive/llap/char_1.q.out | 8 +
.../test/results/clientpositive/llap/char_2.q.out | 4 +
.../results/clientpositive/llap/char_join1.q.out | 12 +
.../clientpositive/llap/char_nested_types.q.out | 24 ++
.../results/clientpositive/llap/char_serde.q.out | 24 ++
.../results/clientpositive/llap/char_udf1.q.out | 4 +
.../results/clientpositive/llap/char_union1.q.out | 12 +
.../clientpositive/llap/char_varchar_udf.q.out | 4 +
.../clientpositive/llap/check_constraint.q.out | 32 +++
.../results/clientpositive/llap/clusterctas.q.out | 2 +
.../clientpositive/llap/cmdwithcomments.q.out | 2 +
.../results/clientpositive/llap/cmv_direct.q.out | 4 +
.../llap/cmv_direct_with_specified_locations.q.out | 4 +
.../llap/cmv_direct_with_suffixed_locations.q.out | 4 +
.../results/clientpositive/llap/collision.q.out | 4 +
.../columnStatsUpdateForStatsOptimizer_1.q.out | 2 +
.../columnStatsUpdateForStatsOptimizer_2.q.out | 2 +
.../llap/column_name_is_table_alias.q.out | 4 +
.../clientpositive/llap/column_table_stats.q.out | 8 +
.../llap/column_table_stats_orc.q.out | 6 +
.../clientpositive/llap/columnstats_infinity.q.out | 2 +
.../llap/columnstats_part_coltype.q.out | 16 ++
.../clientpositive/llap/columnstats_partlvl.q.out | 2 +
.../llap/columnstats_partlvl_dp.q.out | 4 +
.../clientpositive/llap/columnstats_quoting.q.out | 2 +
.../clientpositive/llap/columnstats_tbllvl.q.out | 4 +
.../results/clientpositive/llap/combine3.q.out | 8 +
.../clientpositive/llap/comma_in_column_name.q.out | 2 +
.../llap/compaction_query_based.q.out | 2 +
.../llap/compaction_query_based_clustered.q.out | 2 +
.../compaction_query_based_clustered_minor.q.out | 2 +
.../llap/compaction_query_based_insert_only.q.out | 2 +
...paction_query_based_insert_only_clustered.q.out | 2 +
...n_query_based_insert_only_clustered_minor.q.out | 2 +
.../compaction_query_based_insert_only_minor.q.out | 2 +
...ction_query_based_insert_only_partitioned.q.out | 2 +
...y_based_insert_only_partitioned_clustered.q.out | 2 +
...d_insert_only_partitioned_clustered_minor.q.out | 2 +
...query_based_insert_only_partitioned_minor.q.out | 2 +
.../llap/compaction_query_based_minor.q.out | 2 +
.../llap/compaction_query_based_partitioned.q.out | 2 +
.../compaction_query_based_partitioned_minor.q.out | 2 +
.../clientpositive/llap/compare_cols_null.q.out | 2 +
.../clientpositive/llap/compustat_avro.q.out | 2 +
.../llap/concatenate_inherit_table_location.q.out | 1 +
.../clientpositive/llap/constantPropWhen.q.out | 2 +
.../clientpositive/llap/constant_prop_3.q.out | 6 +
.../llap/constant_prop_join_rs.q.out | 8 +
.../clientpositive/llap/constantfolding.q.out | 4 +
.../clientpositive/llap/constprog_dpp.q.out | 4 +
.../clientpositive/llap/constraints_alter.q.out | 2 +
.../llap/constraints_explain_ddl.q.out | 14 +
.../llap/constraints_optimization.q.out | 18 ++
.../clientpositive/llap/correlated_join_keys.q.out | 4 +
.../test/results/clientpositive/llap/cp_sel.q.out | 2 +
.../llap/create_alter_list_bucketing_table1.q.out | 4 +
.../results/clientpositive/llap/create_like.q.out | 12 +
.../results/clientpositive/llap/create_like2.q.out | 14 +
.../clientpositive/llap/create_like_view.q.out | 12 +
.../llap/create_merge_compressed.q.out | 4 +
.../llap/create_or_replace_view.q.out | 2 +
.../clientpositive/llap/create_skewed_table1.q.out | 6 +
.../llap/create_table_explain_ddl.q.out | 12 +
.../llap/create_table_like_file.q.out | 18 ++
.../llap/create_table_like_file_orc.q.out | 16 ++
.../llap/create_table_like_stats.q.out | 8 +
.../llap/create_transactional_full_acid.q.out | 6 +
.../llap/create_transactional_insert_only.q.out | 2 +
.../results/clientpositive/llap/create_view.q.out | 2 +
.../llap/create_view_partitioned.q.out | 2 +
.../llap/create_with_constraints.q.out | 2 +
.../clientpositive/llap/crtseltbl_serdeprops.q.out | 2 +
.../clientpositive/llap/ct_case_insensitive.q.out | 2 +
.../results/clientpositive/llap/ctas_blob.q.out | 16 ++
.../results/clientpositive/llap/ctas_char.q.out | 8 +
.../results/clientpositive/llap/ctas_date.q.out | 8 +
.../results/clientpositive/llap/ctas_direct.q.out | 52 ++++
.../ctas_direct_with_specified_locations.q.out | 50 ++++
.../llap/ctas_direct_with_suffixed_locations.q.out | 50 ++++
.../llap/ctas_direct_with_transformers.q.out | 112 ++++++++
.../clientpositive/llap/ctas_empty_source.q.out | 4 +
.../results/clientpositive/llap/ctas_varchar.q.out | 8 +
.../test/results/clientpositive/llap/cte_1.q.out | 4 +
.../test/results/clientpositive/llap/cte_2.q.out | 4 +
.../test/results/clientpositive/llap/cte_4.q.out | 4 +
.../results/clientpositive/llap/cte_mat_4.q.out | 2 +
ql/src/test/results/clientpositive/llap/cttl.q.out | 4 +
.../llap/current_date_timestamp.q.out | 4 +
.../results/clientpositive/llap/database.q.out | 8 +
.../test/results/clientpositive/llap/date_1.q.out | 4 +
.../test/results/clientpositive/llap/date_2.q.out | 4 +
.../test/results/clientpositive/llap/date_3.q.out | 4 +
.../test/results/clientpositive/llap/date_4.q.out | 4 +
.../test/results/clientpositive/llap/date_5.q.out | 8 +
.../results/clientpositive/llap/date_join1.q.out | 4 +
.../results/clientpositive/llap/date_serde.q.out | 24 ++
.../clientpositive/llap/date_timestamp_prec.q.out | 2 +
.../results/clientpositive/llap/date_udf.q.out | 14 +
.../clientpositive/llap/dbtxnmgr_compact1.q.out | 4 +
.../clientpositive/llap/dbtxnmgr_compact2.q.out | 2 +
.../clientpositive/llap/dbtxnmgr_compact3.q.out | 4 +
.../clientpositive/llap/dbtxnmgr_ddl1.q.out | 6 +
.../clientpositive/llap/dbtxnmgr_query1.q.out | 4 +
.../clientpositive/llap/dbtxnmgr_query2.q.out | 4 +
.../clientpositive/llap/dbtxnmgr_query3.q.out | 4 +
.../clientpositive/llap/dbtxnmgr_query4.q.out | 4 +
.../clientpositive/llap/dbtxnmgr_query5.q.out | 2 +
.../clientpositive/llap/dbtxnmgr_showlocks.q.out | 2 +
.../results/clientpositive/llap/decimal_1.q.out | 4 +
.../results/clientpositive/llap/decimal_10_0.q.out | 4 +
.../results/clientpositive/llap/decimal_1_1.q.out | 4 +
.../results/clientpositive/llap/decimal_2.q.out | 4 +
.../results/clientpositive/llap/decimal_3.q.out | 4 +
.../results/clientpositive/llap/decimal_4.q.out | 8 +
.../results/clientpositive/llap/decimal_5.q.out | 4 +
.../results/clientpositive/llap/decimal_6.q.out | 6 +
.../clientpositive/llap/decimal_join2.q.out | 8 +
.../clientpositive/llap/decimal_precision.q.out | 6 +
.../clientpositive/llap/decimal_serde.q.out | 16 ++
.../clientpositive/llap/decimal_skewjoin.q.out | 8 +
.../clientpositive/llap/decimal_stats.q.out | 4 +
.../clientpositive/llap/decimal_trailing.q.out | 4 +
.../results/clientpositive/llap/decimal_udf.q.out | 4 +
.../results/clientpositive/llap/decimal_udf2.q.out | 4 +
.../clientpositive/llap/default_constraint.q.out | 18 ++
.../clientpositive/llap/default_file_format.q.out | 24 ++
.../results/clientpositive/llap/delimiter.q.out | 2 +
.../clientpositive/llap/describe_table.q.out | 12 +
.../clientpositive/llap/describe_table_json.q.out | 2 +
.../llap/display_colstats_tbllvl.q.out | 2 +
.../clientpositive/llap/distinct_stats.q.out | 2 +
.../clientpositive/llap/distinct_windowing.q.out | 2 +
.../llap/distinct_windowing_no_cbo.q.out | 2 +
.../clientpositive/llap/dp_counter_mm.q.out | 6 +
.../clientpositive/llap/dp_counter_non_mm.q.out | 6 +
.../llap/drop_deleted_partitions.q.out | 4 +
.../llap/drop_multi_partitions.q.out | 2 +
.../llap/drop_partition_with_stats.q.out | 12 +
.../llap/drop_partitions_filter.q.out | 2 +
.../llap/drop_partitions_filter2.q.out | 2 +
.../llap/drop_partitions_filter3.q.out | 2 +
.../llap/drop_partitions_filter4.q.out | 4 +
.../results/clientpositive/llap/drop_table.q.out | 2 +
.../results/clientpositive/llap/drop_table2.q.out | 4 +
.../clientpositive/llap/drop_table_purge.q.out | 2 +
.../llap/drop_table_removes_partition_dirs.q.out | 2 +
.../llap/drop_table_with_stats.q.out | 12 +
.../llap/dynamic_partition_insert.q.out | 18 ++
.../llap/dynamic_partition_join_noncbo.q.out | 14 +
.../llap/dynamic_partition_pruning.q.out | 10 +
.../llap/dynamic_semijoin_reduction.q.out | 6 +
.../llap/dynamic_semijoin_reduction_2.q.out | 4 +
.../llap/dynamic_semijoin_reduction_3.q.out | 16 ++
.../llap/dynamic_semijoin_reduction_sw.q.out | 6 +
.../llap/dynamic_semijoin_reduction_sw2.q.out | 6 +
.../llap/dynamic_semijoin_user_level.q.out | 6 +
.../results/clientpositive/llap/dynpart_cast.q.out | 2 +
.../llap/dynpart_sort_opt_bucketing.q.out | 16 ++
.../llap/dynpart_sort_optimization.q.out | 6 +
.../llap/dynpart_sort_optimization2.q.out | 20 ++
.../llap/dynpart_sort_optimization_acid.q.out | 10 +
.../llap/empty_files_external_table.q.out | 6 +
.../results/clientpositive/llap/empty_join.q.out | 6 +
.../clientpositive/llap/encoding_nonutf8.q.out | 2 +
.../llap/enforce_constraint_notnull.q.out | 18 ++
.../clientpositive/llap/enforce_order.q.out | 4 +
.../test/results/clientpositive/llap/escape1.q.out | Bin 44401 -> 44677 bytes
.../test/results/clientpositive/llap/escape2.q.out | Bin 60186 -> 60462 bytes
.../test/results/clientpositive/llap/escape3.q.out | 6 +
.../results/clientpositive/llap/escape_crlf.q.out | 4 +
.../llap/estimate_pkfk_filtered_fk.q.out | 8 +
.../llap/estimate_pkfk_fknulls.q.out | 4 +
.../clientpositive/llap/estimate_pkfk_nocond.q.out | 8 +
.../clientpositive/llap/estimate_pkfk_push.q.out | 8 +
.../results/clientpositive/llap/except_all.q.out | 4 +
.../clientpositive/llap/except_distinct.q.out | 4 +
.../clientpositive/llap/exchgpartition2lel.q.out | 8 +
.../llap/exim_00_nonpart_empty.q.out | 4 +
.../clientpositive/llap/exim_01_nonpart.q.out | 4 +
.../llap/exim_02_00_part_empty.q.out | 4 +
.../results/clientpositive/llap/exim_02_part.q.out | 4 +
.../llap/exim_03_nonpart_over_compat.q.out | 4 +
.../clientpositive/llap/exim_04_all_part.q.out | 4 +
.../llap/exim_04_evolved_parts.q.out | 4 +
.../clientpositive/llap/exim_05_some_part.q.out | 4 +
.../clientpositive/llap/exim_06_one_part.q.out | 4 +
.../llap/exim_07_all_part_over_nonoverlap.q.out | 4 +
.../llap/exim_08_nonpart_rename.q.out | 6 +
.../llap/exim_09_part_spec_nonoverlap.q.out | 4 +
.../llap/exim_10_external_managed.q.out | 4 +
.../llap/exim_11_managed_external.q.out | 4 +
.../llap/exim_12_external_location.q.out | 4 +
.../llap/exim_13_managed_location.q.out | 4 +
.../exim_14_managed_location_over_existing.q.out | 4 +
.../llap/exim_15_external_part.q.out | 4 +
.../llap/exim_16_part_external.q.out | 4 +
.../clientpositive/llap/exim_17_part_managed.q.out | 4 +
.../llap/exim_18_part_external.q.out | 4 +
.../llap/exim_19_00_part_external_location.q.out | 4 +
.../llap/exim_19_part_external_location.q.out | 4 +
.../llap/exim_20_part_managed_location.q.out | 4 +
.../llap/exim_21_export_authsuccess.q.out | 2 +
.../llap/exim_22_import_exist_authsuccess.q.out | 4 +
.../llap/exim_23_import_part_authsuccess.q.out | 4 +
.../llap/exim_24_import_nonexist_authsuccess.q.out | 4 +
...port_parentpath_has_inaccessible_children.q.out | 2 +
.../clientpositive/llap/exim_hidden_files.q.out | 4 +
.../results/clientpositive/llap/explain_ddl.q.out | 4 +-
.../clientpositive/llap/explain_locks.q.out | 7 +
.../explainanalyze_acid_with_direct_insert.q.out | 18 ++
.../llap/explaindenpendencydiffengs.q.out | 4 +
.../clientpositive/llap/explainuser_1.q.out | 14 +
.../clientpositive/llap/external_insert.q.out | 2 +
.../clientpositive/llap/external_jdbc_table2.q.out | 6 +
.../clientpositive/llap/external_jdbc_table3.q.out | 4 +
.../clientpositive/llap/external_jdbc_table4.q.out | 6 +
.../llap/external_table_concatenate.q.out | 2 +
.../clientpositive/llap/external_table_purge.q.out | 24 ++
...xternal_table_with_space_in_location_path.q.out | 4 +
.../test/results/clientpositive/llap/extract.q.out | 2 +
.../llap/extrapolate_part_stats_partial_ndv.q.out | 6 +
.../llap/file_with_header_footer.q.out | 6 +
.../llap/filter_cond_pushdown2.q.out | 2 +
.../clientpositive/llap/filter_numeric.q.out | 2 +
.../results/clientpositive/llap/floor_time.q.out | 2 +
.../results/clientpositive/llap/fm-sketch.q.out | 6 +
.../clientpositive/llap/folder_predicate.q.out | 2 +
.../llap/gen_udf_example_add10.q.out | 2 +
.../results/clientpositive/llap/global_limit.q.out | 16 ++
.../results/clientpositive/llap/groupby13.q.out | 2 +
.../clientpositive/llap/groupby_constcolval.q.out | 2 +
.../llap/groupby_distinct_samekey.q.out | 2 +
.../llap/groupby_groupingset_bug.q.out | 6 +
.../llap/groupby_having_distinct.q.out | 2 +
.../llap/groupby_multi_single_reducer.q.out | 10 +
.../llap/groupby_multi_single_reducer2.q.out | 4 +
.../llap/groupby_nocolumnalign.q.out | 2 +
.../clientpositive/llap/groupby_nullvalues.q.out | 4 +
.../results/clientpositive/llap/groupby_ppd.q.out | 2 +
.../clientpositive/llap/groupby_rollup_empty.q.out | 4 +
.../llap/groupby_rollup_empty2.q.out | 4 +
.../clientpositive/llap/groupby_sort_10.q.out | 2 +
.../clientpositive/llap/groupby_sort_5.q.out | 6 +
.../clientpositive/llap/groupby_sort_7.q.out | 2 +
.../clientpositive/llap/groupby_sort_8.q.out | 2 +
.../clientpositive/llap/groupby_sort_9.q.out | 2 +
.../llap/groupingset_high_columns.q.out | 20 ++
.../results/clientpositive/llap/hashjoin.q.out | 4 +
ql/src/test/results/clientpositive/llap/hll.q.out | 6 +
.../llap/hybridgrace_hashjoin_1.q.out | 4 +
.../llap/hypothetical_set_aggregates.q.out | 2 +
.../llap/implicit_cast_during_insert.q.out | 2 +
.../clientpositive/llap/implicit_decimal.q.out | 4 +
.../results/clientpositive/llap/in_coercion.q.out | 2 +
.../clientpositive/llap/infer_const_type.q.out | 4 +
.../clientpositive/llap/infer_join_preds.q.out | 4 +
.../results/clientpositive/llap/innerjoin1.q.out | 4 +
.../test/results/clientpositive/llap/input16.q.out | 2 +
.../results/clientpositive/llap/input16_cc.q.out | 2 +
.../test/results/clientpositive/llap/input2.q.out | 4 +
.../test/results/clientpositive/llap/input43.q.out | 4 +
.../test/results/clientpositive/llap/input49.q.out | 2 +
.../clientpositive/llap/input_lazyserde.q.out | 12 +
.../clientpositive/llap/input_lazyserde2.q.out | 12 +
.../results/clientpositive/llap/inputddl6.q.out | 2 +
.../test/results/clientpositive/llap/insert0.q.out | 12 +
.../llap/insert1_overwrite_partitions.q.out | 10 +
.../llap/insert2_overwrite_partitions.q.out | 4 +
.../clientpositive/llap/insert_cast_binary.q.out | 2 +
.../clientpositive/llap/insert_compressed.q.out | 4 +
...nsert_dynamic_partitions_notification_log.q.out | 2 +
.../results/clientpositive/llap/insert_into1.q.out | 4 +
.../results/clientpositive/llap/insert_into2.q.out | 4 +
.../results/clientpositive/llap/insert_into3.q.out | 8 +
.../results/clientpositive/llap/insert_into4.q.out | 8 +
.../results/clientpositive/llap/insert_into5.q.out | 6 +
.../results/clientpositive/llap/insert_into6.q.out | 8 +
.../llap/insert_into_default_keyword.q.out | 16 ++
.../llap/insert_into_with_schema2.q.out | 2 +
.../llap/insert_non_utf8_encoding_table.q.out | 4 +
.../llap/insert_only_empty_query.q.out | 4 +
.../clientpositive/llap/insert_orig_table.q.out | 2 +
.../clientpositive/llap/insert_overwrite.q.out | 18 ++
.../llap/insert_overwrite_directory.q.out | 6 +
.../llap/insert_overwrite_directory2.q.out | 2 +
.../llap/insert_overwrite_preemption.q.out | 4 +
.../llap/insert_overwrite_stats.q.out | 4 +
.../llap/insert_values_orig_table.q.out | 2 +
.../insert_values_orig_table_use_metadata.q.out | 6 +
.../llap/insertoverwrite_bucket.q.out | 10 +
.../llap/insertvalues_espchars.q.out | 2 +
.../results/clientpositive/llap/interval_3.q.out | 2 +
.../clientpositive/llap/interval_arithmetic.q.out | 2 +
.../clientpositive/llap/is_distinct_from.q.out | 2 +
.../test/results/clientpositive/llap/join46.q.out | 2 +
.../llap/join_cond_zero_comp_negativezero.q.out | 6 +
.../llap/join_constraints_optimization.q.out | 4 +
.../clientpositive/llap/join_grp_diff_keys.q.out | 8 +
.../llap/join_reordering_no_stats.q.out | 8 +
.../results/clientpositive/llap/join_view.q.out | 8 +
.../results/clientpositive/llap/json_serde1.q.out | 16 ++
.../results/clientpositive/llap/json_serde2.q.out | 8 +
.../llap/json_serde_qualified_types.q.out | 2 +
.../clientpositive/llap/json_serde_tsformat.q.out | 2 +
.../results/clientpositive/llap/keep_uniform.q.out | 10 +
.../results/clientpositive/llap/keyword_1.q.out | 4 +
.../results/clientpositive/llap/keyword_2.q.out | 4 +
.../results/clientpositive/llap/keyword_3.q.out | 2 +
ql/src/test/results/clientpositive/llap/kryo.q.out | 2 +
.../clientpositive/llap/lateral_view_cp.q.out | 2 +
.../results/clientpositive/llap/leftsemijoin.q.out | 8 +
.../results/clientpositive/llap/lineage2.q.out | 14 +
.../results/clientpositive/llap/lineage3.q.out | 9 +
.../clientpositive/llap/list_bucket_dml_1.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_11.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_12.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_13.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_14.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_2.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_3.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_4.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_5.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_6.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_7.q.out | 2 +
.../clientpositive/llap/list_bucket_dml_9.q.out | 2 +
.../llap/list_bucket_query_multiskew_2.q.out | 2 +
.../results/clientpositive/llap/llap_acid.q.out | 4 +
.../results/clientpositive/llap/llap_acid2.q.out | 4 +
.../clientpositive/llap/llap_acid_fast.q.out | 4 +
.../llap/llap_decimal64_reader.q.out | 4 +
.../results/clientpositive/llap/llap_io_etl.q.out | 3 +
.../clientpositive/llap/llap_nullscan.q.out | 4 +
.../clientpositive/llap/llap_partitioned.q.out | 12 +
.../results/clientpositive/llap/llap_smb.q.out | 8 +
.../results/clientpositive/llap/llap_stats.q.out | 4 +
.../results/clientpositive/llap/llap_text.q.out | 4 +
.../results/clientpositive/llap/llap_udf.q.out | 4 +
.../clientpositive/llap/llap_uncompressed.q.out | 8 +
.../clientpositive/llap/load_data_using_job.q.out | 22 ++
.../clientpositive/llap/load_fs_overwrite.q.out | 8 +
.../llap/load_static_ptn_into_bucketed_table.q.out | 8 +
.../clientpositive/llap/localtimezone2.q.out | 2 +
.../test/results/clientpositive/llap/lock1.q.out | 4 +
.../test/results/clientpositive/llap/lock2.q.out | 8 +
.../test/results/clientpositive/llap/lock3.q.out | 8 +
.../test/results/clientpositive/llap/lock4.q.out | 8 +
.../results/clientpositive/llap/lvj_mapjoin.q.out | 8 +
.../clientpositive/llap/macro_duplicate.q.out | 2 +
.../results/clientpositive/llap/mapjoin3.q.out | 4 +
.../results/clientpositive/llap/masking_10.q.out | 2 +
.../results/clientpositive/llap/masking_8.q.out | 6 +
.../results/clientpositive/llap/masking_9.q.out | 2 +
.../results/clientpositive/llap/masking_mv.q.out | 4 +
.../clientpositive/llap/masking_mv_by_text.q.out | 2 +
.../clientpositive/llap/masking_mv_by_text_2.q.out | 2 +
.../materialized_view_authorization_sqlstd.q.out | 2 +
.../llap/materialized_view_count_distinct.q.out | 2 +
...ialized_view_create_rewrite_time_window_2.q.out | 4 +
.../llap/materialized_view_partitioned_2.q.out | 2 +
.../llap/materialized_view_rebuild.q.out | 4 +
.../llap/materialized_view_rewrite_10.q.out | 4 +
.../llap/materialized_view_rewrite_empty.q.out | 2 +
.../test/results/clientpositive/llap/merge1.q.out | 2 +
.../test/results/clientpositive/llap/merge2.q.out | 2 +
.../test/results/clientpositive/llap/merge3.q.out | 2 +
.../results/clientpositive/llap/merge_join_1.q.out | 8 +
.../clientpositive/llap/metadata_empty_table.q.out | 8 +
.../clientpositive/llap/metadata_export_drop.q.out | 2 +
.../llap/metadata_only_queries.q.out | 4 +
.../llap/metadata_only_queries_with_filters.q.out | 2 +
.../results/clientpositive/llap/misc_json.q.out | 2 +
.../test/results/clientpositive/llap/mm_all.q.out | 66 +++++
.../test/results/clientpositive/llap/mm_bhif.q.out | 2 +
.../results/clientpositive/llap/mm_buckets.q.out | 16 ++
.../clientpositive/llap/mm_conversions.q.out | 26 ++
.../results/clientpositive/llap/mm_cttas.q.out | 8 +
.../results/clientpositive/llap/mm_default.q.out | 20 ++
.../test/results/clientpositive/llap/mm_dp.q.out | 8 +
.../results/clientpositive/llap/mm_dyn_part.q.out | 8 +
.../test/results/clientpositive/llap/mm_exim.q.out | 50 ++++
.../llap/mm_insert_overwrite_aborted.q.out | 4 +
.../results/clientpositive/llap/mm_loaddata.q.out | 16 ++
.../llap/mm_loaddata_split_change.q.out | 4 +
.../results/clientpositive/llap/mm_loc_ctas.q.out | 4 +
.../clientpositive/llap/msck_repair_0.q.out | 4 +
.../clientpositive/llap/msck_repair_1.q.out | 4 +
.../clientpositive/llap/msck_repair_2.q.out | 4 +
.../clientpositive/llap/msck_repair_3.q.out | 4 +
.../clientpositive/llap/msck_repair_4.q.out | 4 +
.../clientpositive/llap/msck_repair_5.q.out | 4 +
.../clientpositive/llap/msck_repair_6.q.out | 4 +
.../clientpositive/llap/msck_repair_7.q.out | 32 +++
.../clientpositive/llap/msck_repair_acid.q.out | 4 +
.../llap/msck_repair_batchsize.q.out | 6 +
.../clientpositive/llap/msck_repair_drop.q.out | 2 +
.../clientpositive/llap/msck_repair_filter.q.out | 4 +
.../llap/msck_repair_hive_25980.q.out | 2 +
.../clientpositive/llap/multiMapJoin1.q.out | 2 +
.../clientpositive/llap/multi_column_in.q.out | 2 +
.../llap/multi_column_in_single.q.out | 2 +
.../clientpositive/llap/multi_count_distinct.q.out | 2 +
.../llap/multi_count_distinct_null.q.out | 2 +
.../llap/multi_insert_bucketing_version.q.out | 6 +
.../llap/multi_insert_union_src.q.out | 6 +
.../llap/multi_insert_with_join.q.out | 8 +
.../clientpositive/llap/multi_sahooks.q.out | 16 ++
.../clientpositive/llap/multigroupbydistinct.q.out | 2 +
.../llap/nested_column_pruning.q.out | 8 +
.../clientpositive/llap/nestedvirtual.q.out | 18 ++
.../test/results/clientpositive/llap/newline.q.out | 2 +
.../llap/nomore_ambiguous_table_col.q.out | 4 +
.../llap/nonreserved_keywords_insert_into1.q.out | 4 +
.../results/clientpositive/llap/nullformat.q.out | 8 +
.../clientpositive/llap/nullformatCTAS.q.out | 8 +
.../clientpositive/llap/nullformatdir.q.out | 6 +
.../results/clientpositive/llap/nullgroup3.q.out | 4 +
.../clientpositive/llap/nullshandling.q.out | 4 +
.../results/clientpositive/llap/orc_analyze.q.out | 14 +
.../results/clientpositive/llap/orc_create.q.out | 28 ++
.../clientpositive/llap/orc_createas1.q.out | 12 +
.../llap/orc_hybrid_mixed_date.q.out | 2 +
.../llap/orc_hybrid_mixed_timestamp.q.out | 2 +
.../llap/orc_legacy_mixed_date.q.out | 2 +
.../llap/orc_legacy_mixed_timestamp.q.out | 2 +
.../results/clientpositive/llap/orc_llap.q.out | 12 +
.../clientpositive/llap/orc_llap_counters1.q.out | 3 +
.../clientpositive/llap/orc_llap_nonvector.q.out | 12 +
.../results/clientpositive/llap/orc_merge1.q.out | 12 +
.../results/clientpositive/llap/orc_merge10.q.out | 9 +
.../results/clientpositive/llap/orc_merge11.q.out | 6 +
.../results/clientpositive/llap/orc_merge13.q.out | 2 +
.../results/clientpositive/llap/orc_merge2.q.out | 4 +
.../results/clientpositive/llap/orc_merge3.q.out | 8 +
.../results/clientpositive/llap/orc_merge4.q.out | 8 +
.../clientpositive/llap/orc_merge_diff_fs.q.out | 12 +
.../llap/orc_merge_incompat_writer_version.q.out | 2 +
.../clientpositive/llap/orc_mr_pathalias.q.out | 4 +
.../llap/orc_nested_column_pruning.q.out | 8 +
.../clientpositive/llap/orc_ppd_basic.q.out | 5 +
.../clientpositive/llap/orc_ppd_exception.q.out | 2 +
.../llap/orc_proleptic_mixed_date.q.out | 2 +
.../llap/orc_proleptic_mixed_timestamp.q.out | 2 +
.../llap/orc_schema_evol_quoted.q.out | 2 +
.../llap/orc_schema_evolution_float.q.out | 6 +
.../llap/orc_struct_type_vectorization.q.out | 4 +
.../clientpositive/llap/orc_wide_table.q.out | 4 +
.../test/results/clientpositive/llap/order3.q.out | 2 +
.../llap/outer_reference_windowed.q.out | 6 +
.../clientpositive/llap/parallel_orderby.q.out | 2 +
.../results/clientpositive/llap/parenthese.q.out | 2 +
.../llap/parquet_alter_column_type.q.out | 40 +++
.../clientpositive/llap/parquet_analyze.q.out | 4 +
.../llap/parquet_array_map_emptynullvals.q.out | 8 +
.../llap/parquet_array_null_element.q.out | 4 +
.../llap/parquet_array_of_multi_field_struct.q.out | 4 +
.../llap/parquet_array_of_optional_elements.q.out | 2 +
.../llap/parquet_array_of_required_elements.q.out | 2 +
.../parquet_array_of_single_field_struct.q.out | 2 +
.../llap/parquet_array_of_structs.q.out | 2 +
.../llap/parquet_array_of_unannotated_groups.q.out | 2 +
.../parquet_array_of_unannotated_primitives.q.out | 2 +
.../llap/parquet_avro_array_of_primitives.q.out | 2 +
...parquet_avro_array_of_single_field_struct.q.out | 2 +
.../clientpositive/llap/parquet_columnar.q.out | 6 +
.../llap/parquet_complex_types_vectorization.q.out | 4 +
.../clientpositive/llap/parquet_create.q.out | 4 +
.../results/clientpositive/llap/parquet_ctas.q.out | 10 +
.../clientpositive/llap/parquet_decimal.q.out | 12 +
.../clientpositive/llap/parquet_decimal1.q.out | 8 +
.../llap/parquet_hybrid_mixed_date.q.out | 2 +
.../llap/parquet_hybrid_mixed_timestamp.q.out | 2 +
.../clientpositive/llap/parquet_int_decimal.q.out | 14 +
.../results/clientpositive/llap/parquet_join.q.out | 10 +
.../llap/parquet_legacy_mixed_date.q.out | 2 +
.../llap/parquet_legacy_mixed_timestamp.q.out | 2 +
.../clientpositive/llap/parquet_map_null.q.out | 8 +
.../llap/parquet_map_of_arrays_of_ints.q.out | 4 +
.../clientpositive/llap/parquet_map_of_maps.q.out | 4 +
.../llap/parquet_map_type_vectorization.q.out | 4 +
.../clientpositive/llap/parquet_mixed_case.q.out | 2 +
.../llap/parquet_mixed_partition_formats.q.out | 2 +
.../llap/parquet_nested_complex.q.out | 4 +
.../clientpositive/llap/parquet_no_row_serde.q.out | 8 +
.../clientpositive/llap/parquet_partitioned.q.out | 4 +
.../results/clientpositive/llap/parquet_ppd.q.out | 2 +
.../clientpositive/llap/parquet_ppd_char2.q.out | 4 +
.../llap/parquet_ppd_partition.q.out | 2 +
.../llap/parquet_proleptic_mixed_date.q.out | 2 +
.../llap/parquet_schema_evolution.q.out | 16 ++
.../clientpositive/llap/parquet_serde.q.out | 2 +
.../clientpositive/llap/parquet_stats.q.out | 2 +
.../llap/parquet_struct_type_vectorization.q.out | 4 +
.../llap/parquet_table_with_subschema.q.out | 4 +
.../llap/parquet_thrift_array_of_primitives.q.out | 4 +
...rquet_thrift_array_of_single_field_struct.q.out | 2 +
.../clientpositive/llap/parquet_timestamp.q.out | 2 +
.../llap/parquet_timestampt_to_bigint.q.out | 2 +
.../llap/parquet_type_promotion.q.out | 6 +
.../clientpositive/llap/parquet_types.q.out | 4 +
...pes_non_dictionary_encoding_vectorization.q.out | 4 +
.../llap/parquet_types_vectorization.q.out | 4 +
.../llap/parquet_vectorization_0.q.out | 4 +
.../llap/parquet_vectorization_18.q.out | 4 +
.../parquet_write_correct_definition_levels.q.out | 4 +
.../clientpositive/llap/partition_char.q.out | 4 +
.../llap/partition_coltype_literals.q.out | 8 +
.../llap/partition_condition_remover.q.out | 4 +
.../clientpositive/llap/partition_date.q.out | 4 +
.../clientpositive/llap/partition_date2.q.out | 4 +
.../clientpositive/llap/partition_discovery.q.out | 16 ++
.../llap/partition_explain_ddl.q.out | 2 +
.../llap/partition_params_postgres.q.out | 2 +
.../llap/partition_shared_scan.q.out | 4 +
.../clientpositive/llap/partition_timestamp.q.out | 4 +
.../clientpositive/llap/partition_timestamp2.q.out | 4 +
.../clientpositive/llap/partition_type_check.q.out | 6 +
.../llap/partition_type_in_plan.q.out | 2 +
.../clientpositive/llap/partition_varchar1.q.out | 4 +
.../clientpositive/llap/partition_varchar2.q.out | 4 +
.../llap/partition_wise_fileformat17.q.out | 8 +
.../llap/partition_wise_fileformat18.q.out | 4 +
.../llap/partitions_filter_default.q.out | 2 +
.../clientpositive/llap/partitions_json.q.out | 2 +
ql/src/test/results/clientpositive/llap/pcr.q.out | 20 ++
ql/src/test/results/clientpositive/llap/pcs.q.out | 4 +
.../results/clientpositive/llap/pointlookup.q.out | 16 ++
.../results/clientpositive/llap/pointlookup2.q.out | 12 +
.../results/clientpositive/llap/pointlookup3.q.out | 4 +
.../results/clientpositive/llap/pointlookup4.q.out | 4 +
ql/src/test/results/clientpositive/llap/ppd2.q.out | 4 +
.../results/clientpositive/llap/ppd_join4.q.out | 2 +
.../clientpositive/llap/ppd_outer_join5.q.out | 8 +
.../clientpositive/llap/ppd_repeated_alias.q.out | 8 +
.../results/clientpositive/llap/prepare_plan.q.out | 8 +
.../clientpositive/llap/ptf_matchpath.q.out | 2 +
.../results/clientpositive/llap/ptf_rcfile.q.out | 2 +
.../clientpositive/llap/ptf_register_tblfn.q.out | 2 +
.../results/clientpositive/llap/ptf_seqfile.q.out | 2 +
.../test/results/clientpositive/llap/push_or.q.out | 2 +
.../clientpositive/llap/q93_with_constraints.q.out | 6 +
.../llap/quotedid_basic_standard.q.out | 2 +
.../clientpositive/llap/rcfile_createas1.q.out | 8 +
.../clientpositive/llap/rcfile_merge2.q.out | 4 +
.../clientpositive/llap/rcfile_merge3.q.out | 8 +
.../clientpositive/llap/rcfile_merge4.q.out | 8 +
.../clientpositive/llap/read_uint_parquet.q.out | 46 ++++
.../llap/read_uint_parquet_vectorized.q.out | 46 ++++
.../llap/reduce_deduplicate_exclude_gby.q.out | 2 +
.../clientpositive/llap/remote_script.q.out | 2 +
.../clientpositive/llap/rename_column.q.out | 4 +
.../llap/rename_partition_location.q.out | 2 +
.../results/clientpositive/llap/reopt_dpp.q.out | 6 +
.../clientpositive/llap/reopt_semijoin.q.out | 4 +
.../test/results/clientpositive/llap/repair.q.out | 4 +
.../clientpositive/llap/repl_2_exim_basic.q.out | 24 ++
.../clientpositive/llap/repl_3_exim_metadata.q.out | 12 +
.../llap/repl_4_exim_nocolstat.q.out | 8 +
.../results/clientpositive/llap/resourceplan.q.out | 2 +
.../clientpositive/llap/rfc5424_parser.q.out | 4 +
.../llap/rfc5424_parser_exception.q.out | 2 +
.../llap/schema_evol_orc_acid_part.q.out | 18 ++
.../llap/schema_evol_orc_acid_part_llap_io.q.out | 18 ++
.../llap/schema_evol_orc_acid_part_update.q.out | 12 +
.../schema_evol_orc_acid_part_update_llap_io.q.out | 12 +
.../llap/schema_evol_orc_acid_table.q.out | 18 ++
.../llap/schema_evol_orc_acid_table_llap_io.q.out | 18 ++
.../llap/schema_evol_orc_acid_table_update.q.out | 6 +
...schema_evol_orc_acid_table_update_llap_io.q.out | 6 +
.../schema_evol_orc_acidvec_part_llap_io.q.out | 18 ++
.../llap/schema_evol_orc_acidvec_part_update.q.out | 6 +
...hema_evol_orc_acidvec_part_update_llap_io.q.out | 6 +
.../llap/schema_evol_orc_acidvec_table.q.out | 18 ++
.../schema_evol_orc_acidvec_table_llap_io.q.out | 18 ++
.../schema_evol_orc_acidvec_table_update.q.out | 6 +
...ema_evol_orc_acidvec_table_update_llap_io.q.out | 6 +
.../llap/schema_evol_orc_nonvec_part.q.out | 18 ++
.../schema_evol_orc_nonvec_part_all_complex.q.out | 6 +
..._evol_orc_nonvec_part_all_complex_llap_io.q.out | 6 +
...schema_evol_orc_nonvec_part_all_primitive.q.out | 10 +
...vol_orc_nonvec_part_all_primitive_llap_io.q.out | 10 +
.../llap/schema_evol_orc_nonvec_part_llap_io.q.out | 18 ++
.../llap/schema_evol_orc_nonvec_table.q.out | 18 ++
.../schema_evol_orc_nonvec_table_llap_io.q.out | 18 ++
.../llap/schema_evol_orc_vec_part.q.out | 18 ++
.../schema_evol_orc_vec_part_all_complex.q.out | 6 +
...ema_evol_orc_vec_part_all_complex_llap_io.q.out | 6 +
.../schema_evol_orc_vec_part_all_primitive.q.out | 10 +
...a_evol_orc_vec_part_all_primitive_llap_io.q.out | 10 +
.../llap/schema_evol_orc_vec_table.q.out | 18 ++
.../llap/schema_evol_orc_vec_table_llap_io.q.out | 18 ++
.../clientpositive/llap/schema_evol_stats.q.out | 2 +
.../llap/schema_evol_text_nonvec_part.q.out | 18 ++
.../schema_evol_text_nonvec_part_all_complex.q.out | 6 +
...evol_text_nonvec_part_all_complex_llap_io.q.out | 6 +
...chema_evol_text_nonvec_part_all_primitive.q.out | 10 +
...ol_text_nonvec_part_all_primitive_llap_io.q.out | 10 +
.../schema_evol_text_nonvec_part_llap_io.q.out | 18 ++
.../llap/schema_evol_text_nonvec_table.q.out | 18 ++
.../schema_evol_text_nonvec_table_llap_io.q.out | 18 ++
.../llap/schema_evol_text_vec_part.q.out | 18 ++
.../schema_evol_text_vec_part_all_complex.q.out | 6 +
...ma_evol_text_vec_part_all_complex_llap_io.q.out | 6 +
..._evol_text_vec_part_all_primitive_llap_io.q.out | 10 +
.../llap/schema_evol_text_vec_part_llap_io.q.out | 18 ++
.../llap/schema_evol_text_vec_table.q.out | 18 ++
.../llap/schema_evol_text_vec_table_llap_io.q.out | 18 ++
.../llap/schema_evol_text_vecrow_part.q.out | 18 ++
.../schema_evol_text_vecrow_part_all_complex.q.out | 6 +
...evol_text_vecrow_part_all_complex_llap_io.q.out | 6 +
...chema_evol_text_vecrow_part_all_primitive.q.out | 10 +
...ol_text_vecrow_part_all_primitive_llap_io.q.out | 10 +
.../schema_evol_text_vecrow_part_llap_io.q.out | 18 ++
.../llap/schema_evol_text_vecrow_table.q.out | 18 ++
.../schema_evol_text_vecrow_table_llap_io.q.out | 18 ++
.../results/clientpositive/llap/schq_ingest.q.out | 4 +
.../clientpositive/llap/schq_materialized.q.out | 4 +
.../clientpositive/llap/select_same_col.q.out | 4 +
.../clientpositive/llap/select_unquote_and.q.out | 2 +
.../clientpositive/llap/select_unquote_not.q.out | 2 +
.../clientpositive/llap/select_unquote_or.q.out | 2 +
.../results/clientpositive/llap/selectindate.q.out | 4 +
.../clientpositive/llap/semijoin_removal_udf.q.out | 4 +
.../clientpositive/llap/serde_multi_delimit.q.out | 12 +
.../results/clientpositive/llap/serde_regex.q.out | 6 +
.../clientpositive/llap/setop_no_distinct.q.out | 8 +
.../clientpositive/llap/sharedwork_dpp.q.out | 6 +
.../clientpositive/llap/sharedwork_semi.q.out | 4 +
.../llap/show_create_table_alter.q.out | 2 +
.../llap/show_create_table_db_table.q.out | 8 +
.../llap/show_create_table_delimited.q.out | 10 +
.../llap/show_create_table_partitioned.q.out | 2 +
.../llap/show_create_table_serde.q.out | 8 +
.../llap/show_create_table_temp_table.q.out | 4 +
.../llap/show_materialized_views.q.out | 8 +
.../results/clientpositive/llap/show_views.q.out | 8 +
.../clientpositive/llap/skewjoin_mapjoin6.q.out | 2 +
.../clientpositive/llap/skewjoin_onesideskew.q.out | 4 +
.../llap/skip_header_footer_aggr.q.out | 4 +
.../llap/skip_header_footer_proj.q.out | 8 +
.../results/clientpositive/llap/skiphf_aggr.q.out | 8 +
.../llap/smb_join_partition_key.q.out | 2 +
.../clientpositive/llap/smb_mapjoin_15.q.out | 8 +
.../results/clientpositive/llap/smblimit.q.out | 4 +
.../llap/special_character_in_tabnames_1.q.out | 2 +
.../llap/special_character_in_tabnames_2.q.out | 2 +
.../special_character_in_tabnames_quotes_1.q.out | 2 +
.../special_character_in_tabnames_quotes_2.q.out | 2 +
.../test/results/clientpositive/llap/split.q.out | 2 +
.../clientpositive/llap/stat_estimate_drill.q.out | 4 +
.../llap/stat_estimate_related_col.q.out | 4 +
.../test/results/clientpositive/llap/stats0.q.out | 4 +
.../test/results/clientpositive/llap/stats14.q.out | 4 +
.../test/results/clientpositive/llap/stats15.q.out | 4 +
.../test/results/clientpositive/llap/stats16.q.out | 4 +
.../test/results/clientpositive/llap/stats18.q.out | 4 +
.../test/results/clientpositive/llap/stats3.q.out | 8 +
.../test/results/clientpositive/llap/stats4.q.out | 8 +
.../clientpositive/llap/stats_analyze_empty.q.out | 2 +
.../results/clientpositive/llap/stats_cbo_1.q.out | 2 +
.../llap/stats_empty_partition2.q.out | 4 +
.../llap/stats_external_location.q.out | 2 +
.../clientpositive/llap/stats_histogram.q.out | 2 +
.../clientpositive/llap/stats_invalidation.q.out | 2 +
.../llap/stats_missing_warning.q.out | 6 +
.../clientpositive/llap/stats_nonpart.q.out | 4 +
.../clientpositive/llap/stats_noscan_1.q.out | 4 +
.../clientpositive/llap/stats_only_external.q.out | 8 +
.../clientpositive/llap/stats_only_null.q.out | 8 +
.../results/clientpositive/llap/stats_part.q.out | 4 +
.../results/clientpositive/llap/stats_part2.q.out | 4 +
.../clientpositive/llap/stats_ppr_all.q.out | 2 +
.../clientpositive/llap/stats_sizebug.q.out | 4 +
.../test/results/clientpositive/llap/statsfs.q.out | 10 +
.../llap/storage_format_descriptor.q.out | 4 +
.../results/clientpositive/llap/str_to_map.q.out | 4 +
.../llap/strict_managed_tables1.q.out | 4 +
.../llap/strict_managed_tables2.q.out | 24 ++
.../llap/strict_managed_tables_sysdb.q.out | 10 +
.../clientpositive/llap/struct_in_view.q.out | 4 +
.../results/clientpositive/llap/structin.q.out | 2 +
.../results/clientpositive/llap/subquery_ALL.q.out | 4 +
.../results/clientpositive/llap/subquery_ANY.q.out | 6 +
.../clientpositive/llap/subquery_exists.q.out | 10 +
.../results/clientpositive/llap/subquery_in.q.out | 8 +
.../clientpositive/llap/subquery_in_having.q.out | 6 +
.../clientpositive/llap/subquery_multi.q.out | 6 +
.../clientpositive/llap/subquery_notexists.q.out | 2 +
.../clientpositive/llap/subquery_notin.q.out | 14 +
.../llap/subquery_notin_having.q.out | 4 +
.../clientpositive/llap/subquery_scalar.q.out | 18 ++
.../clientpositive/llap/subquery_select.q.out | 4 +
.../clientpositive/llap/subquery_views.q.out | 2 +
.../clientpositive/llap/swo_event_merge.q.out | 6 +
.../llap/symlink_text_input_format.q.out | 6 +
.../clientpositive/llap/sys_notification_log.q.out | 2 +
.../clientpositive/llap/table_nonprintable.q.out | 2 +
.../results/clientpositive/llap/temp_table.q.out | 6 +
.../llap/temp_table_add_part_exist.q.out | 4 +
.../llap/temp_table_add_part_with_loc.q.out | 2 +
.../temp_table_alter_partition_change_col.q.out | 2 +
...mp_table_alter_partition_clusterby_sortby.q.out | 2 +
.../llap/temp_table_alter_partition_coltype.q.out | 4 +
...p_table_alter_partition_onto_nocurrent_db.q.out | 2 +
.../llap/temp_table_alter_rename_partition.q.out | 8 +
.../llap/temp_table_display_colstats_tbllvl.q.out | 2 +
.../llap/temp_table_drop_multi_partitions.q.out | 2 +
.../llap/temp_table_drop_partitions_filter.q.out | 2 +
.../llap/temp_table_drop_partitions_filter2.q.out | 2 +
.../llap/temp_table_drop_partitions_filter3.q.out | 2 +
.../llap/temp_table_drop_partitions_filter4.q.out | 4 +
.../llap/temp_table_exchgpartition2lel.q.out | 8 +
.../clientpositive/llap/temp_table_external.q.out | 2 +
.../clientpositive/llap/temp_table_gb1.q.out | 4 +
.../temp_table_insert1_overwrite_partitions.q.out | 10 +
.../temp_table_insert2_overwrite_partitions.q.out | 4 +
.../clientpositive/llap/temp_table_join1.q.out | 4 +
.../llap/temp_table_llap_partitioned.q.out | 12 +
.../clientpositive/llap/temp_table_names.q.out | 2 +
.../clientpositive/llap/temp_table_options1.q.out | 2 +
...emp_table_parquet_mixed_partition_formats.q.out | 2 +
.../llap/temp_table_parquet_partitioned.q.out | 4 +
.../llap/temp_table_parquet_ppd_partition.q.out | 2 +
.../llap/temp_table_partition_char.q.out | 4 +
.../temp_table_partition_condition_remover.q.out | 4 +
.../llap/temp_table_partition_date.q.out | 4 +
.../llap/temp_table_partition_timestamp.q.out | 4 +
.../llap/temp_table_partition_type_check.q.out | 6 +
.../llap/temp_table_partition_type_in_plan.q.out | 2 +
.../llap/temp_table_partitions_json.q.out | 2 +
.../llap/temp_table_precedence.q.out | 2 +
.../clientpositive/llap/temp_table_subquery1.q.out | 2 +
.../llap/temp_table_windowing_expressions.q.out | 2 +
.../llap/test_teradatabinaryfile.q.out | 16 ++
.../llap/tez_acid_union_dynamic_partition.q.out | 12 +
.../llap/tez_acid_union_dynamic_partition_2.q.out | 12 +
.../llap/tez_acid_union_multiinsert.q.out | 24 ++
.../test/results/clientpositive/llap/tez_dml.q.out | 8 +
.../llap/tez_fixed_bucket_pruning.q.out | 2 +
.../llap/tez_join_result_complex.q.out | 4 +
.../llap/tez_mm_union_dynamic_partition.q.out | 20 ++
.../clientpositive/llap/tez_self_join.q.out | 8 +
.../clientpositive/llap/tez_smb_reduce_side.q.out | 22 ++
.../results/clientpositive/llap/tez_union.q.out | 14 +
.../llap/tez_union_dynamic_partition_2.q.out | 8 +
.../results/clientpositive/llap/timestamp_1.q.out | 4 +
.../results/clientpositive/llap/timestamp_2.q.out | 4 +
.../results/clientpositive/llap/timestamp_3.q.out | 4 +
.../results/clientpositive/llap/timestamp_4.q.out | 8 +
.../llap/timestamp_comparison3.q.out | 2 +
.../clientpositive/llap/timestamp_formats.q.out | 4 +
.../clientpositive/llap/timestamp_lazy.q.out | 2 +
.../clientpositive/llap/timestamp_null.q.out | 2 +
.../clientpositive/llap/timestamp_udf.q.out | 8 +
.../clientpositive/llap/timestamptz_1.q.out | 2 +
.../clientpositive/llap/timestamptz_3.q.out | 2 +
.../clientpositive/llap/timestamptz_5.q.out | 8 +
.../test/results/clientpositive/llap/topnkey.q.out | 2 +
.../llap/topnkey_grouping_sets.q.out | 2 +
.../llap/topnkey_grouping_sets_functions.q.out | 2 +
.../llap/topnkey_grouping_sets_order.q.out | 2 +
.../clientpositive/llap/topnkey_inner_join.q.out | 4 +
.../clientpositive/llap/topnkey_inner_join2.q.out | 4 +
.../clientpositive/llap/topnkey_order_null.q.out | 4 +
.../clientpositive/llap/topnkey_windowing.q.out | 2 +
.../llap/topnkey_windowing_order.q.out | 2 +
.../test/results/clientpositive/llap/touch.q.out | 4 +
.../clientpositive/llap/transitive_not_null.q.out | 4 +
.../llap/translated_external_rename.q.out | 2 +
.../llap/translated_external_rename2.q.out | 2 +
.../llap/type_change_test_fraction.q.out | 26 ++
.../clientpositive/llap/type_change_test_int.q.out | 26 ++
.../clientpositive/llap/type_widening.q.out | 2 +
.../llap/udaf_binarysetfunctions.q.out | 2 +
.../llap/udaf_binarysetfunctions_no_cbo.q.out | 2 +
.../clientpositive/llap/udaf_collect_set_2.q.out | 6 +
.../clientpositive/llap/udaf_covar_pop.q.out | 4 +
.../clientpositive/llap/udaf_covar_samp.q.out | 4 +
.../results/clientpositive/llap/udaf_ngrams.q.out | 2 +
.../clientpositive/llap/udaf_percentile_cont.q.out | 2 +
.../clientpositive/llap/udaf_percentile_disc.q.out | 2 +
.../clientpositive/llap/udf_character_length.q.out | 4 +
.../results/clientpositive/llap/udf_conv.q.out | 2 +
.../llap/udf_datetime_legacy_hybrid_calendar.q.out | 2 +
.../results/clientpositive/llap/udf_explode.q.out | 2 +
.../clientpositive/llap/udf_folder_constants.q.out | 4 +
.../test/results/clientpositive/llap/udf_in.q.out | 2 +
.../results/clientpositive/llap/udf_isops.q.out | 2 +
.../results/clientpositive/llap/udf_length.q.out | 2 +
.../results/clientpositive/llap/udf_likeall.q.out | 2 +
.../results/clientpositive/llap/udf_likeany.q.out | 2 +
.../clientpositive/llap/udf_ltrim_vector.q.out | 2 +
.../results/clientpositive/llap/udf_nullif.q.out | 2 +
.../clientpositive/llap/udf_octet_length.q.out | 4 +
.../results/clientpositive/llap/udf_printf.q.out | 6 +
.../results/clientpositive/llap/udf_reverse.q.out | 2 +
.../clientpositive/llap/udf_rtrim_vector.q.out | 2 +
.../clientpositive/llap/udf_sentences.q.out | 4 +
.../clientpositive/llap/udf_sort_array_by.q.out | 6 +
.../clientpositive/llap/udf_stddev_samp.q.out | 2 +
.../clientpositive/llap/udf_trim_vector.q.out | 2 +
.../clientpositive/llap/udf_trunc_number.q.out | 12 +
.../results/clientpositive/llap/udf_var_samp.q.out | 2 +
.../clientpositive/llap/udf_width_bucket.q.out | 18 ++
.../clientpositive/llap/unicode_notation.q.out | 6 +
.../test/results/clientpositive/llap/union31.q.out | 8 +
.../clientpositive/llap/unionDistinct_3.q.out | 4 +
.../clientpositive/llap/union_assertion_type.q.out | 10 +
.../results/clientpositive/llap/union_date.q.out | 8 +
.../clientpositive/llap/union_date_trim.q.out | 2 +
.../results/clientpositive/llap/union_offcbo.q.out | 8 +
.../clientpositive/llap/union_pos_alias.q.out | 4 +
.../clientpositive/llap/union_remove_plan.q.out | 2 +
.../clientpositive/llap/union_rowcounts.q.out | 6 +
.../clientpositive/llap/union_top_level.q.out | 2 +
.../llap/unionall_join_nullconstant.q.out | 8 +
.../clientpositive/llap/unionall_lateralview.q.out | 8 +
.../llap/unionall_lateralview1.q.out | 12 +
.../llap/unionall_unbalancedppd.q.out | 16 ++
.../llap/unset_table_view_property.q.out | 2 +
.../clientpositive/llap/updateAccessTime.q.out | 8 +
.../results/clientpositive/llap/varchar_1.q.out | 8 +
.../results/clientpositive/llap/varchar_2.q.out | 4 +
.../clientpositive/llap/varchar_join1.q.out | 12 +
.../clientpositive/llap/varchar_nested_types.q.out | 24 ++
.../clientpositive/llap/varchar_serde.q.out | 24 ++
.../results/clientpositive/llap/varchar_udf1.q.out | 4 +
.../clientpositive/llap/varchar_union1.q.out | 12 +
.../results/clientpositive/llap/vector_acid3.q.out | 4 +
.../results/clientpositive/llap/vector_acid4.q.out | 8 +
.../llap/vector_adaptor_usage_mode.q.out | 20 ++
.../llap/vector_and_or_scalar_col.q.out | 2 +
.../llap/vector_auto_smb_mapjoin_14.q.out | 2 +
.../llap/vector_binary_join_groupby.q.out | 4 +
.../clientpositive/llap/vector_cast_constant.q.out | 4 +
.../clientpositive/llap/vector_char_2.q.out | 4 +
.../clientpositive/llap/vector_char_4.q.out | 6 +
.../clientpositive/llap/vector_char_mapjoin1.q.out | 24 ++
.../clientpositive/llap/vector_char_simple.q.out | 6 +
.../clientpositive/llap/vector_data_types.q.out | 4 +
.../clientpositive/llap/vector_date_1.q.out | 4 +
.../clientpositive/llap/vector_decimal_1.q.out | 4 +
.../clientpositive/llap/vector_decimal_10_0.q.out | 8 +
.../clientpositive/llap/vector_decimal_2.q.out | 4 +
.../clientpositive/llap/vector_decimal_3.q.out | 8 +
.../clientpositive/llap/vector_decimal_4.q.out | 8 +
.../clientpositive/llap/vector_decimal_5.q.out | 8 +
.../clientpositive/llap/vector_decimal_6.q.out | 12 +
.../clientpositive/llap/vector_decimal_7.q.out | 4 +
.../llap/vector_decimal_mapjoin2.q.out | 4 +
.../llap/vector_decimal_partition.q.out | 2 +
.../llap/vector_decimal_precision.q.out | 12 +
.../llap/vector_decimal_trailing.q.out | 8 +
.../clientpositive/llap/vector_decimal_udf.q.out | 8 +
.../clientpositive/llap/vector_decimal_udf2.q.out | 8 +
.../llap/vector_deserialize_row.q.out | 4 +
.../llap/vector_full_outer_join.q.out | 4 +
.../llap/vector_groupby_sort_8.q.out | 2 +
.../llap/vector_identity_reuse.q.out | 6 +
.../clientpositive/llap/vector_if_expr_2.q.out | 2 +
.../clientpositive/llap/vector_interval_1.q.out | 2 +
.../clientpositive/llap/vector_interval_2.q.out | 4 +
.../llap/vector_interval_arithmetic.q.out | 2 +
.../results/clientpositive/llap/vector_join.q.out | 4 +
.../llap/vector_left_outer_join2.q.out | 4 +
.../llap/vector_left_outer_join3.q.out | 4 +
.../clientpositive/llap/vector_like_2.q.out | 2 +
.../clientpositive/llap/vector_offset_limit.q.out | 2 +
.../llap/vector_orc_nested_column_pruning.q.out | 8 +
.../llap/vector_outer_reference_windowed.q.out | 6 +
.../clientpositive/llap/vector_string_concat.q.out | 4 +
.../llap/vector_string_decimal.q.out | 8 +
.../llap/vector_string_decimal64.q.out | 2 +
.../llap/vector_tablesample_rows.q.out | 2 +
.../clientpositive/llap/vector_topnkey.q.out | 2 +
.../results/clientpositive/llap/vector_udf1.q.out | 4 +
.../results/clientpositive/llap/vector_udf2.q.out | 6 +
.../llap/vector_udf_character_length.q.out | 6 +
.../llap/vector_udf_octet_length.q.out | 6 +
.../clientpositive/llap/vector_varchar_4.q.out | 6 +
.../llap/vector_varchar_mapjoin1.q.out | 24 ++
.../llap/vector_varchar_simple.q.out | 6 +
.../llap/vector_windowing_expressions.q.out | 2 +
.../llap/vector_windowing_multipartitioning.q.out | 2 +
.../llap/vector_windowing_navfn.q.out | 4 +
.../llap/vector_windowing_order_null.q.out | 2 +
.../llap/vector_windowing_range_multiorder.q.out | 2 +
.../llap/vector_windowing_rank.q.out | 2 +
.../llap/vector_windowing_row_number.q.out | 8 +
.../llap/vector_windowing_streaming.q.out | 6 +
.../llap/vector_windowing_windowspec.q.out | 2 +
.../llap/vector_windowing_windowspec4.q.out | 2 +
.../clientpositive/llap/vectorization_0.q.out | 4 +
.../llap/vectorization_escape_crlf.q.out | 4 +
.../llap/vectorization_multi_value.q.out | 2 +
.../clientpositive/llap/vectorization_nvl.q.out | 4 +
.../llap/vectorization_parquet_projection.q.out | 10 +
.../llap/vectorization_sum_if_when.q.out | 4 +
.../clientpositive/llap/vectorized_context.q.out | 6 +
.../llap/vectorized_decimal64_boundary.q.out | 4 +
.../vectorized_dynamic_partition_pruning.q.out | 10 +
.../vectorized_dynamic_semijoin_reduction.q.out | 4 +
.../vectorized_dynamic_semijoin_reduction2.q.out | 4 +
.../vectorized_insert_into_bucketed_table.q.out | 2 +
.../llap/vectorized_parquet_types.q.out | 10 +
.../clientpositive/llap/vectorized_ptf.q.out | 4 +
.../clientpositive/llap/vectorized_timestamp.q.out | 2 +
.../results/clientpositive/llap/view_cast.q.out | 4 +
.../clientpositive/llap/whroot_external1.q.out | 6 +
.../results/clientpositive/llap/windowing.q.out | 2 +
.../clientpositive/llap/windowing_distinct.q.out | 2 +
.../llap/windowing_expressions.q.out | 2 +
.../clientpositive/llap/windowing_filter.q.out | 2 +
.../llap/windowing_multipartitioning.q.out | 2 +
.../clientpositive/llap/windowing_navfn.q.out | 4 +
.../clientpositive/llap/windowing_ntile.q.out | 2 +
.../clientpositive/llap/windowing_order_null.q.out | 2 +
.../llap/windowing_range_multiorder.q.out | 2 +
.../clientpositive/llap/windowing_rank.q.out | 2 +
.../clientpositive/llap/windowing_streaming.q.out | 6 +
.../clientpositive/llap/windowing_udaf.q.out | 2 +
.../llap/windowing_windowspec2.q.out | 2 +
.../llap/windowing_windowspec3.q.out | 2 +
.../llap/windowing_windowspec4.q.out | 2 +
.../llap/zero_rows_single_insert.q.out | 4 +
.../results/clientpositive/localtimezone.q.out | 6 +
.../test/results/clientpositive/manyViewJoin.q.out | 284 +++++++++++++++++++++
.../test/results/clientpositive/mapjoin_hook.q.out | 1 +
.../results/clientpositive/mapjoin_subquery2.q.out | 12 +
ql/src/test/results/clientpositive/masking_5.q.out | 2 +
ql/src/test/results/clientpositive/row__id.q.out | 2 +
.../results/clientpositive/skewjoinopt10.q.out | 2 +
.../results/clientpositive/skewjoinopt17.q.out | 4 +
.../test/results/clientpositive/smb_mapjoin9.q.out | 6 +
.../results/clientpositive/smb_mapjoin_21.q.out | 10 +
.../results/clientpositive/smb_mapjoin_22.q.out | 4 +
.../clientpositive/sort_merge_join_desc_1.q.out | 4 +
.../clientpositive/sort_merge_join_desc_2.q.out | 4 +
.../clientpositive/sort_merge_join_desc_3.q.out | 4 +
.../clientpositive/sort_merge_join_desc_4.q.out | 4 +
.../clientpositive/sort_merge_join_desc_8.q.out | 8 +
.../results/clientpositive/stats_noscan_2.q.out | 4 +
.../clientpositive/tez/explainanalyze_3.q.out | 14 +-
.../clientpositive/tez/explainanalyze_5.q.out | 4 +
.../results/clientpositive/tez/explainuser_3.q.out | 10 +-
.../tez/hybridgrace_hashjoin_1.q.out | 4 +
.../clientpositive/tez/mapjoin_addjar.q.out | 2 +
.../clientpositive/tez/orc_vectorization_ppd.q.out | 6 +
.../tez/vector_join_part_col_char.q.out | 4 +
.../results/clientpositive/timestamptz_2.q.out | 2 +
.../type_change_test_fraction_vectorized.q.out | 26 ++
.../type_change_test_int_vectorized.q.out | 26 ++
.../results/clientpositive/typechangetest.q.out | 24 ++
ql/src/test/results/clientpositive/udf_using.q.out | 2 +
.../results/clientpositive/vector_udf_trunc.q.out | 2 +
.../clientpositive/windowing_windowspec.q.out | 2 +
1386 files changed, 8826 insertions(+), 21 deletions(-)
diff --git a/contrib/src/test/results/clientpositive/fileformat_base64.q.out b/contrib/src/test/results/clientpositive/fileformat_base64.q.out
index 1006db625ee..f16151007e6 100644
--- a/contrib/src/test/results/clientpositive/fileformat_base64.q.out
+++ b/contrib/src/test/results/clientpositive/fileformat_base64.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE base64_test
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE base64_test
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: EXPLAIN
CREATE TABLE base64_test(key INT, value STRING) STORED AS
INPUTFORMAT 'org.apache.hadoop.hive.contrib.fileformat.base64.Base64TextInputFormat'
@@ -116,8 +118,10 @@ POSTHOOK: Input: default@base64_test
PREHOOK: query: DROP TABLE base64_test
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@base64_test
+PREHOOK: Output: database:default
PREHOOK: Output: default@base64_test
POSTHOOK: query: DROP TABLE base64_test
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@base64_test
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@base64_test
diff --git a/contrib/src/test/results/clientpositive/serde_regex.q.out b/contrib/src/test/results/clientpositive/serde_regex.q.out
index ff1b771b813..9bf2bcd5a94 100644
--- a/contrib/src/test/results/clientpositive/serde_regex.q.out
+++ b/contrib/src/test/results/clientpositive/serde_regex.q.out
@@ -205,8 +205,10 @@ Peña Andrés
PREHOOK: query: DROP TABLE serde_regex2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@serde_regex2
+PREHOOK: Output: database:default
PREHOOK: Output: default@serde_regex2
POSTHOOK: query: DROP TABLE serde_regex2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@serde_regex2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@serde_regex2
diff --git a/contrib/src/test/results/clientpositive/serde_s3.q.out b/contrib/src/test/results/clientpositive/serde_s3.q.out
index abe72a53e2a..a6672e99b49 100644
--- a/contrib/src/test/results/clientpositive/serde_s3.q.out
+++ b/contrib/src/test/results/clientpositive/serde_s3.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE s3log
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE s3log
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE s3log
ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.s3.S3LogDeserializer'
STORED AS TEXTFILE
@@ -65,8 +67,10 @@ POSTHOOK: Input: default@s3log
PREHOOK: query: DROP TABLE s3log
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@s3log
+PREHOOK: Output: database:default
PREHOOK: Output: default@s3log
POSTHOOK: query: DROP TABLE s3log
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@s3log
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@s3log
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
index 5f71071f374..6622e2a4378 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -703,8 +705,10 @@ POSTHOOK: Input: default@dest1
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@dest1
+PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@dest1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@dest1
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
index 343462b14d8..1865abbf4c5 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE dest1(key SMALLINT, value STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -699,8 +701,10 @@ POSTHOOK: Input: default@dest1
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@dest1
+PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@dest1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@dest1
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
index 10760edc726..9c578c24265 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes3.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -699,8 +701,10 @@ POSTHOOK: Input: default@dest1
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@dest1
+PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@dest1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@dest1
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
index 7d350ff1ee3..79bd1f8b897 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -245,8 +247,10 @@ POSTHOOK: Input: default@dest1
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@dest1
+PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@dest1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@dest1
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
index 9cf661f7873..9850bb3b627 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes5.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -703,8 +705,10 @@ POSTHOOK: Input: default@dest1
PREHOOK: query: drop table dest1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@dest1
+PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
POSTHOOK: query: drop table dest1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@dest1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@dest1
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out
index 1a64d480bbd..767c2dc7a38 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes6.q.out
@@ -1,15 +1,21 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE table2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE table3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE table1 (a STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe'
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -37,24 +43,30 @@ POSTHOOK: Output: default@table3
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
PREHOOK: query: DROP TABLE table2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table2
+PREHOOK: Output: database:default
PREHOOK: Output: default@table2
POSTHOOK: query: DROP TABLE table2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table2
PREHOOK: query: DROP TABLE table3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table3
+PREHOOK: Output: database:default
PREHOOK: Output: default@table3
POSTHOOK: query: DROP TABLE table3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table3
diff --git a/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out b/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out
index 26956cb8e2f..ebb1732beed 100644
--- a/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out
+++ b/contrib/src/test/results/clientpositive/serde_typedbytes_null.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE table1 (a STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.contrib.serde2.TypedBytesSerDe' STORED AS SEQUENCEFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -1046,8 +1048,10 @@ POSTHOOK: Input: default@table1
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
diff --git a/hbase-handler/src/test/results/negative/generatehfiles_require_family_path.q.out b/hbase-handler/src/test/results/negative/generatehfiles_require_family_path.q.out
index aab4cf9c4c5..7869e9bcbb1 100644
--- a/hbase-handler/src/test/results/negative/generatehfiles_require_family_path.q.out
+++ b/hbase-handler/src/test/results/negative/generatehfiles_require_family_path.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS hbase_bulk
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_bulk
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_bulk (key INT, value STRING)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ('hbase.columns.mapping' = ':key,cf:string')
diff --git a/hbase-handler/src/test/results/negative/hbase_ddl.q.out b/hbase-handler/src/test/results/negative/hbase_ddl.q.out
index 60d72798141..4787038ffa9 100644
--- a/hbase-handler/src/test/results/negative/hbase_ddl.q.out
+++ b/hbase-handler/src/test/results/negative/hbase_ddl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE hbase_table_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value')
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
diff --git a/hbase-handler/src/test/results/positive/external_table_ppd.q.out b/hbase-handler/src/test/results/positive/external_table_ppd.q.out
index 139e35be865..acf07bd82e4 100644
--- a/hbase-handler/src/test/results/positive/external_table_ppd.q.out
+++ b/hbase-handler/src/test/results/positive/external_table_ppd.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE t_hbase
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -177,8 +179,10 @@ user2 127 327 2147 9223372036854775807 211.31 2.687465320571E8 false
PREHOOK: query: DROP TABLE t_hbase
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase
POSTHOOK: query: DROP TABLE t_hbase
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase
diff --git a/hbase-handler/src/test/results/positive/hbase_binary_binary.q.out b/hbase-handler/src/test/results/positive/hbase_binary_binary.q.out
index debe89c7603..8ef549c40d0 100644
--- a/hbase-handler/src/test/results/positive/hbase_binary_binary.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_binary_binary.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists testhbaseb
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists testhbaseb
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE testhbaseb (key int, val binary)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
@@ -49,8 +51,10 @@ POSTHOOK: Input: default@testhbaseb
PREHOOK: query: drop table testhbaseb
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@testhbaseb
+PREHOOK: Output: database:default
PREHOOK: Output: default@testhbaseb
POSTHOOK: query: drop table testhbaseb
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@testhbaseb
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@testhbaseb
diff --git a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out
index 7eaba6b9a86..05dcfe8c8b3 100644
--- a/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_binary_external_table_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE t_ext_hbase_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_1
(key STRING, c_bool BOOLEAN, c_byte TINYINT, c_short SMALLINT,
c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE)
@@ -34,15 +36,19 @@ key-3 NULL NULL NULL NULL NULL Test Strings NULL NULL
PREHOOK: query: DROP TABLE t_ext_hbase_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_1
POSTHOOK: query: DROP TABLE t_ext_hbase_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_1
PREHOOK: query: DROP TABLE t_ext_hbase_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_2
(key STRING, c_bool BOOLEAN, c_byte TINYINT, c_short SMALLINT,
c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE)
@@ -75,15 +81,19 @@ key-3 true 127 32767 2147483647 9223372036854775807 Test Strings 3.4028235E38 1.
PREHOOK: query: DROP TABLE t_ext_hbase_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_2
POSTHOOK: query: DROP TABLE t_ext_hbase_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_2
PREHOOK: query: DROP TABLE t_ext_hbase_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_3
(key STRING, c_bool BOOLEAN, c_byte TINYINT, c_short SMALLINT,
c_int INT, c_long BIGINT, c_string STRING, c_float FLOAT, c_double DOUBLE)
@@ -131,8 +141,10 @@ POSTHOOK: Input: default@t_ext_hbase_3
PREHOOK: query: DROP table t_ext_hbase_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_3
POSTHOOK: query: DROP table t_ext_hbase_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_3
diff --git a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out
index 57fea2cf2fc..5fe7ef60b8a 100644
--- a/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_binary_map_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE hbase_src
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_src
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_src(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -50,8 +52,10 @@ POSTHOOK: Lineage: hbase_src.string_col SIMPLE [(src)src.FieldSchema(name:value,
POSTHOOK: Lineage: hbase_src.tinyint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
PREHOOK: query: DROP TABLE t_hbase_maps
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_maps
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_maps(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -154,8 +158,10 @@ POSTHOOK: Input: default@t_hbase_maps
126 {126:126} {126:126} {126:126} {126:126} {126.0:126.0} {126.0:126.0} {"126":"val_126"} {false:false}
PREHOOK: query: DROP TABLE t_ext_hbase_maps
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -199,15 +205,19 @@ POSTHOOK: Input: default@t_ext_hbase_maps
PREHOOK: query: DROP TABLE t_ext_hbase_maps
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps
POSTHOOK: query: DROP TABLE t_ext_hbase_maps
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps
PREHOOK: query: DROP TABLE t_ext_hbase_maps_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_1(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -251,15 +261,19 @@ POSTHOOK: Input: default@t_ext_hbase_maps_1
PREHOOK: query: DROP TABLE t_ext_hbase_maps_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps_1
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps_1
PREHOOK: query: DROP TABLE t_ext_hbase_maps_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_2(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -307,15 +321,19 @@ POSTHOOK: Input: default@t_ext_hbase_maps_2
PREHOOK: query: DROP TABLE t_ext_hbase_maps_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps_2
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps_2
PREHOOK: query: DROP TABLE t_hbase_maps_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_maps_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_maps_1(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -418,8 +436,10 @@ POSTHOOK: Input: default@t_hbase_maps_1
126 {126:126} {126:126} {126:126} {126:126} {126.0:126.0} {126.0:126.0} {"126":"val_126"} {false:false}
PREHOOK: query: DROP TABLE t_ext_hbase_maps_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_3(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -463,15 +483,19 @@ POSTHOOK: Input: default@t_ext_hbase_maps_3
PREHOOK: query: DROP TABLE t_ext_hbase_maps_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps_3
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps_3
PREHOOK: query: DROP TABLE t_ext_hbase_maps_4
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_4
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_4(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -515,15 +539,19 @@ POSTHOOK: Input: default@t_ext_hbase_maps_4
PREHOOK: query: DROP TABLE t_ext_hbase_maps_4
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps_4
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps_4
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_4
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps_4
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps_4
PREHOOK: query: DROP TABLE t_ext_hbase_maps_5
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_5
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_5(key STRING,
tinyint_map_col MAP<TINYINT, TINYINT>,
smallint_map_col MAP<SMALLINT, SMALLINT>,
@@ -571,32 +599,40 @@ POSTHOOK: Input: default@t_ext_hbase_maps_5
PREHOOK: query: DROP TABLE t_ext_hbase_maps_5
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps_5
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps_5
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_5
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps_5
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps_5
PREHOOK: query: DROP TABLE t_hbase_maps_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase_maps_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase_maps_1
POSTHOOK: query: DROP TABLE t_hbase_maps_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase_maps_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase_maps_1
PREHOOK: query: DROP TABLE t_hbase_maps
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase_maps
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase_maps
POSTHOOK: query: DROP TABLE t_hbase_maps
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase_maps
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase_maps
PREHOOK: query: DROP TABLE hbase_src
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_src
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_src
POSTHOOK: query: DROP TABLE hbase_src
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_src
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_src
diff --git a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out b/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out
index 946d72228df..e2cb137dc10 100644
--- a/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_binary_map_queries_prefix.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE hbase_src
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_src
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_src(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -50,8 +52,10 @@ POSTHOOK: Lineage: hbase_src.string_col SIMPLE [(src)src.FieldSchema(name:value,
POSTHOOK: Lineage: hbase_src.tinyint_col EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
PREHOOK: query: DROP TABLE t_hbase_maps
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_maps
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_maps(key STRING,
string_map_col MAP<STRING, STRING>,
simple_string_col STRING)
@@ -118,8 +122,10 @@ POSTHOOK: Input: default@t_hbase_maps
126 {"simple_string_col":"val_126","string_col":"val_126"} val_126
PREHOOK: query: DROP TABLE t_ext_hbase_maps
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps(key STRING,
string_map_cols MAP<STRING, STRING>, simple_string_col STRING)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -149,15 +155,19 @@ POSTHOOK: Input: default@t_ext_hbase_maps
PREHOOK: query: DROP TABLE t_ext_hbase_maps
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps
POSTHOOK: query: DROP TABLE t_ext_hbase_maps
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps
PREHOOK: query: DROP TABLE t_ext_hbase_maps_cut_prefix
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_cut_prefix
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_ext_hbase_maps_cut_prefix(key STRING,
string_map_cols MAP<STRING, STRING>, simple_string_col STRING)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -189,8 +199,10 @@ POSTHOOK: Input: default@t_ext_hbase_maps_cut_prefix
PREHOOK: query: DROP TABLE t_ext_hbase_maps_cut_prefix
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_ext_hbase_maps_cut_prefix
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_ext_hbase_maps_cut_prefix
POSTHOOK: query: DROP TABLE t_ext_hbase_maps_cut_prefix
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_ext_hbase_maps_cut_prefix
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_ext_hbase_maps_cut_prefix
diff --git a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
index 1209c880f76..24791d922f8 100644
--- a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE t_hbase
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -186,8 +188,10 @@ POSTHOOK: Input: default@t_hbase
0 0 0 0 11.139999389648438 2.6663574368565E8 3
PREHOOK: query: DROP TABLE t_hbase_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_1(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -325,23 +329,29 @@ POSTHOOK: Input: default@t_hbase_1
PREHOOK: query: DROP TABLE t_hbase_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase_1
POSTHOOK: query: DROP TABLE t_hbase_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase_1
PREHOOK: query: DROP TABLE t_hbase
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase
POSTHOOK: query: DROP TABLE t_hbase
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase
PREHOOK: query: DROP TABLE t_hbase_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_2(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -475,8 +485,10 @@ POSTHOOK: Input: default@t_hbase_2
0 0 0 0 11.139999389648438 2.6663574368565E8 3
PREHOOK: query: DROP TABLE t_hbase_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_3(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -569,15 +581,19 @@ POSTHOOK: Input: default@t_hbase_3
PREHOOK: query: DROP TABLE t_hbase_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase_3
POSTHOOK: query: DROP TABLE t_hbase_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase_3
PREHOOK: query: DROP TABLE t_hbase_4
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE t_hbase_4
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE t_hbase_4(key STRING,
tinyint_col TINYINT,
smallint_col SMALLINT,
@@ -676,16 +692,20 @@ POSTHOOK: Input: default@t_hbase_4
PREHOOK: query: DROP TABLE t_hbase_4
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase_4
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase_4
POSTHOOK: query: DROP TABLE t_hbase_4
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase_4
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase_4
PREHOOK: query: DROP TABLE t_hbase_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t_hbase_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@t_hbase_2
POSTHOOK: query: DROP TABLE t_hbase_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@t_hbase_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@t_hbase_2
diff --git a/hbase-handler/src/test/results/positive/hbase_bulk.q.out b/hbase-handler/src/test/results/positive/hbase_bulk.q.out
index f38b7ec4fac..cf7b98896bd 100644
--- a/hbase-handler/src/test/results/positive/hbase_bulk.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_bulk.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table hbsort
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table hbsort
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table hbpartition
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table hbpartition
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table hbsort(key string, val string, val2 string)
stored as
INPUTFORMAT 'org.apache.hadoop.mapred.TextInputFormat'
@@ -91,16 +95,20 @@ POSTHOOK: Lineage: hbsort.val2 EXPRESSION [(src)src.FieldSchema(name:key, type:s
PREHOOK: query: drop table hbsort
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbsort
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbsort
POSTHOOK: query: drop table hbsort
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbsort
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbsort
PREHOOK: query: drop table hbpartition
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbpartition
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbpartition
POSTHOOK: query: drop table hbpartition
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbpartition
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbpartition
diff --git a/hbase-handler/src/test/results/positive/hbase_ddl.q.out b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
index 47ea22c74fa..87ced4f3360 100644
--- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE hbase_table_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value')
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
diff --git a/hbase-handler/src/test/results/positive/hbase_decimal_decimal.q.out b/hbase-handler/src/test/results/positive/hbase_decimal_decimal.q.out
index aa9a5acffc8..993797fa5fc 100644
Binary files a/hbase-handler/src/test/results/positive/hbase_decimal_decimal.q.out and b/hbase-handler/src/test/results/positive/hbase_decimal_decimal.q.out differ
diff --git a/hbase-handler/src/test/results/positive/hbase_disable_limitopt.q.out b/hbase-handler/src/test/results/positive/hbase_disable_limitopt.q.out
index 6a760d59924..4749cf41b6a 100644
--- a/hbase-handler/src/test/results/positive/hbase_disable_limitopt.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_disable_limitopt.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists hht
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists hht
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hht (key string, value int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf1:val")
@@ -54,8 +56,10 @@ c 1
PREHOOK: query: drop table hht
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hht
+PREHOOK: Output: database:default
PREHOOK: Output: default@hht
POSTHOOK: query: drop table hht
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hht
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hht
diff --git a/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out b/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out
index 0b8c8538408..e1563f1c715 100644
--- a/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_handler_bulk.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists hb_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists hb_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table hb_target(key int, val string)
stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
with serdeproperties ('hbase.columns.mapping' = ':key,cf:val')
@@ -27,10 +29,12 @@ POSTHOOK: Output: default@hb_target
PREHOOK: query: drop table hb_target
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hb_target
+PREHOOK: Output: database:default
PREHOOK: Output: default@hb_target
POSTHOOK: query: drop table hb_target
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hb_target
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hb_target
#### A masked pattern was here ####
PREHOOK: query: create external table hb_target(key int, val string)
@@ -67,9 +71,11 @@ POSTHOOK: Output: default@hb_target
PREHOOK: query: drop table hb_target
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hb_target
+PREHOOK: Output: database:default
PREHOOK: Output: default@hb_target
POSTHOOK: query: drop table hb_target
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hb_target
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hb_target
#### A masked pattern was here ####
diff --git a/hbase-handler/src/test/results/positive/hbase_joins.q.out b/hbase-handler/src/test/results/positive/hbase_joins.q.out
index a591c4e4b00..a1aa1c8667d 100644
--- a/hbase-handler/src/test/results/positive/hbase_joins.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_joins.q.out
@@ -1,19 +1,27 @@
PREHOOK: query: DROP TABLE users
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE users
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE states
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE states
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE countries
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE countries
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE users_level
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE users_level
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE users(key string, state string, country string, country_id int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
@@ -203,26 +211,32 @@ user1 IA Iowa
PREHOOK: query: DROP TABLE users
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@users
+PREHOOK: Output: database:default
PREHOOK: Output: default@users
POSTHOOK: query: DROP TABLE users
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@users
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@users
PREHOOK: query: DROP TABLE states
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@states
+PREHOOK: Output: database:default
PREHOOK: Output: default@states
POSTHOOK: query: DROP TABLE states
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@states
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@states
PREHOOK: query: DROP TABLE countries
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@countries
+PREHOOK: Output: database:default
PREHOOK: Output: default@countries
POSTHOOK: query: DROP TABLE countries
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@countries
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@countries
PREHOOK: query: CREATE EXTERNAL TABLE users(key int, userid int, username string, created int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -269,16 +283,20 @@ POSTHOOK: Input: default@users_level
PREHOOK: query: DROP TABLE users
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@users
+PREHOOK: Output: database:default
PREHOOK: Output: default@users
POSTHOOK: query: DROP TABLE users
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@users
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@users
PREHOOK: query: DROP TABLE users_level
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@users_level
+PREHOOK: Output: database:default
PREHOOK: Output: default@users_level
POSTHOOK: query: DROP TABLE users_level
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@users_level
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@users_level
diff --git a/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out b/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out
index 47f56fcd79f..0f26670f906 100644
--- a/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_null_first_col.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE src_null
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_null
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE hbase_null
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_null
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_null(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -96,16 +100,20 @@ POSTHOOK: Input: default@hbase_null
PREHOOK: query: DROP TABLE src_null
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@src_null
+PREHOOK: Output: database:default
PREHOOK: Output: default@src_null
POSTHOOK: query: DROP TABLE src_null
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@src_null
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@src_null
PREHOOK: query: DROP TABLE hbase_null
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_null
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_null
POSTHOOK: query: DROP TABLE hbase_null
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_null
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_null
diff --git a/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out b/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out
index 47327e51401..30e10138a30 100644
--- a/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ppd_join.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists hive1_tbl_data_hbase1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists hive1_tbl_data_hbase1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists hive1_tbl_data_hbase2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists hive1_tbl_data_hbase2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop view if exists hive1_view_data_hbase1
PREHOOK: type: DROPVIEW
POSTHOOK: query: drop view if exists hive1_view_data_hbase1
diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out b/hbase-handler/src/test/results/positive/hbase_queries.q.out
index 5be5360de24..6745327f846 100644
--- a/hbase-handler/src/test/results/positive/hbase_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE hbase_table_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_1(key int comment 'It is a column key', value string comment 'It is the column string value')
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
@@ -91,8 +93,10 @@ POSTHOOK: Input: default@src
POSTHOOK: Output: default@hbase_table_1
PREHOOK: query: DROP TABLE hbase_table_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_2(key int, value string)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
@@ -412,8 +416,10 @@ POSTHOOK: Input: default@hbase_table_2
118 val_118
PREHOOK: query: DROP TABLE empty_hbase_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE empty_hbase_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE empty_hbase_table(key int, value string)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = "cf:string")
@@ -430,8 +436,10 @@ POSTHOOK: Output: database:default
POSTHOOK: Output: default@empty_hbase_table
PREHOOK: query: DROP TABLE empty_normal_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE empty_normal_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE empty_normal_table(key int, value string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -698,8 +706,10 @@ POSTHOOK: Input: default@hbase_table_3
10 1
PREHOOK: query: DROP TABLE hbase_table_4
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_4
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_4(key int, value1 string, value2 int, value3 int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
@@ -740,8 +750,10 @@ POSTHOOK: Input: default@hbase_table_4
100 val_100 101 102
PREHOOK: query: DROP TABLE hbase_table_5
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_5
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_5(key int, value map<string,string>)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = "a:")
@@ -768,8 +780,10 @@ POSTHOOK: Input: default@hbase_table_5
100 {"b":"val_100","c":"101"}
PREHOOK: query: DROP TABLE hbase_table_6
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_6
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_6(key int, value map<string,string>)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
@@ -810,8 +824,10 @@ POSTHOOK: Input: default@hbase_table_6
100 {"val_100":"100"}
PREHOOK: query: DROP TABLE hbase_table_7
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_7
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_7(value map<string,string>, key int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
@@ -854,8 +870,10 @@ POSTHOOK: Input: default@hbase_table_7
{"VAL_100":"101.0","val_100":"100"} 100
PREHOOK: query: DROP TABLE hbase_table_8
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table_8
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_8(key int, value1 string, value2 int, value3 int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
@@ -896,8 +914,10 @@ POSTHOOK: Input: default@hbase_table_8
100 val_100 101 102
PREHOOK: query: DROP TABLE IF EXISTS hbase_table_3_like
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_3_like
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE hbase_table_3_like LIKE hbase_table_3
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -943,8 +963,10 @@ POSTHOOK: Input: default@hbase_table_3_like
10 val_10 1
PREHOOK: query: DROP TABLE IF EXISTS hbase_table_1_like
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_1_like
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_1_like LIKE hbase_table_1
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -1004,8 +1026,10 @@ TBLPROPERTIES (
#### A masked pattern was here ####
PREHOOK: query: DROP TABLE IF EXISTS hbase_table_9
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_9
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_9 (id bigint, data map<string, string>, str string)
stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
with serdeproperties ("hbase.columns.mapping" = ":key,cf:map_col#s:s,cf:str_col")
@@ -1075,8 +1099,10 @@ POSTHOOK: Input: default@hbase_table_9
5 {"key1":null,"key2":"avalue"} 1234
PREHOOK: query: DROP TABLE IF EXISTS hbase_table_10
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_10
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_10 (id bigint, data map<int, int>, str string)
stored by 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
with serdeproperties ("hbase.columns.mapping" = ":key,cf:map_col2,cf:str2_col")
@@ -1146,8 +1172,10 @@ POSTHOOK: Input: default@hbase_table_10
5 {50:null,55:58} 1234
PREHOOK: query: DROP TABLE IF EXISTS hbase_table_11
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_11
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_11(id INT, map_column STRUCT<s_int:INT,s_string:STRING,s_date:DATE>)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,id:id')
@@ -1181,8 +1209,10 @@ POSTHOOK: Input: default@hbase_table_11
2 {"s_int":null,"s_string":"s1","s_date":"2018-03-12"}
PREHOOK: query: DROP TABLE IF EXISTS hbase_table_12
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hbase_table_12
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table_12(id INT, list_column ARRAY <STRING>)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ('hbase.columns.mapping'=':key,id:id')
@@ -1217,128 +1247,160 @@ POSTHOOK: Input: default@hbase_table_12
PREHOOK: query: DROP TABLE hbase_table_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_1
POSTHOOK: query: DROP TABLE hbase_table_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_1
PREHOOK: query: DROP TABLE hbase_table_1_like
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_1_like
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_1_like
POSTHOOK: query: DROP TABLE hbase_table_1_like
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_1_like
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_1_like
PREHOOK: query: DROP TABLE hbase_table_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_2
POSTHOOK: query: DROP TABLE hbase_table_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_2
PREHOOK: query: DROP TABLE hbase_table_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_3
POSTHOOK: query: DROP TABLE hbase_table_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_3
PREHOOK: query: DROP TABLE hbase_table_3_like
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_3_like
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_3_like
POSTHOOK: query: DROP TABLE hbase_table_3_like
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_3_like
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_3_like
PREHOOK: query: DROP TABLE hbase_table_4
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_4
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_4
POSTHOOK: query: DROP TABLE hbase_table_4
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_4
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_4
PREHOOK: query: DROP TABLE hbase_table_5
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_5
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_5
POSTHOOK: query: DROP TABLE hbase_table_5
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_5
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_5
PREHOOK: query: DROP TABLE hbase_table_6
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_6
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_6
POSTHOOK: query: DROP TABLE hbase_table_6
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_6
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_6
PREHOOK: query: DROP TABLE hbase_table_7
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_7
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_7
POSTHOOK: query: DROP TABLE hbase_table_7
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_7
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_7
PREHOOK: query: DROP TABLE hbase_table_8
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_8
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_8
POSTHOOK: query: DROP TABLE hbase_table_8
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_8
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_8
PREHOOK: query: DROP TABLE empty_hbase_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@empty_hbase_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@empty_hbase_table
POSTHOOK: query: DROP TABLE empty_hbase_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@empty_hbase_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@empty_hbase_table
PREHOOK: query: DROP TABLE empty_normal_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@empty_normal_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@empty_normal_table
POSTHOOK: query: DROP TABLE empty_normal_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@empty_normal_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@empty_normal_table
PREHOOK: query: DROP TABLE hbase_table_9
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_9
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_9
POSTHOOK: query: DROP TABLE hbase_table_9
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_9
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_9
PREHOOK: query: DROP TABLE hbase_table_10
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_10
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_10
POSTHOOK: query: DROP TABLE hbase_table_10
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_10
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_10
PREHOOK: query: DROP TABLE hbase_table_11
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_11
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_11
POSTHOOK: query: DROP TABLE hbase_table_11
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_11
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_11
PREHOOK: query: DROP TABLE hbase_table_12
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_12
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_12
POSTHOOK: query: DROP TABLE hbase_table_12
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_12
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_12
diff --git a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
index b4c51fd9181..bd6ccdb59ab 100644
--- a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE hbase_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hbase_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` timestamp)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string,:timestamp")
@@ -66,10 +68,12 @@ POSTHOOK: Input: default@hbase_table
PREHOOK: query: DROP TABLE hbase_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table
POSTHOOK: query: DROP TABLE hbase_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` bigint)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -124,10 +128,12 @@ POSTHOOK: Input: default@hbase_table
PREHOOK: query: DROP TABLE hbase_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table
POSTHOOK: query: DROP TABLE hbase_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table (key string, value string, `time` bigint)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
@@ -380,10 +386,12 @@ POSTHOOK: Input: default@hbase_table
PREHOOK: query: DROP TABLE hbase_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table
POSTHOOK: query: DROP TABLE hbase_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table
PREHOOK: query: CREATE EXTERNAL TABLE hbase_table(key string, value map<string, string>, `time` timestamp)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
diff --git a/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out b/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out
index 8156724df85..bae2d79a155 100644
--- a/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_timestamp_format.q.out
@@ -77,16 +77,20 @@ POSTHOOK: Input: default@hbase_ts
PREHOOK: query: drop table hbase_str
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_str
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_str
POSTHOOK: query: drop table hbase_str
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_str
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_str
PREHOOK: query: drop table hbase_ts
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_ts
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_ts
POSTHOOK: query: drop table hbase_ts
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_ts
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_ts
diff --git a/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out b/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out
index 2686ea83d65..a4563a99d3e 100644
--- a/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_viewjoins.q.out
@@ -8,12 +8,16 @@ POSTHOOK: query: DROP VIEW IF EXISTS VIEW_HBASE_TABLE_TEST_1
POSTHOOK: type: DROPVIEW
PREHOOK: query: DROP TABLE IF EXISTS HBASE_TABLE_TEST_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS HBASE_TABLE_TEST_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS HBASE_TABLE_TEST_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS HBASE_TABLE_TEST_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE HBASE_TABLE_TEST_1(
cvalue string ,
pk string,
@@ -167,16 +171,20 @@ POSTHOOK: Output: default@view_hbase_table_test_1
PREHOOK: query: DROP TABLE HBASE_TABLE_TEST_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_test_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_test_2
POSTHOOK: query: DROP TABLE HBASE_TABLE_TEST_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_test_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_test_2
PREHOOK: query: DROP TABLE HBASE_TABLE_TEST_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_table_test_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_table_test_1
POSTHOOK: query: DROP TABLE HBASE_TABLE_TEST_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_table_test_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_table_test_1
diff --git a/hbase-handler/src/test/results/positive/hbasestats.q.out b/hbase-handler/src/test/results/positive/hbasestats.q.out
index 3a30adcca63..61c6df9fd5e 100644
--- a/hbase-handler/src/test/results/positive/hbasestats.q.out
+++ b/hbase-handler/src/test/results/positive/hbasestats.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE users
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE users
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE users(key string, state string, country string, country_id int)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES (
diff --git a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
index 590eb875bdd..f8fdcf00a67 100644
--- a/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
+++ b/hbase-handler/src/test/results/positive/ppd_key_ranges.q.out
@@ -196,8 +196,10 @@ POSTHOOK: Input: default@hbase_ppd_keyrange
PREHOOK: query: drop table hbase_ppd_keyrange
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hbase_ppd_keyrange
+PREHOOK: Output: database:default
PREHOOK: Output: default@hbase_ppd_keyrange
POSTHOOK: query: drop table hbase_ppd_keyrange
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hbase_ppd_keyrange
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hbase_ppd_keyrange
diff --git a/iceberg/iceberg-handler/src/test/results/negative/alter_acid_table_to_iceberg_failure.q.out b/iceberg/iceberg-handler/src/test/results/negative/alter_acid_table_to_iceberg_failure.q.out
index 9c6f16e0844..c142f51fbc7 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/alter_acid_table_to_iceberg_failure.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/alter_acid_table_to_iceberg_failure.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tbl_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tbl_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tbl_orc (a int, b string) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/alter_managed_table_to_iceberg_failure.q.out b/iceberg/iceberg-handler/src/test/results/negative/alter_managed_table_to_iceberg_failure.q.out
index 71a810adb67..a912f4fe792 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/alter_managed_table_to_iceberg_failure.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/alter_managed_table_to_iceberg_failure.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tbl_orc(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_serdeproperties_failure.q.out b/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_serdeproperties_failure.q.out
index 658cc257138..66c99404008 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_serdeproperties_failure.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_serdeproperties_failure.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: DROP TABLE IF EXISTS ice_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: SemanticException Provide only one of the following: STORED BY ORC or WITH SERDEPROPERTIES('write.format.default'='ORC')
diff --git a/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_tableproperties_failure.q.out b/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_tableproperties_failure.q.out
index cbe9ed20d48..273bf33fc80 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_tableproperties_failure.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/create_iceberg_table_stored_as_with_tableproperties_failure.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: DROP TABLE IF EXISTS ice_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: SemanticException Provide only one of the following: STORED BY orc or WITH SERDEPROPERTIES('write.format.default'='orc') or TBLPROPERTIES('write.format.default'='orc')
diff --git a/iceberg/iceberg-handler/src/test/results/negative/describe_non_existing_metadata_table.q.out b/iceberg/iceberg-handler/src/test/results/negative/describe_non_existing_metadata_table.q.out
index 25c782afbe9..91643f7ae40 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/describe_non_existing_metadata_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/describe_non_existing_metadata_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_metadata
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_metadata
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_metadata (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/merge_split_update_off.q.out b/iceberg/iceberg-handler/src/test/results/negative/merge_split_update_off.q.out
index 61be29b0914..27efe8cb9d4 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/merge_split_update_off.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/merge_split_update_off.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists test_merge_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_merge_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists test_merge_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_merge_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_merge_target (a int, b string, c int) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/mv_iceberg_orc_timetravel.q.out b/iceberg/iceberg-handler/src/test/results/negative/mv_iceberg_orc_timetravel.q.out
index 5eeea644791..68b1acbada1 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/mv_iceberg_orc_timetravel.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/mv_iceberg_orc_timetravel.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/mv_mixed_sources.q.out b/iceberg/iceberg-handler/src/test/results/negative/mv_mixed_sources.q.out
index a8f41cc0db2..e71a2c12f48 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/mv_mixed_sources.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/mv_mixed_sources.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_acid
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_acid
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tbl_acid(a int, b string, c int) stored as orc TBLPROPERTIES ('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -12,8 +14,10 @@ POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_acid
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/query_non_existing_metadata_table.q.out b/iceberg/iceberg-handler/src/test/results/negative/query_non_existing_metadata_table.q.out
index 25c782afbe9..91643f7ae40 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/query_non_existing_metadata_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/query_non_existing_metadata_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_metadata
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_metadata
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_metadata (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/truncate_iceberg_table_with_partition_spec.q.out b/iceberg/iceberg-handler/src/test/results/negative/truncate_iceberg_table_with_partition_spec.q.out
index 70b9a3b3852..929fdbcb37f 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/truncate_iceberg_table_with_partition_spec.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/truncate_iceberg_table_with_partition_spec.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_truncate_neg2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_truncate_neg2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_truncate_neg2 (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/negative/update_split_update_off.q.out b/iceberg/iceberg-handler/src/test/results/negative/update_split_update_off.q.out
index 1c1aa42be6d..eaa843205ed 100644
--- a/iceberg/iceberg-handler/src/test/results/negative/update_split_update_off.q.out
+++ b/iceberg/iceberg-handler/src/test/results/negative/update_split_update_off.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_update
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_update
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_update (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out b/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
index c9a90c91841..449b4459c04 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_orc(a int) partitioned by (b string, c string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -255,15 +257,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_orc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_orc
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_orc
POSTHOOK: query: drop table tbl_orc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_orc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_orc
PREHOOK: query: drop table if exists tbl_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_parquet(a int) partitioned by (b string, c string) stored as parquet
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -517,15 +523,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_parquet
POSTHOOK: query: drop table tbl_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_parquet
PREHOOK: query: drop table if exists tbl_avro
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_avro
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_avro(a int) partitioned by (b string, c string) stored as avro
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -779,8 +789,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_avro
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_avro
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_avro
POSTHOOK: query: drop table tbl_avro
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_avro
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_avro
diff --git a/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out b/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
index 7a16fef5e80..5f2da382900 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_orc(a int) partitioned by (b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -204,15 +206,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_orc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_orc
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_orc
POSTHOOK: query: drop table tbl_orc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_orc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_orc
PREHOOK: query: drop table if exists tbl_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_parquet(a int) partitioned by (b string) stored as parquet
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -415,15 +421,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_parquet
POSTHOOK: query: drop table tbl_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_parquet
PREHOOK: query: drop table if exists tbl_avro
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_avro
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_avro(a int) partitioned by (b string) stored as avro
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -626,8 +636,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_avro
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_avro
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_avro
POSTHOOK: query: drop table tbl_avro
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_avro
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_avro
diff --git a/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out b/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
index fac069b7eef..41bcffb2ddb 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_orc(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -155,15 +157,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_orc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_orc
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_orc
POSTHOOK: query: drop table tbl_orc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_orc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_orc
PREHOOK: query: drop table if exists tbl_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_parquet(a int, b string) stored as parquet
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -317,15 +323,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_parquet
POSTHOOK: query: drop table tbl_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_parquet
PREHOOK: query: drop table if exists tbl_avro
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_avro
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_avro(a int, b string) stored as avro
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -479,15 +489,19 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_avro
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_avro
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_avro
POSTHOOK: query: drop table tbl_avro
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_avro
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_avro
PREHOOK: query: drop table if exists part_tbl_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists part_tbl_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table part_tbl_parquet (a int) partitioned by (s string) stored as parquet
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -536,8 +550,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table part_tbl_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@part_tbl_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@part_tbl_parquet
POSTHOOK: query: drop table part_tbl_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@part_tbl_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@part_tbl_parquet
diff --git a/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out b/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out
index d46fc29798e..470f6a2d5f1 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_puffin
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_puffin
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_puffin(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -204,10 +206,12 @@ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"
PREHOOK: query: drop table if exists tbl_ice_puffin
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_puffin
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_puffin
POSTHOOK: query: drop table if exists tbl_ice_puffin
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_puffin
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_puffin
PREHOOK: query: create external table tbl_ice_puffin(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
@@ -256,10 +260,12 @@ Stage-0
PREHOOK: query: drop table if exists tbl_ice_puffin
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_puffin
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_puffin
POSTHOOK: query: drop table if exists tbl_ice_puffin
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_puffin
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_puffin
PREHOOK: query: create external table tbl_ice_puffin(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
@@ -352,8 +358,10 @@ comment
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}}
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
index ba61c9535a6..4f2cbfcd4e7 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
@@ -52,8 +52,10 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_t
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_t
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_t
POSTHOOK: query: DROP TABLE ice_t
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_t
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t
diff --git a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
index 4c290be51ea..4928ce60090 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS ice_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_orc (i int, s string, ts timestamp, d date) STORED BY ICEBERG STORED AS ORC
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -57,15 +59,19 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_orc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_orc
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_orc
POSTHOOK: query: DROP TABLE ice_orc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_orc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_orc
PREHOOK: query: DROP TABLE IF EXISTS ice_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_parquet (i int, s string, ts timestamp, d date) STORED BY ICEBERG STORED AS PARQUET
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -121,15 +127,19 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_parquet
POSTHOOK: query: DROP TABLE ice_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_parquet
PREHOOK: query: DROP TABLE IF EXISTS ice_avro
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_avro
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_avro (i int, s string, ts timestamp, d date) STORED BY ICEBERG STORED AS AVRO
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -185,15 +195,19 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_avro
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_avro
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_avro
POSTHOOK: query: DROP TABLE ice_avro
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_avro
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_avro
PREHOOK: query: DROP TABLE IF EXISTS ice_t
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY 'org.apache.iceberg.mr.hive.HiveIcebergStorageHandler' STORED AS AVRO
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -249,10 +263,12 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_t
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_t
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_t
POSTHOOK: query: DROP TABLE ice_t
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_t
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t
PREHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY ICEBERG WITH SERDEPROPERTIES('dummy'='dummy_value') STORED AS ORC
PREHOOK: type: CREATETABLE
@@ -310,8 +326,10 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_t
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_t
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_t
POSTHOOK: query: DROP TABLE ice_t
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_t
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t
diff --git a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
index ba61c9535a6..4f2cbfcd4e7 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
@@ -52,8 +52,10 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_t
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_t
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_t
POSTHOOK: query: DROP TABLE ice_t
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_t
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t
diff --git a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
index a6114e7750b..927651fef47 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
@@ -53,8 +53,10 @@ Sort Columns: []
PREHOOK: query: DROP TABLE ice_t
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_t
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_t
POSTHOOK: query: DROP TABLE ice_t
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_t
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t
diff --git a/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out b/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out
index 056af234068..1390d639e91 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out
@@ -144,8 +144,10 @@ Sort Columns: []
PREHOOK: query: drop table ice01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice01
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice01
POSTHOOK: query: drop table ice01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice01
diff --git a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_avro.q.out b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_avro.q.out
index 3c96909cc78..cbcb6e1f893 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_avro.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_avro.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg stored as avro tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -68,8 +70,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -107,8 +111,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_orc.q.out
index ce88db8a1ef..7efc58b0e6f 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_orc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg stored as orc tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -68,8 +70,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -107,8 +111,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_parquet.q.out
index 1e5e367bb96..065128ce711 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_partitioned_parquet.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -68,8 +70,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -107,8 +111,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_unpartitioned_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_unpartitioned_parquet.q.out
index c44e8c7cd93..fbdb9ca29da 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_unpartitioned_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/delete_iceberg_unpartitioned_parquet.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -68,8 +70,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -107,8 +111,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
444 hola 800
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_metadata_tables.q.out b/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_metadata_tables.q.out
index dccc778cd21..dd70d1a63e6 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_metadata_tables.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_metadata_tables.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists ice_meta_desc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists ice_meta_desc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table ice_meta_desc (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -808,8 +810,10 @@ readable_metrics struct<id:struct<column_size:bigint,value_count:bigint,null
PREHOOK: query: drop table ice_meta_desc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_meta_desc
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_meta_desc
POSTHOOK: query: drop table ice_meta_desc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_meta_desc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_meta_desc
diff --git a/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
index 92b9e57aee2..3c5a6069c37 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS ice_t
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -12,8 +14,10 @@ POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t
PREHOOK: query: DROP TABLE IF EXISTS ice_t_transform
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t_transform
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t_transform (year_field date, month_field date, day_field date, hour_field timestamp, truncate_field string, bucket_field int, identity_field int) PARTITIONED BY SPEC (year(year_field), month(month_field), day(day_field), hour(hour_field), truncate(2, truncate_field), bucket(2, bucket_field), identity_field) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -24,8 +28,10 @@ POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t_transform
PREHOOK: query: DROP TABLE IF EXISTS ice_t_transform_prop
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t_transform_prop
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t_transform_prop (id int, year_field date, month_field date, day_field date, hour_field timestamp, truncate_field string, bucket_field int, identity_field int) STORED BY ICEBERG TBLPROPERTIES ('iceberg.mr.table.partition.spec'='{"spec-id":0,"fields":[{"name":"year_field_year","transform":"year","source-id":2,"field-id":1000},{"name":"month_field_month","transform":"month","source-id":3,"field-id":1001},{"name":"day_field_day","transform":"day","s [...]
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -36,8 +42,10 @@ POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_t_transform_prop
PREHOOK: query: DROP TABLE IF EXISTS ice_t_identity_part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t_identity_part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t_identity_part (a int) PARTITIONED BY (b string) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_pruning.q.out b/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_pruning.q.out
index 816b98813e8..2607c84e1fa 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_pruning.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_pruning.q.out
@@ -4447,48 +4447,60 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table srcpart_iceberg
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_iceberg
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_iceberg
POSTHOOK: query: drop table srcpart_iceberg
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_iceberg
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_iceberg
PREHOOK: query: drop table srcpart_date_hour_n0_iceberg
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_date_hour_n0_iceberg
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_date_hour_n0_iceberg
POSTHOOK: query: drop table srcpart_date_hour_n0_iceberg
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_date_hour_n0_iceberg
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_date_hour_n0_iceberg
PREHOOK: query: drop table srcpart_date_n2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_date_n2
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_date_n2
POSTHOOK: query: drop table srcpart_date_n2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_date_n2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_date_n2
PREHOOK: query: drop table srcpart_hour_n0
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_hour_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_hour_n0
POSTHOOK: query: drop table srcpart_hour_n0
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_hour_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_hour_n0
PREHOOK: query: drop table srcpart_date_hour_n0
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_date_hour_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_date_hour_n0
POSTHOOK: query: drop table srcpart_date_hour_n0
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_date_hour_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_date_hour_n0
PREHOOK: query: drop table srcpart_double_hour_n0
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_double_hour_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_double_hour_n0
POSTHOOK: query: drop table srcpart_double_hour_n0
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_double_hour_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_double_hour_n0
diff --git a/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_writes.q.out b/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_writes.q.out
index adb74eba14a..60a78ea413d 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_writes.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/dynamic_partition_writes.q.out
@@ -1,23 +1,33 @@
PREHOOK: query: drop table if exists tbl_src
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_src
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists tbl_target_identity
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_target_identity
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists tbl_target_bucket
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_target_bucket
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists tbl_target_mixed
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_target_mixed
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists tbl_bucket_date
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_bucket_date
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_src (a int, b string, c bigint) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/dynamic_semijoin_reduction.q.out b/iceberg/iceberg-handler/src/test/results/positive/dynamic_semijoin_reduction.q.out
index 3a4acaf3188..4e6e7d2c079 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/dynamic_semijoin_reduction.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/dynamic_semijoin_reduction.q.out
@@ -199,16 +199,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table srcpart_date_n7
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_date_n7
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_date_n7
POSTHOOK: query: drop table srcpart_date_n7
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_date_n7
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_date_n7
PREHOOK: query: drop table srcpart_small_n3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@srcpart_small_n3
+PREHOOK: Output: database:default
PREHOOK: Output: default@srcpart_small_n3
POSTHOOK: query: drop table srcpart_small_n3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@srcpart_small_n3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@srcpart_small_n3
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_copy_on_write.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_copy_on_write.q.out
index bccd5c416c3..893fc51dee3 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_copy_on_write.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_copy_on_write.q.out
@@ -212,8 +212,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table if exists ice01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice01
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice01
POSTHOOK: query: drop table if exists ice01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice01
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_merge_schema.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_merge_schema.q.out
index 8d3a83e4672..46db892658a 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_merge_schema.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_merge_schema.q.out
@@ -509,16 +509,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: DROP TABLE calls
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@calls
+PREHOOK: Output: database:default
PREHOOK: Output: default@calls
POSTHOOK: query: DROP TABLE calls
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@calls
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@calls
PREHOOK: query: DROP TABLE display
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@display
+PREHOOK: Output: database:default
PREHOOK: Output: default@display
POSTHOOK: query: DROP TABLE display
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@display
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@display
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_stats.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_stats.q.out
index cab60fe1c40..33c60b54608 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_stats.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_stats.q.out
@@ -195,16 +195,20 @@ STAGE PLANS:
PREHOOK: query: drop table ice01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice01
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice01
POSTHOOK: query: drop table ice01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice01
PREHOOK: query: drop table ice02
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice02
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice02
POSTHOOK: query: drop table ice02
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice02
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice02
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out
index 10d183f43d8..829c9de59f1 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out
@@ -323,16 +323,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table ice01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice01
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice01
POSTHOOK: query: drop table ice01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice01
PREHOOK: query: drop table icepart01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@icepart01
+PREHOOK: Output: database:default
PREHOOK: Output: default@icepart01
POSTHOOK: query: drop table icepart01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@icepart01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@icepart01
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_orc.q.out
index 2eb1e08d363..442257dd540 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_orc.q.out
@@ -1,27 +1,39 @@
PREHOOK: query: DROP TABLE IF EXISTS llap_orders PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS llap_orders PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS llap_items PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS llap_items PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS mig_source PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS mig_source PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS target_ice PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS target_ice PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS calls PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS calls PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS display PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS display PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE calls (
s_key bigint,
year int
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_parquet.q.out
index ba011100d82..f1b05908014 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/llap_iceberg_read_parquet.q.out
@@ -1,15 +1,21 @@
PREHOOK: query: DROP TABLE IF EXISTS llap_orders_parquet PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS llap_orders_parquet PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS llap_items_parquet PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS llap_items_parquet PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS mig_source_parquet PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS mig_source_parquet PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE llap_items_parquet (itemid INT, price INT, category STRING, name STRING, description STRING) STORED BY ICEBERG STORED AS PARQUET
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_mixed.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_mixed.q.out
index 73d039d76e0..07b9aab6151 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_mixed.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_mixed.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_mixed
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_mixed
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_mixed(a int, b string) stored by iceberg stored as orc
TBLPROPERTIES ('iceberg.decimal64.vectorization'='true')
PREHOOK: type: CREATETABLE
@@ -1003,24 +1005,30 @@ Europe Hungary 10 bbb
PREHOOK: query: drop table tbl_ice_mixed
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_mixed
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_mixed
POSTHOOK: query: drop table tbl_ice_mixed
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_mixed
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_mixed
PREHOOK: query: drop table tbl_ice_mixed_all_types
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_mixed_all_types
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_mixed_all_types
POSTHOOK: query: drop table tbl_ice_mixed_all_types
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_mixed_all_types
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_mixed_all_types
PREHOOK: query: drop table tbl_ice_mixed_parted
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_mixed_parted
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_mixed_parted
POSTHOOK: query: drop table tbl_ice_mixed_parted
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_mixed_parted
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_mixed_parted
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_orc.q.out
index 9233f25f2f6..599a3586a8b 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_orc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_orc(a int, b string) stored by iceberg stored as orc
TBLPROPERTIES ('iceberg.decimal64.vectorization'='true')
PREHOOK: type: CREATETABLE
@@ -973,32 +975,40 @@ STAGE PLANS:
PREHOOK: query: drop table tbl_ice_orc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc
POSTHOOK: query: drop table tbl_ice_orc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc
PREHOOK: query: drop table tbl_ice_orc_all_types
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc_all_types
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc_all_types
POSTHOOK: query: drop table tbl_ice_orc_all_types
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc_all_types
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc_all_types
PREHOOK: query: drop table tbl_ice_orc_parted
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc_parted
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc_parted
POSTHOOK: query: drop table tbl_ice_orc_parted
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc_parted
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc_parted
PREHOOK: query: drop table tbl_ice_orc_complex
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc_complex
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc_complex
POSTHOOK: query: drop table tbl_ice_orc_complex
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc_complex
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc_complex
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_parquet.q.out
index d12854b44e5..d1a0bd69431 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/vectorized_iceberg_read_parquet.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_parquet(a int, b string) stored by iceberg stored as parquet
TBLPROPERTIES ('iceberg.decimal64.vectorization'='true')
PREHOOK: type: CREATETABLE
@@ -702,32 +704,40 @@ POSTHOOK: Input: default@tbl_ice_parquet_complex
PREHOOK: query: drop table tbl_ice_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet
POSTHOOK: query: drop table tbl_ice_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet
PREHOOK: query: drop table tbl_ice_parquet_all_types
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet_all_types
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet_all_types
POSTHOOK: query: drop table tbl_ice_parquet_all_types
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet_all_types
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet_all_types
PREHOOK: query: drop table tbl_ice_parquet_parted
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet_parted
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet_parted
POSTHOOK: query: drop table tbl_ice_parquet_parted
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet_parted
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet_parted
PREHOOK: query: drop table tbl_ice_parquet_complex
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet_complex
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet_complex
POSTHOOK: query: drop table tbl_ice_parquet_complex
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet_complex
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet_complex
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc.q.out
index 26b64897653..107bdb412d4 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists tbl_ice_v2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_v2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc2.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc2.q.out
index a6fa7ea6276..fe20546d343 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc2.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc2.q.out
@@ -4,8 +4,10 @@ POSTHOOK: query: drop materialized view if exists mat1
POSTHOOK: type: DROP_MATERIALIZED_VIEW
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc3.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc3.q.out
index 76906b899e5..15d79295e52 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc3.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc3.q.out
@@ -4,8 +4,10 @@ POSTHOOK: query: drop materialized view if exists mat1
POSTHOOK: type: DROP_MATERIALIZED_VIEW
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc4.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc4.q.out
index d3d66befb77..0f0583e52d4 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc4.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc4.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc5.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc5.q.out
index e24319ae71a..9279dfeec0a 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc5.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc5.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc6.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc6.q.out
index 8c38b62f3c9..198cc88f391 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc6.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc6.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc7.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc7.q.out
index 76567afbb83..dbbdd39e35e 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc7.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_orc7.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
index c91810c0971..0db129f22ae 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
@@ -4,8 +4,10 @@ POSTHOOK: query: drop materialized view if exists mat1
POSTHOOK: type: DROP_MATERIALIZED_VIEW
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
index 08e6a97261d..2f194ac55ae 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
@@ -4,8 +4,10 @@ POSTHOOK: query: drop materialized view if exists mat1
POSTHOOK: type: DROP_MATERIALIZED_VIEW
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tbl_ice(a int, b string, c int) stored by iceberg stored as orc tblproperties ('format-version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/puffin_col_stats.q.out b/iceberg/iceberg-handler/src/test/results/positive/puffin_col_stats.q.out
index 063a32d823e..6a133a0e4fa 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/puffin_col_stats.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/puffin_col_stats.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_puffin
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_puffin
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_puffin(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_partitioned_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_partitioned_table.q.out
index efc7a74a937..fbf31438d8d 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_partitioned_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_partitioned_table.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists ice_meta_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists ice_meta_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists ice_meta_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists ice_meta_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table ice_meta_2(a int) partitioned by (b string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -766,18 +770,22 @@ ORC {1:3}
PREHOOK: query: drop table ice_meta_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_meta_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_meta_2
POSTHOOK: query: drop table ice_meta_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_meta_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_meta_2
PREHOOK: query: drop table ice_meta_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_meta_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_meta_3
POSTHOOK: query: drop table ice_meta_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_meta_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_meta_3
PREHOOK: query: CREATE EXTERNAL TABLE `partevv`( `id` int, `ts` timestamp, `ts2` timestamp) STORED BY ICEBERG STORED AS ORC TBLPROPERTIES ('format-version'='1')
PREHOOK: type: CREATETABLE
diff --git a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out
index f7bee8b0909..b43f204b55e 100644
Binary files a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out and b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_of_unpartitioned_table.q.out differ
diff --git a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_with_joins.q.out b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_with_joins.q.out
index 924b74fca93..84ff915de6d 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_with_joins.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_metadata_with_joins.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists ice_meta_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists ice_meta_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table ice_meta_2 (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -248,8 +250,10 @@ append true 5 1 0 ORC 5 1
PREHOOK: query: drop table ice_meta_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice_meta_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice_meta_2
POSTHOOK: query: drop table ice_meta_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice_meta_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice_meta_2
diff --git a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_tag.q.out b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_tag.q.out
index dae649f023e..12bf11b23ae 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_tag.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_tag.q.out
@@ -111,8 +111,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table ice01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice01
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice01
POSTHOOK: query: drop table ice01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice01
diff --git a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_virtualcol.q.out b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_virtualcol.q.out
index be0ec022fa6..2cef50bede6 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_virtualcol.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/query_iceberg_virtualcol.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string) partitioned by (c int) stored by iceberg stored as orc tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/rollback_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/rollback_iceberg_table.q.out
index 394859ffe66..933672ac20a 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/rollback_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/rollback_iceberg_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg stored as parquet
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out b/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out
index 4035276e0c3..b5d9cadc985 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists llap_orders
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists llap_orders
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE llap_orders (orderid INT, quantity INT, itemid INT, tradets TIMESTAMP) PARTITIONED BY (p1 STRING, p2 STRING) STORED BY ICEBERG STORED AS ORC tblproperties('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
index 38b678501a4..d1f1344eb61 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS ice_t
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t (i int, s string, ts timestamp, d date) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -41,8 +43,10 @@ TBLPROPERTIES (
'uuid'='#Masked#')
PREHOOK: query: DROP TABLE IF EXISTS ice_t_transform
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t_transform
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t_transform (year_field date, month_field date, day_field date, hour_field timestamp, truncate_field string, bucket_field int, identity_field int) PARTITIONED BY SPEC (year(year_field), month(month_field), day(day_field), hour(hour_field), truncate(2, truncate_field), bucket(2, bucket_field), identity_field) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -94,8 +98,10 @@ TBLPROPERTIES (
'uuid'='#Masked#')
PREHOOK: query: DROP TABLE IF EXISTS ice_t_transform_prop
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t_transform_prop
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t_transform_prop (id int, year_field date, month_field date, day_field date, hour_field timestamp, truncate_field string, bucket_field int, identity_field int) STORED BY ICEBERG TBLPROPERTIES ('iceberg.mr.table.partition.spec'='{"spec-id":0,"fields":[{"name":"year_field_year","transform":"year","source-id":2,"field-id":1000},{"name":"month_field_month","transform":"month","source-id":3,"field-id":1001},{"name":"day_field_day","transform":"day","s [...]
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -148,8 +154,10 @@ TBLPROPERTIES (
'uuid'='#Masked#')
PREHOOK: query: DROP TABLE IF EXISTS ice_t_identity_part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_t_identity_part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_t_identity_part (a int) PARTITIONED BY (b string) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -190,8 +198,10 @@ TBLPROPERTIES (
'uuid'='#Masked#')
PREHOOK: query: DROP TABLE IF EXISTS ice_data
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS ice_data
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE ice_data (i int, s string) STORED BY ICEBERG
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out b/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
index b5574e31bab..7efe8f4aa96 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
@@ -610,8 +610,10 @@ POSTHOOK: query: DROP MATERIALIZED VIEW fooview
POSTHOOK: type: DROP_MATERIALIZED_VIEW
PREHOOK: query: DROP TABLE foo_n0
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE foo_n0
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: USE test1
PREHOOK: type: SWITCHDATABASE
PREHOOK: Input: database:test1
@@ -669,18 +671,22 @@ POSTHOOK: Output: test1@shtb_view_on_native
PREHOOK: query: DROP TABLE shtb_test1
PREHOOK: type: DROPTABLE
PREHOOK: Input: test1@shtb_test1
+PREHOOK: Output: database:test1
PREHOOK: Output: test1@shtb_test1
POSTHOOK: query: DROP TABLE shtb_test1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: test1@shtb_test1
+POSTHOOK: Output: database:test1
POSTHOOK: Output: test1@shtb_test1
PREHOOK: query: DROP TABLE shtb_test2
PREHOOK: type: DROPTABLE
PREHOOK: Input: test1@shtb_test2
+PREHOOK: Output: database:test1
PREHOOK: Output: test1@shtb_test2
POSTHOOK: query: DROP TABLE shtb_test2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: test1@shtb_test2
+POSTHOOK: Output: database:test1
POSTHOOK: Output: test1@shtb_test2
PREHOOK: query: DROP DATABASE test1
PREHOOK: type: DROPDATABASE
@@ -715,18 +721,22 @@ POSTHOOK: Output: test2@shtb_test2_view2
PREHOOK: query: DROP TABLE shtb_test1
PREHOOK: type: DROPTABLE
PREHOOK: Input: test2@shtb_test1
+PREHOOK: Output: database:test2
PREHOOK: Output: test2@shtb_test1
POSTHOOK: query: DROP TABLE shtb_test1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: test2@shtb_test1
+POSTHOOK: Output: database:test2
POSTHOOK: Output: test2@shtb_test1
PREHOOK: query: DROP TABLE shtb_test2
PREHOOK: type: DROPTABLE
PREHOOK: Input: test2@shtb_test2
+PREHOOK: Output: database:test2
PREHOOK: Output: test2@shtb_test2
POSTHOOK: query: DROP TABLE shtb_test2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: test2@shtb_test2
+POSTHOOK: Output: database:test2
POSTHOOK: Output: test2@shtb_test2
PREHOOK: query: DROP DATABASE test2
PREHOOK: type: DROPDATABASE
diff --git a/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
index d7abd58a001..7e21f4ae71a 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_truncate
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_truncate
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_truncate (id int, value string) stored by iceberg stored as parquet
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -190,8 +192,10 @@ Sort Columns: []
PREHOOK: query: drop table if exists test_truncate
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_truncate
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_truncate
POSTHOOK: query: drop table if exists test_truncate
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_truncate
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_truncate
diff --git a/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
index dfab2edec75..44f5aa07e4f 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_truncate
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_truncate
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_truncate (id int, value string) stored by iceberg stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -417,8 +419,10 @@ Sort Columns: []
PREHOOK: query: drop table if exists test_truncate
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_truncate
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_truncate
POSTHOOK: query: drop table if exists test_truncate
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_truncate
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_truncate
diff --git a/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out b/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
index 72837370162..2a4257cacc0 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists test_truncate
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists test_truncate
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table test_truncate(a int) partitioned by (b string) stored as avro
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -230,8 +232,10 @@ Sort Columns: []
PREHOOK: query: drop table if exists test_truncate
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_truncate
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_truncate
POSTHOOK: query: drop table if exists test_truncate
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_truncate
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_truncate
diff --git a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_avro.q.out b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_avro.q.out
index 23ebeeae283..fe47918ac7d 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_avro.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_avro.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg stored as avro tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -82,8 +84,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -131,8 +135,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_orc.q.out
index e2611efe02c..e7a6c6090bc 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_orc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg stored as orc tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -82,8 +84,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -131,8 +135,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_parquet.q.out
index ced6887466f..4d8f0d994b1 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_partitioned_parquet.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) partitioned by spec (bucket(16, a), truncate(3, b)) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -82,8 +84,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -131,8 +135,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_unpartitioned_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_unpartitioned_parquet.q.out
index 17aa05bc3f8..d15647cbe47 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_unpartitioned_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/update_iceberg_unpartitioned_parquet.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -82,8 +84,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_ice_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_other(a int, b string) stored by iceberg
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -131,8 +135,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
555 Changed again 801
PREHOOK: query: drop table if exists tbl_standard_other
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_standard_other
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_standard_other(a int, b string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out b/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
index d24cbaf5e2d..ce0a28ca0dd 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -49,10 +51,12 @@ Stage-0
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
@@ -101,19 +105,25 @@ Stage-0
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice
PREHOOK: query: drop table if exists t1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists t1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists t2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists t2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table t1 (a int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -260,8 +270,10 @@ Stage-0
PREHOOK: query: drop table if exists tbl_ice
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice(a int, b string, c int) stored by iceberg tblproperties ('format-version'='2')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_merge_mixed.q.out b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_merge_mixed.q.out
index ea4af1de462..44d5690808e 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_merge_mixed.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_merge_mixed.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists store_sales
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists store_sales
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists ssv
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists ssv
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table store_sales (
ss_sold_date_sk int,
ss_sold_time_sk int,
diff --git a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_mixed.q.out b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_mixed.q.out
index 1e37901ddd3..5b4a0767dc3 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_mixed.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_mixed.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_mixed
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_mixed
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_mixed(a int, b string) stored by iceberg stored as orc
TBLPROPERTIES ('iceberg.decimal64.vectorization'='true')
PREHOOK: type: CREATETABLE
@@ -889,24 +891,30 @@ Europe Hungary 10 bbb
PREHOOK: query: drop table tbl_ice_mixed
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_mixed
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_mixed
POSTHOOK: query: drop table tbl_ice_mixed
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_mixed
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_mixed
PREHOOK: query: drop table tbl_ice_mixed_all_types
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_mixed_all_types
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_mixed_all_types
POSTHOOK: query: drop table tbl_ice_mixed_all_types
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_mixed_all_types
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_mixed_all_types
PREHOOK: query: drop table tbl_ice_mixed_parted
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_mixed_parted
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_mixed_parted
POSTHOOK: query: drop table tbl_ice_mixed_parted
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_mixed_parted
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_mixed_parted
diff --git a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_orc.q.out
index 0261f201233..c3217c7ce68 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_orc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_orc(a int, b string) stored by iceberg stored as orc
TBLPROPERTIES ('iceberg.decimal64.vectorization'='true')
PREHOOK: type: CREATETABLE
@@ -895,32 +897,40 @@ STAGE PLANS:
PREHOOK: query: drop table tbl_ice_orc
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc
POSTHOOK: query: drop table tbl_ice_orc
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc
PREHOOK: query: drop table tbl_ice_orc_all_types
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc_all_types
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc_all_types
POSTHOOK: query: drop table tbl_ice_orc_all_types
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc_all_types
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc_all_types
PREHOOK: query: drop table tbl_ice_orc_parted
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc_parted
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc_parted
POSTHOOK: query: drop table tbl_ice_orc_parted
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc_parted
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc_parted
PREHOOK: query: drop table tbl_ice_orc_complex
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_orc_complex
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_orc_complex
POSTHOOK: query: drop table tbl_ice_orc_complex
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_orc_complex
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_orc_complex
diff --git a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_parquet.q.out b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_parquet.q.out
index 1109b1cf77a..1daec87e978 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_parquet.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/vectorized_iceberg_read_parquet.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists tbl_ice_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists tbl_ice_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table tbl_ice_parquet(a int, b string) stored by iceberg stored as parquet
TBLPROPERTIES ('iceberg.decimal64.vectorization'='true')
PREHOOK: type: CREATETABLE
@@ -627,32 +629,40 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table tbl_ice_parquet
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet
POSTHOOK: query: drop table tbl_ice_parquet
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet
PREHOOK: query: drop table tbl_ice_parquet_all_types
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet_all_types
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet_all_types
POSTHOOK: query: drop table tbl_ice_parquet_all_types
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet_all_types
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet_all_types
PREHOOK: query: drop table tbl_ice_parquet_parted
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet_parted
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet_parted
POSTHOOK: query: drop table tbl_ice_parquet_parted
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet_parted
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet_parted
PREHOOK: query: drop table tbl_ice_parquet_complex
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tbl_ice_parquet_complex
+PREHOOK: Output: database:default
PREHOOK: Output: default@tbl_ice_parquet_complex
POSTHOOK: query: drop table tbl_ice_parquet_complex
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tbl_ice_parquet_complex
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tbl_ice_parquet_complex
diff --git a/iceberg/iceberg-handler/src/test/results/positive/write_iceberg_branch.q.out b/iceberg/iceberg-handler/src/test/results/positive/write_iceberg_branch.q.out
index 45f097b0551..dc6fcbfbf7e 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/write_iceberg_branch.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/write_iceberg_branch.q.out
@@ -887,16 +887,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table ice01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@ice01
+PREHOOK: Output: database:default
PREHOOK: Output: default@ice01
POSTHOOK: query: drop table ice01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@ice01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@ice01
PREHOOK: query: drop table source01
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@source01
+PREHOOK: Output: database:default
PREHOOK: Output: default@source01
POSTHOOK: query: drop table source01
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@source01
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@source01
diff --git a/itests/hive-blobstore/src/test/results/clientnegative/select_dropped_table.q.out b/itests/hive-blobstore/src/test/results/clientnegative/select_dropped_table.q.out
index ce40c54c7b1..a4aa29db3e5 100644
--- a/itests/hive-blobstore/src/test/results/clientnegative/select_dropped_table.q.out
+++ b/itests/hive-blobstore/src/test/results/clientnegative/select_dropped_table.q.out
@@ -13,9 +13,11 @@ POSTHOOK: Output: default@qtest
PREHOOK: query: DROP TABLE qtest
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@qtest
+PREHOOK: Output: database:default
PREHOOK: Output: default@qtest
POSTHOOK: query: DROP TABLE qtest
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@qtest
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@qtest
FAILED: SemanticException [Error 10001]: Line 2:14 Table not found 'qtest'
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/buckets.q.out b/itests/hive-blobstore/src/test/results/clientpositive/buckets.q.out
index 633f5e68df7..651f431458c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/buckets.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/buckets.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE source (a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@source
PREHOOK: query: DROP TABLE IF EXISTS buckets
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS buckets
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE buckets (a STRING, value DOUBLE)
PARTITIONED BY (b STRING)
CLUSTERED BY (a) INTO 2 BUCKETS
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/create_database.q.out b/itests/hive-blobstore/src/test/results/clientpositive/create_database.q.out
index 584ddccc000..cb9f9c6b724 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/create_database.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/create_database.q.out
@@ -20,12 +20,16 @@ POSTHOOK: type: SHOWTABLES
POSTHOOK: Input: database:db_with_location
PREHOOK: query: DROP TABLE events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:db_with_location
POSTHOOK: query: DROP TABLE events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:db_with_location
PREHOOK: query: DROP TABLE test_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:db_with_location
POSTHOOK: query: DROP TABLE test_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:db_with_location
PREHOOK: query: CREATE TABLE test_table (col1 STRING) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:db_with_location
@@ -89,10 +93,12 @@ dt=2010-12-08
PREHOOK: query: DROP TABLE events
PREHOOK: type: DROPTABLE
PREHOOK: Input: db_with_location@events
+PREHOOK: Output: database:db_with_location
PREHOOK: Output: db_with_location@events
POSTHOOK: query: DROP TABLE events
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: db_with_location@events
+POSTHOOK: Output: database:db_with_location
POSTHOOK: Output: db_with_location@events
PREHOOK: query: USE DEFAULT
PREHOOK: type: SWITCHDATABASE
@@ -116,10 +122,12 @@ POSTHOOK: Input: database:db_with_location
PREHOOK: query: DROP TABLE test_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: db_with_location@test_table
+PREHOOK: Output: database:db_with_location
PREHOOK: Output: db_with_location@test_table
POSTHOOK: query: DROP TABLE test_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: db_with_location@test_table
+POSTHOOK: Output: database:db_with_location
POSTHOOK: Output: db_with_location@test_table
PREHOOK: query: DROP database db_with_location
PREHOOK: type: DROPDATABASE
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/create_like.q.out b/itests/hive-blobstore/src/test/results/clientpositive/create_like.q.out
index 8dcbb9373ab..5e79c44f37c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/create_like.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/create_like.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_partitioned_source_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_partitioned_source_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_partitioned_source_table (
a int, b int, c string
)
@@ -72,8 +74,10 @@ POSTHOOK: Output: default@blobstore_partitioned_source_table
POSTHOOK: Output: default@blobstore_partitioned_source_table@dt=20110925/hour=2
PREHOOK: query: DROP TABLE like_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE like_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: ### test.blobstore.path ###/create_like/data
@@ -161,10 +165,12 @@ POSTHOOK: Input: default@like_table@dt=20110925/hour=2
PREHOOK: query: DROP TABLE like_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@like_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@like_table
POSTHOOK: query: DROP TABLE like_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@like_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@like_table
PREHOOK: query: SELECT * FROM blobstore_partitioned_source_table
PREHOOK: type: QUERY
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_blobstore.q.out
index 1f184d56f92..5a49257c2cc 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a string, b string, c double)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -34,8 +36,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE IF EXISTS blobstore_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS blobstore_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_target
#### A masked pattern was here ####
AS SELECT * FROM blobstore_source
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_hdfs.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_hdfs.q.out
index 95ee3240f74..25fec0d11b4 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_hdfs.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ctas_blobstore_to_hdfs.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a string, b string, c double)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -34,8 +36,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE IF EXISTS hdfs_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hdfs_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE hdfs_target
AS SELECT * FROM blobstore_source
PREHOOK: type: CREATETABLE_AS_SELECT
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ctas_hdfs_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ctas_hdfs_to_blobstore.q.out
index 3d43f39f87f..8e7acf31221 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ctas_hdfs_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ctas_hdfs_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS hdfs_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hdfs_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE hdfs_source(a string, b string, c double)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -30,8 +32,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@hdfs_source
PREHOOK: query: DROP TABLE IF EXISTS blobstore_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS blobstore_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_target
#### A masked pattern was here ####
AS SELECT * FROM hdfs_source
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out b/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
index 258a6b25204..37930c142ec 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/explain.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_table (cnt INT)
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/having.q.out b/itests/hive-blobstore/src/test/results/clientpositive/having.q.out
index d43b36255c1..830878933a9 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/having.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/having.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE having_blobstore_test
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE having_blobstore_test
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE having_blobstore_test(a int, b int, c string)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
index 8750dbf0be1..409e1c6491a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -112,10 +114,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_addpartition_blobstore_to_b
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT TABLE exim_employee PARTITION (emp_country='us')
FROM '### test.blobstore.path ###/import_addpartition_blobstore_to_blobstore/export/exim_employee'
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
index 4a821ea7950..7fd9c74bf5f 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_local.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -112,10 +114,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_addpartition_blobstore_to_l
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT TABLE exim_employee PARTITION (emp_country='us')
FROM '### test.blobstore.path ###/import_addpartition_blobstore_to_local/export/exim_employee'
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
index 31745a0937e..59b07efddf4 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_blobstore_to_warehouse.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -112,10 +114,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_addpartition_blobstore_to_w
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT TABLE exim_employee PARTITION (emp_country='us')
FROM '### test.blobstore.path ###/import_addpartition_blobstore_to_warehouse/export/exim_employee'
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
index 8c689d4d42e..04e386dbe2c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_addpartition_local_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -112,10 +114,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=us
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT TABLE exim_employee PARTITION (emp_country='us')
#### A masked pattern was here ####
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
index 741eef5df3c..0887ed702d3 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -108,10 +110,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_blobstore_to_blobstore/expo
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT FROM '### test.blobstore.path ###/import_blobstore_to_blobstore/export/exim_employee'
#### A masked pattern was here ####
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore_nonpart.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore_nonpart.q.out
index d92b6c1719a..8852b646942 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore_nonpart.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_blobstore_nonpart.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
STORED AS TEXTFILE
@@ -60,10 +62,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_blobstore_to_blobstore_nonp
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT FROM '### test.blobstore.path ###/import_blobstore_to_blobstore_nonpart/export/exim_employee'
#### A masked pattern was here ####
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
index 00ab66b8bde..b476dbea73f 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_local.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -108,10 +110,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_blobstore_to_local/export/e
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT FROM '### test.blobstore.path ###/import_blobstore_to_local/export/exim_employee'
#### A masked pattern was here ####
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
index 01cae7ce8c0..fb6c165d2ee 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -108,10 +110,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_blobstore_to_warehouse/expo
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT FROM '### test.blobstore.path ###/import_blobstore_to_warehouse/export/exim_employee'
PREHOOK: type: IMPORT
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse_nonpart.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse_nonpart.q.out
index 9d0b059cf15..d49e65eedce 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse_nonpart.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_blobstore_to_warehouse_nonpart.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
STORED AS TEXTFILE
@@ -60,10 +62,12 @@ POSTHOOK: Output: ### test.blobstore.path ###/import_blobstore_to_warehouse_nonp
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: IMPORT FROM '### test.blobstore.path ###/import_blobstore_to_warehouse_nonpart/export/exim_employee'
PREHOOK: type: IMPORT
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
index 6e2b38bbcd6..f2ee9ee1f9a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/import_local_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE exim_employee (emp_id int COMMENT "employee id")
COMMENT "employee table"
PARTITIONED BY (emp_country string COMMENT "two char iso code")
@@ -108,10 +110,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=us
PREHOOK: query: DROP TABLE exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: DROP TABLE exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
#### A masked pattern was here ####
PREHOOK: type: IMPORT
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_blobstore_to_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_blobstore_to_blobstore.q.out
index 6b6a54be9ee..678f570856d 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_blobstore_to_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_blobstore_to_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source (
a string,
b string,
@@ -38,8 +40,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE blobstore_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_table LIKE blobstore_source
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_empty_into_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_empty_into_blobstore.q.out
index ccd9ba54001..6701dfad902 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_empty_into_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_empty_into_blobstore.q.out
@@ -1,15 +1,21 @@
PREHOOK: query: DROP TABLE empty
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE empty
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE blobstore_dynamic_partitioning
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_dynamic_partitioning
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE blobstore_list_bucketing
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_list_bucketing
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE empty (
id int,
name string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
index 4270b08784d..baa4d4a999c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: ### test.blobstore.path ###/table1
@@ -349,10 +351,12 @@ STAGE PLANS:
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
PREHOOK: query: CREATE TABLE table1 (name string, age int) PARTITIONED BY (country string, state string)
PREHOOK: type: CREATETABLE
@@ -463,16 +467,20 @@ Peter Mo 87 MEX SON
PREHOOK: query: DROP TABLE table2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table2
+PREHOOK: Output: database:default
PREHOOK: Output: default@table2
POSTHOOK: query: DROP TABLE table2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table2
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
index 4627940d737..fd15365e3ae 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: ### test.blobstore.path ###/table1
@@ -406,8 +408,10 @@ STAGE PLANS:
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
index 2eec9f2d78c..09602918d02 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE table1 (id int, key string) ROW FORMAT DELIMITED FIELDS TERMINATED BY ','
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
index a6322591833..77f8d6fa840 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: ### test.blobstore.path ###/table1
@@ -367,10 +369,12 @@ STAGE PLANS:
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
PREHOOK: query: CREATE TABLE table1 (name string, age int) PARTITIONED BY (country string, state string)
PREHOOK: type: CREATETABLE
@@ -544,16 +548,20 @@ Peter Mo 87 MEX SON
PREHOOK: query: DROP TABLE table2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table2
+PREHOOK: Output: database:default
PREHOOK: Output: default@table2
POSTHOOK: query: DROP TABLE table2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table2
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_move.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_move.q.out
index 6e6e0283514..4c335b62f4a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_move.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_move.q.out
@@ -127,16 +127,20 @@ u5 name5 2017-04-10 10002
PREHOOK: query: DROP TABLE s3_table_merge_move
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@s3_table_merge_move
+PREHOOK: Output: database:default
PREHOOK: Output: default@s3_table_merge_move
POSTHOOK: query: DROP TABLE s3_table_merge_move
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@s3_table_merge_move
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@s3_table_merge_move
PREHOOK: query: DROP TABLE tmp_table_merge_move
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tmp_table_merge_move
+PREHOOK: Output: database:default
PREHOOK: Output: default@tmp_table_merge_move
POSTHOOK: query: DROP TABLE tmp_table_merge_move
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tmp_table_merge_move
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tmp_table_merge_move
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_only.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_only.q.out
index 428cb2cae08..bd3ce31263a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_only.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_merge_only.q.out
@@ -117,16 +117,20 @@ u5 name5 2017-04-10 10001
PREHOOK: query: DROP TABLE s3_table_merge
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@s3_table_merge
+PREHOOK: Output: database:default
PREHOOK: Output: default@s3_table_merge
POSTHOOK: query: DROP TABLE s3_table_merge
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@s3_table_merge
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@s3_table_merge
PREHOOK: query: DROP TABLE tmp_table_merge
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tmp_table_merge
+PREHOOK: Output: database:default
PREHOOK: Output: default@tmp_table_merge
POSTHOOK: query: DROP TABLE tmp_table_merge
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tmp_table_merge
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tmp_table_merge
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_move_only.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_move_only.q.out
index c6cc769286a..79faebf78f7 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_move_only.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions_move_only.q.out
@@ -147,16 +147,20 @@ u5 name5 2017-04-12 10002
PREHOOK: query: DROP TABLE s3_table_move
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@s3_table_move
+PREHOOK: Output: database:default
PREHOOK: Output: default@s3_table_move
POSTHOOK: query: DROP TABLE s3_table_move
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@s3_table_move
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@s3_table_move
PREHOOK: query: DROP TABLE tmp_table_move
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tmp_table_move
+PREHOOK: Output: database:default
PREHOOK: Output: default@tmp_table_move
POSTHOOK: query: DROP TABLE tmp_table_move
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tmp_table_move
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tmp_table_move
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
index c68d0ea0eb9..3f06c01c7a9 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: ### test.blobstore.path ###/table1
@@ -414,8 +416,10 @@ STAGE PLANS:
PREHOOK: query: DROP TABLE table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table1
POSTHOOK: query: DROP TABLE table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table1
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/join.q.out b/itests/hive-blobstore/src/test/results/clientpositive/join.q.out
index c049185487a..7cedad55589 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/join.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/join.q.out
@@ -1,19 +1,27 @@
PREHOOK: query: DROP TABLE events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE profiled_users
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE profiled_users
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE page_profiles_latest
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE page_profiles_latest
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE page_profiles_out
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE page_profiles_out
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE events (
userUid string,
trackingId string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/join2.q.out b/itests/hive-blobstore/src/test/results/clientpositive/join2.q.out
index f5b9e3c459d..747b5ce9e62 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/join2.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/join2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE join_src
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE join_src
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE join_src (
key int,
value string)
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/load_data.q.out b/itests/hive-blobstore/src/test/results/clientpositive/load_data.q.out
index 6250c78db1d..af405063368 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/load_data.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/load_data.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE load_data_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE load_data_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE load_data_table(
a INT,
b STRING,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/map_join.q.out b/itests/hive-blobstore/src/test/results/clientpositive/map_join.q.out
index 02ede7225f0..c700f918c5a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/map_join.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/map_join.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE keyval1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE keyval1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE keyval2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE keyval2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE keyval1 (
key int,
value string)
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/map_join_on_filter.q.out b/itests/hive-blobstore/src/test/results/clientpositive/map_join_on_filter.q.out
index 653faab00aa..42db5d5225a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/map_join_on_filter.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/map_join_on_filter.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_a_data
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_a_data
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_a_data (
key int,
value string)
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/multiple_agg.q.out b/itests/hive-blobstore/src/test/results/clientpositive/multiple_agg.q.out
index 90991c90d98..b805a1f6432 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/multiple_agg.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/multiple_agg.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE birthdays
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE birthdays
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE birthdays (id INT, name STRING, birthday TIMESTAMP)
ROW FORMAT DELIMITED FIELDS TERMINATED BY ','
#### A masked pattern was here ####
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/multiple_db.q.out b/itests/hive-blobstore/src/test/results/clientpositive/multiple_db.q.out
index 28c41e12be4..e7b030057b7 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/multiple_db.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/multiple_db.q.out
@@ -30,8 +30,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:db1
PREHOOK: query: DROP TABLE test_db1_tbl
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:db1
POSTHOOK: query: DROP TABLE test_db1_tbl
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:db1
PREHOOK: query: CREATE TABLE test_db1_tbl (
a INT,
b STRING,
@@ -68,8 +70,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:db2
PREHOOK: query: DROP TABLE test_db2_tbl
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:db2
POSTHOOK: query: DROP TABLE test_db2_tbl
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:db2
PREHOOK: query: CREATE TABLE test_db2_tbl (a INT)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:db2
@@ -113,10 +117,12 @@ POSTHOOK: Input: db1@test_db1_tbl
PREHOOK: query: DROP TABLE test_db2_tbl
PREHOOK: type: DROPTABLE
PREHOOK: Input: db2@test_db2_tbl
+PREHOOK: Output: database:db2
PREHOOK: Output: db2@test_db2_tbl
POSTHOOK: query: DROP TABLE test_db2_tbl
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: db2@test_db2_tbl
+POSTHOOK: Output: database:db2
POSTHOOK: Output: db2@test_db2_tbl
PREHOOK: query: USE db1
PREHOOK: type: SWITCHDATABASE
@@ -127,8 +133,10 @@ POSTHOOK: Input: database:db1
PREHOOK: query: DROP TABLE test_db1_tbl
PREHOOK: type: DROPTABLE
PREHOOK: Input: db1@test_db1_tbl
+PREHOOK: Output: database:db1
PREHOOK: Output: db1@test_db1_tbl
POSTHOOK: query: DROP TABLE test_db1_tbl
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: db1@test_db1_tbl
+POSTHOOK: Output: database:db1
POSTHOOK: Output: db1@test_db1_tbl
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/nested_outer_join.q.out b/itests/hive-blobstore/src/test/results/clientpositive/nested_outer_join.q.out
index f06c0ee271f..ef52c339a4a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/nested_outer_join.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/nested_outer_join.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_a_data
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_a_data
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_a_data (
key int,
value string)
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/orc_buckets.q.out b/itests/hive-blobstore/src/test/results/clientpositive/orc_buckets.q.out
index 4a36522147a..56c20e7a32e 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/orc_buckets.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/orc_buckets.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE orc_buckets
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE orc_buckets
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE orc_buckets (a STRING, value DOUBLE)
PARTITIONED BY (b STRING)
CLUSTERED BY (a) INTO 10 BUCKETS
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/orc_format_nonpart.q.out b/itests/hive-blobstore/src/test/results/clientpositive/orc_format_nonpart.q.out
index 954a62ac895..044a9af14dc 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/orc_format_nonpart.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/orc_format_nonpart.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE orc_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE orc_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE orc_table (a INT, b STRING, value DOUBLE) STORED AS ORC
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/orc_format_part.q.out b/itests/hive-blobstore/src/test/results/clientpositive/orc_format_part.q.out
index 7d006c020e3..24238567b98 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/orc_format_part.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/orc_format_part.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_events
(
log_id BIGINT,
@@ -52,8 +54,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@src_events
PREHOOK: query: DROP TABLE orc_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE orc_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE orc_events
(
log_id BIGINT,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/orc_nonstd_partitions_loc.q.out b/itests/hive-blobstore/src/test/results/clientpositive/orc_nonstd_partitions_loc.q.out
index 0f952b48ade..831ff4f41b4 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/orc_nonstd_partitions_loc.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/orc_nonstd_partitions_loc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_events
(
log_id BIGINT,
@@ -52,8 +54,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@src_events
PREHOOK: query: DROP TABLE orc_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE orc_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE orc_events
(
log_id BIGINT,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/parquet_buckets.q.out b/itests/hive-blobstore/src/test/results/clientpositive/parquet_buckets.q.out
index 04bd57364bc..67163f6da9c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/parquet_buckets.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/parquet_buckets.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE parquet_buckets
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE parquet_buckets
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE parquet_buckets (a STRING, value DOUBLE)
PARTITIONED BY (b STRING)
CLUSTERED BY (a) INTO 10 BUCKETS
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_nonpart.q.out b/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_nonpart.q.out
index cba6b1a8268..28232a3b2a1 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_nonpart.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_nonpart.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE parquet_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE parquet_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE parquet_table (a INT, b STRING, value DOUBLE) STORED AS PARQUET
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_part.q.out b/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_part.q.out
index 71297618b80..09df96192ca 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_part.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/parquet_format_part.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_events
(
log_id BIGINT,
@@ -52,8 +54,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@src_events
PREHOOK: query: DROP TABLE parquet_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE parquet_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE parquet_events
(
log_id BIGINT,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/parquet_nonstd_partitions_loc.q.out b/itests/hive-blobstore/src/test/results/clientpositive/parquet_nonstd_partitions_loc.q.out
index 978238fcf43..319f6a9fa78 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/parquet_nonstd_partitions_loc.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/parquet_nonstd_partitions_loc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_events
(
log_id BIGINT,
@@ -52,8 +54,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@src_events
PREHOOK: query: DROP TABLE parquet_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE parquet_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE parquet_events
(
log_id BIGINT,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_general_queries.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_general_queries.q.out
index a73c3ce658e..709fef6899b 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_general_queries.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_general_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE part_tiny
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE part_tiny
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE part_tiny(
p_partkey INT,
p_name STRING,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_matchpath.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_matchpath.q.out
index ac0eaad43d5..d3e616ce34e 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_matchpath.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_matchpath.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE flights_tiny
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE flights_tiny
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE flights_tiny (
origin_city_name string,
dest_city_name string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_orcfile.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_orcfile.q.out
index 5cfe7737a0c..141fa56e24b 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_orcfile.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_orcfile.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE part_orc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE part_orc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE part_orc(
p_partkey int,
p_name string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_parquetfile.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_parquetfile.q.out
index 192b80f0acc..e6bc371329b 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_parquetfile.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_parquetfile.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE part_parquet
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE part_parquet
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE part_parquet(
p_partkey int,
p_name string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_persistence.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_persistence.q.out
index d685cf1dfca..96206366ff9 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_persistence.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_persistence.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE ptf_persistence_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE ptf_persistence_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE ptf_persistence_table(
key int,
value string)
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_rcfile.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_rcfile.q.out
index 4eb82a6c935..08df81f652c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_rcfile.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_rcfile.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE part_rc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE part_rc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE part_rc(
p_partkey int,
p_name string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/ptf_seqfile.q.out b/itests/hive-blobstore/src/test/results/clientpositive/ptf_seqfile.q.out
index 957b8b8a4d8..4aab1f6b32c 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/ptf_seqfile.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/ptf_seqfile.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE part_seq
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE part_seq
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE part_seq(
p_partkey int,
p_name string,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_buckets.q.out b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_buckets.q.out
index 569292bdb51..b6ec31af59d 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_buckets.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_buckets.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE rcfile_buckets
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE rcfile_buckets
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE rcfile_buckets (a STRING, value DOUBLE)
PARTITIONED BY (b STRING)
CLUSTERED BY (a) INTO 10 BUCKETS
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_nonpart.q.out b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_nonpart.q.out
index de5104bb51b..ffa53ea35fb 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_nonpart.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_nonpart.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source(a STRING, b STRING, c DOUBLE)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
@@ -32,8 +34,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE rcfile_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE rcfile_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE rcfile_table (a INT, b STRING, value DOUBLE) STORED AS RCFILE
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_part.q.out b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_part.q.out
index 843716f5c79..ecaa8a27c2f 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_part.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_format_part.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_events
(
log_id BIGINT,
@@ -52,8 +54,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@src_events
PREHOOK: query: DROP TABLE rcfile_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE rcfile_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE rcfile_events
(
log_id BIGINT,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_nonstd_partitions_loc.q.out b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_nonstd_partitions_loc.q.out
index 96fcffc43cb..10111f1c2b6 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/rcfile_nonstd_partitions_loc.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/rcfile_nonstd_partitions_loc.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE src_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE src_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE src_events
(
log_id BIGINT,
@@ -52,8 +54,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@src_events
PREHOOK: query: DROP TABLE rcfile_events
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE rcfile_events
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE rcfile_events
(
log_id BIGINT,
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
index 6ce72d65cf9..645abc27e21 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE IF EXISTS hdfs_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS hdfs_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS blobstore_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS blobstore_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE hdfs_table(key INT)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -539,16 +543,20 @@ STAGE PLANS:
PREHOOK: query: DROP TABLE hdfs_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@hdfs_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@hdfs_table
POSTHOOK: query: DROP TABLE hdfs_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@hdfs_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@hdfs_table
PREHOOK: query: DROP TABLE blobstore_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@blobstore_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@blobstore_table
POSTHOOK: query: DROP TABLE blobstore_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@blobstore_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@blobstore_table
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_blobstore.q.out
index 3425518e8ec..894c215679a 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_blobstore.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_blobstore.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source (
key int
)
@@ -28,8 +30,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE blobstore_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_target (
key int
)
diff --git a/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_hdfs.q.out b/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_hdfs.q.out
index 1aa68ddcbd8..b151844ecda 100644
--- a/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_hdfs.q.out
+++ b/itests/hive-blobstore/src/test/results/clientpositive/zero_rows_hdfs.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE blobstore_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE blobstore_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE blobstore_source (
key int
)
@@ -28,8 +30,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@blobstore_source
PREHOOK: query: DROP TABLE hdfs_target
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE hdfs_target
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE hdfs_target (
key int
)
diff --git a/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out b/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out
index c49fb742660..29942035010 100644
--- a/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out
+++ b/kudu-handler/src/test/results/positive/kudu_complex_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS kv_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS kv_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE kv_table(key int, value string)
STORED BY 'org.apache.hadoop.hive.kudu.KuduStorageHandler'
TBLPROPERTIES ("kudu.table_name" = "default.kudu_kv")
diff --git a/kudu-handler/src/test/results/positive/kudu_queries.q.out b/kudu-handler/src/test/results/positive/kudu_queries.q.out
index 4ec8c9465b3..c3bbfb59bb3 100644
--- a/kudu-handler/src/test/results/positive/kudu_queries.q.out
+++ b/kudu-handler/src/test/results/positive/kudu_queries.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS kv_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS kv_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE kv_table(key int, value string)
STORED BY 'org.apache.hadoop.hive.kudu.KuduStorageHandler'
TBLPROPERTIES ("kudu.table_name" = "default.kudu_kv")
@@ -84,15 +86,19 @@ POSTHOOK: Input: default@kv_table
PREHOOK: query: DROP TABLE kv_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@kv_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@kv_table
POSTHOOK: query: DROP TABLE kv_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@kv_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@kv_table
PREHOOK: query: DROP TABLE IF EXISTS all_types_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS all_types_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE all_types_table
STORED BY 'org.apache.hadoop.hive.kudu.KuduStorageHandler'
TBLPROPERTIES ("kudu.table_name" = "default.kudu_all_types")
@@ -1351,8 +1357,10 @@ Storage Desc Params:
PREHOOK: query: DROP TABLE all_types_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@all_types_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@all_types_table
POSTHOOK: query: DROP TABLE all_types_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@all_types_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@all_types_table
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/drop/DropTableAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/drop/DropTableAnalyzer.java
index b36ad17234f..2c7533d4094 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/drop/DropTableAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/drop/DropTableAnalyzer.java
@@ -18,8 +18,10 @@
package org.apache.hadoop.hive.ql.ddl.table.drop;
+import org.apache.hadoop.hive.common.TableName;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.ql.QueryState;
import org.apache.hadoop.hive.ql.ddl.DDLWork;
import org.apache.hadoop.hive.ql.ddl.DDLSemanticAnalyzerFactory.DDLType;
@@ -46,9 +48,16 @@ public class DropTableAnalyzer extends BaseSemanticAnalyzer {
@Override
public void analyzeInternal(ASTNode root) throws SemanticException {
- String tableName = getUnescapedName((ASTNode) root.getChild(0));
+ TableName qualTabName = getQualifiedTableName((ASTNode) root.getChild(0));
+ String tableName = qualTabName.getNotEmptyDbTable();
boolean ifExists = (root.getFirstChildWithType(HiveParser.TOK_IFEXISTS) != null);
boolean throwException = !ifExists && !HiveConf.getBoolVar(conf, ConfVars.DROP_IGNORES_NON_EXISTENT);
+ //Authorize database for drop table command
+ // Skip db object if database doesn't exist
+ Database database = getDatabase(qualTabName.getDb(),false);
+ if (database != null) {
+ outputs.add(new WriteEntity(database, WriteType.DDL_SHARED));
+ }
Table table = getTable(tableName, throwException);
if (table != null) {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
index 5f046946e1e..1eac6a44694 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
@@ -263,14 +263,14 @@ public class TestDbTxnManager2 extends DbTxnManagerEndToEndTestBase{
//tries to get X lock on T1 and gets Waiting state
((DbTxnManager) txnMgr2).acquireLocks(driver.getPlan(), ctx, "Fiddler", false);
List<ShowLocksResponseElement> locks = getLocks();
- Assert.assertEquals("Unexpected lock count", 2, locks.size());
+ Assert.assertEquals("Unexpected lock count", 3, locks.size());
checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "default", "T6", null, locks);
checkLock(LockType.EXCLUSIVE, LockState.WAITING, "default", "T6", null, locks);
txnMgr.rollbackTxn(); //release S on T6
//attempt to X on T6 again - succeed
((DbLockManager)txnMgr.getLockManager()).checkLock(locks.get(1).getLockid());
locks = getLocks();
- Assert.assertEquals("Unexpected lock count", 1, locks.size());
+ Assert.assertEquals("Unexpected lock count", 2, locks.size());
checkLock(LockType.EXCLUSIVE, LockState.ACQUIRED, "default", "T6", null, locks);
txnMgr2.rollbackTxn();
driver.run("drop table if exists T6");
@@ -394,11 +394,11 @@ public class TestDbTxnManager2 extends DbTxnManagerEndToEndTestBase{
driver.compileAndRespond("drop table TAB_BLOCKED", true);
((DbTxnManager)txnMgr2).acquireLocks(driver.getPlan(), ctx, "SAM I AM", false); //make non-blocking
locks = getLocks();
- Assert.assertEquals("Unexpected lock count", 2, locks.size());
+ Assert.assertEquals("Unexpected lock count", 3, locks.size());
checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "default", "TAB_BLOCKED", null, locks);
checkLock(LockType.EXCLUSIVE, LockState.WAITING, "default", "TAB_BLOCKED", null, locks);
- Assert.assertEquals("BlockedByExtId doesn't match", locks.get(0).getLockid(), locks.get(1).getBlockedByExtId());
- Assert.assertEquals("BlockedByIntId doesn't match", locks.get(0).getLockIdInternal(), locks.get(1).getBlockedByIntId());
+ Assert.assertEquals("BlockedByExtId doesn't match", locks.get(0).getLockid(), locks.get(2).getBlockedByExtId());
+ Assert.assertEquals("BlockedByIntId doesn't match", locks.get(0).getLockIdInternal(), locks.get(2).getBlockedByIntId());
}
@Test
@@ -3130,7 +3130,7 @@ public class TestDbTxnManager2 extends DbTxnManagerEndToEndTestBase{
//tries to get X lock on T6 and gets Waiting state
((DbTxnManager) txnMgr2).acquireLocks(driver.getPlan(), ctx, "Fiddler", false);
List<ShowLocksResponseElement> locks = getLocks();
- Assert.assertEquals("Unexpected lock count", 2, locks.size());
+ Assert.assertEquals("Unexpected lock count", 3, locks.size());
checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "default", "T6", null, locks);
long extLockId = checkLock(LockType.EXCLUSIVE, LockState.WAITING, "default", "T6", null, locks).getLockid();
@@ -3151,7 +3151,7 @@ public class TestDbTxnManager2 extends DbTxnManagerEndToEndTestBase{
ex.getMessage());
}
locks = getLocks();
- Assert.assertEquals("Unexpected lock count", (zeroWaitRead ? 2 : 3), locks.size());
+ Assert.assertEquals("Unexpected lock count", (zeroWaitRead ? 3 : 4), locks.size());
checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "default", "T6", null, locks);
if (!zeroWaitRead) {
checkLock(LockType.SHARED_READ, LockState.WAITING, "default", "T6", null, locks);
@@ -3761,7 +3761,7 @@ public class TestDbTxnManager2 extends DbTxnManagerEndToEndTestBase{
}
driver2.lockAndRespond();
locks = getLocks();
- Assert.assertEquals("Unexpected lock count", 1, locks.size());
+ Assert.assertEquals("Unexpected lock count", 2, locks.size());
checkLock(blocking ? LockType.EXCLUSIVE : LockType.EXCL_WRITE,
LockState.ACQUIRED, "default", "tab_acid", null, locks);
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_1.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_1.q
new file mode 100644
index 00000000000..5f8797fd8e9
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_1.q
@@ -0,0 +1,9 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+
+-- Drop non-existing table WITHOUT DB Drop Privileges
+
+CREATE DATABASE auth_db_fail;
+
+set hive.security.authorization.enabled=true;
+
+DROP TABLE auth_db_fail.auth_permanent_table;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_10.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_10.q
new file mode 100644
index 00000000000..9205e11f80f
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_10.q
@@ -0,0 +1,11 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=false;
+
+CREATE DATABASE auth_db_fail_4;
+use auth_db_fail_4;
+create temporary table drop_table_temp_4 (key int, value string) partitioned by (ds string);
+
+-- Drop temporary table from current database with IF EXISTS
+
+set hive.security.authorization.enabled=true;
+DROP TABLE IF EXISTS drop_table_temp_4;
\ No newline at end of file
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_11.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_11.q
new file mode 100644
index 00000000000..650a470008d
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_11.q
@@ -0,0 +1,12 @@
+set hive.exec.drop.ignorenonexistent=false;
+
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+
+-- Drop non-existing table
+
+CREATE DATABASE auth_db_fail;
+GRANT DROP ON DATABASE auth_db_fail TO USER hive_test_user;
+
+set hive.security.authorization.enabled=true;
+
+DROP TABLE auth_db_fail.auth_permanent_table;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_2.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_2.q
new file mode 100644
index 00000000000..72bdca17b8c
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_2.q
@@ -0,0 +1,9 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+
+CREATE DATABASE auth_db_fail_1;
+
+set hive.security.authorization.enabled=true;
+
+-- Drop non-existing table with IF EXISTS clause WITHOUT DB Drop Privileges
+
+DROP TABLE IF EXISTS auth_db_fail_1.auth_permanent_table;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_3.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_3.q
new file mode 100644
index 00000000000..d3205c85f4a
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_3.q
@@ -0,0 +1,9 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+
+create table drop_table_auth_fail_1 (key int, value string) partitioned by (ds string);
+
+-- Drop existing table WITHOUT DB Drop Privileges
+
+set hive.security.authorization.enabled=true;
+
+DROP TABLE drop_table_auth_fail_1;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_4.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_4.q
new file mode 100644
index 00000000000..f024d7852a0
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_4.q
@@ -0,0 +1,9 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+
+create table drop_table_auth_fail_2 (key int, value string);
+
+-- Drop existing regular table with IF EXISTS WITHOUT DB Drop Privileges
+
+set hive.security.authorization.enabled=true;
+
+DROP TABLE IF EXISTS drop_table_auth_fail_2;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_5.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_5.q
new file mode 100644
index 00000000000..3b6e90e2d1a
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_5.q
@@ -0,0 +1,9 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=false;
+
+CREATE TEMPORARY TABLE auth_temp_table_1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+
+-- Drop temporary table WITHOUT DB Drop Privileges
+
+set hive.security.authorization.enabled=true;
+DROP TABLE auth_temp_table_1;
\ No newline at end of file
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_6.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_6.q
new file mode 100644
index 00000000000..094671faeb1
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_6.q
@@ -0,0 +1,9 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=false;
+
+CREATE TEMPORARY TABLE auth_temp_table_2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+
+-- Drop temporary table with IF EXISTS WITHOUT DB Drop Privileges
+
+set hive.security.authorization.enabled=true;
+DROP TABLE IF EXISTS auth_temp_table_2;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_7.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_7.q
new file mode 100644
index 00000000000..7f6cf338de7
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_7.q
@@ -0,0 +1,11 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=false;
+
+CREATE DATABASE auth_db_fail_1;
+use auth_db_fail_1;
+create table drop_table_auth_3 (key int, value string) partitioned by (ds string);
+
+-- Drop existing regular table from current database
+
+set hive.security.authorization.enabled=true;
+DROP TABLE drop_table_auth_3;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_8.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_8.q
new file mode 100644
index 00000000000..4e8081152fc
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_8.q
@@ -0,0 +1,11 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=false;
+
+CREATE DATABASE auth_db_fail_2;
+use auth_db_fail_2;
+create table drop_table_auth_4 (key int, value string) partitioned by (ds string);
+
+-- Drop existing regular table with IF EXISTS from current database
+
+set hive.security.authorization.enabled=true;
+DROP TABLE IF EXISTS drop_table_auth_4;
diff --git a/ql/src/test/queries/clientnegative/authorization_droptable_fail_9.q b/ql/src/test/queries/clientnegative/authorization_droptable_fail_9.q
new file mode 100644
index 00000000000..8ecf9121998
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/authorization_droptable_fail_9.q
@@ -0,0 +1,11 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=false;
+
+CREATE DATABASE auth_db_fail_3;
+use auth_db_fail_3;
+create temporary table drop_table_temp_3 (key int, value string) partitioned by (ds string);
+
+-- Drop temporary table from current database
+
+set hive.security.authorization.enabled=true;
+DROP TABLE drop_table_temp_3;
\ No newline at end of file
diff --git a/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q b/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q
index a00cc394ba2..700b5374c47 100644
--- a/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q
+++ b/ql/src/test/queries/clientpositive/alter_rename_partition_authorization.q
@@ -13,6 +13,7 @@ grant select on table src_auth_tmp_n1 to user hive_test_user;
grant Create on table authorization_part_n1 to user hive_test_user;
grant Update on table authorization_part_n1 to user hive_test_user;
grant Drop on table authorization_part_n1 to user hive_test_user;
+GRANT drop ON DATABASE default TO USER hive_test_user;
show grant user hive_test_user on table authorization_part_n1;
grant select(key) on table authorization_part_n1 to user hive_test_user;
diff --git a/ql/src/test/queries/clientpositive/authorization_4.q b/ql/src/test/queries/clientpositive/authorization_4.q
index a5a65aedecc..5ec32c47484 100644
--- a/ql/src/test/queries/clientpositive/authorization_4.q
+++ b/ql/src/test/queries/clientpositive/authorization_4.q
@@ -10,6 +10,7 @@ grant All on table src_autho_test_n2 to user hive_test_user;
set hive.security.authorization.enabled=true;
show grant user hive_test_user on table src_autho_test_n2;
+GRANT drop ON DATABASE default TO USER hive_test_user;
select key from src_autho_test_n2 order by key limit 20;
diff --git a/ql/src/test/queries/clientpositive/authorization_drop_table.q b/ql/src/test/queries/clientpositive/authorization_drop_table.q
new file mode 100644
index 00000000000..b5be584fde7
--- /dev/null
+++ b/ql/src/test/queries/clientpositive/authorization_drop_table.q
@@ -0,0 +1,89 @@
+set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
+set hive.security.authorization.enabled=true;
+
+-- Drop table command for non-existing DB
+
+DROP TABLE auth_db.auth_permanent_table;
+
+-- Drop table command for non-existing DB
+
+DROP TABLE IF EXISTS auth_db.auth_permanent_table;
+
+-- Drop non-existing table with DB Drop Privileges
+
+set hive.security.authorization.enabled=false;
+
+CREATE DATABASE auth_db;
+GRANT DROP ON DATABASE auth_db TO USER hive_test_user;
+
+set hive.security.authorization.enabled=true;
+
+DROP TABLE auth_db.auth_permanent_table;
+
+-- Drop non-existing table with IF EXISTS clause with DB Drop Privileges
+
+DROP TABLE IF EXISTS auth_db.auth_permanent_table;
+
+--- Create tables for test
+
+set hive.security.authorization.enabled=false;
+
+create table auth_db.drop_table_auth_1 (key int, value string) partitioned by (ds string);
+create table auth_db.drop_table_auth_2 (key int, value string);
+CREATE TEMPORARY TABLE auth_temp_table_1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+CREATE TEMPORARY TABLE auth_temp_table_2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+
+-- Drop existing regular table
+
+set hive.security.authorization.enabled=true;
+DROP TABLE auth_db.drop_table_auth_1;
+
+-- Drop existing regular table with IF EXISTS
+
+DROP TABLE IF EXISTS auth_db.drop_table_auth_2;
+
+-- Drop temporary table
+
+DROP TABLE auth_db.auth_temp_table_1;
+
+-- Drop temporary table with IF EXISTS
+
+DROP TABLE IF EXISTS auth_db.auth_temp_table_2;
+
+
+-- Drop non-existing table from current database
+
+set hive.security.authorization.enabled=false;
+
+CREATE DATABASE auth_db_1;
+use auth_db_1;
+GRANT DROP ON DATABASE auth_db_1 TO USER hive_test_user;
+
+create table drop_table_auth_3 (key int, value string) partitioned by (ds string);
+create table drop_table_auth_4 (key int, value string);
+CREATE TEMPORARY TABLE auth_temp_table_1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+CREATE TEMPORARY TABLE auth_temp_table_2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE;
+
+set hive.security.authorization.enabled=true;
+
+DROP TABLE auth_temp_table;
+
+-- Drop non-existing table with IF EXISTS from current database
+
+DROP TABLE IF EXISTS auth_temp_table;
+
+-- Drop existing regular table from current database
+
+DROP TABLE drop_table_auth_3;
+
+-- Drop existing regular table with IF EXISTS from current database
+
+DROP TABLE IF EXISTS drop_table_auth_4;
+
+-- Drop temporary table from current database
+
+DROP TABLE auth_temp_table_1;
+
+-- Drop temporary table with IF EXISTS from current database
+
+DROP TABLE IF EXISTS auth_temp_table_2;
diff --git a/ql/src/test/queries/clientpositive/encryption_ctas.q b/ql/src/test/queries/clientpositive/encryption_ctas.q
index f3314aadf89..831614290f9 100644
--- a/ql/src/test/queries/clientpositive/encryption_ctas.q
+++ b/ql/src/test/queries/clientpositive/encryption_ctas.q
@@ -1,6 +1,5 @@
--! qt:dataset:src
-DROP TABLE IF EXISTS testCT.encrypted_tablectas PURGE;
-DROP DATABASE IF EXISTS testCT;
+DROP DATABASE IF EXISTS testCT CASCADE;
CREATE DATABASE testCT;
dfs ${system:test.dfs.mkdir} ${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_tablectas;
diff --git a/ql/src/test/results/clientnegative/alter_table_non_partitioned_table_cascade.q.out b/ql/src/test/results/clientnegative/alter_table_non_partitioned_table_cascade.q.out
index afa648dfde1..66f782db8d8 100644
--- a/ql/src/test/results/clientnegative/alter_table_non_partitioned_table_cascade.q.out
+++ b/ql/src/test/results/clientnegative/alter_table_non_partitioned_table_cascade.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists alter_table_non_partition_cascade
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists alter_table_non_partition_cascade
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table alter_table_non_partitioned_cascade(c1 string, c2 string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out b/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out
index cdf9e58c2ad..742d9f7e831 100644
--- a/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out
+++ b/ql/src/test/results/clientnegative/alter_table_wrong_regex.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table aa
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table aa
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: 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/ql/src/test/results/clientnegative/archive2.q.out b/ql/src/test/results/clientnegative/archive2.q.out
index 41e66f4daac..2ab2cb6128e 100644
--- a/ql/src/test/results/clientnegative/archive2.q.out
+++ b/ql/src/test/results/clientnegative/archive2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrcpart like srcpart
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/archive_corrupt.q.out b/ql/src/test/results/clientnegative/archive_corrupt.q.out
index 892fbac9a19..5ede9c7efe0 100644
--- a/ql/src/test/results/clientnegative/archive_corrupt.q.out
+++ b/ql/src/test/results/clientnegative/archive_corrupt.q.out
@@ -6,8 +6,10 @@ POSTHOOK: type: SWITCHDATABASE
POSTHOOK: Input: database:default
PREHOOK: query: drop table tstsrcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrcpart like srcpart
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/archive_multi2.q.out b/ql/src/test/results/clientnegative/archive_multi2.q.out
index f226cc26d0d..e70ecae9b8c 100644
--- a/ql/src/test/results/clientnegative/archive_multi2.q.out
+++ b/ql/src/test/results/clientnegative/archive_multi2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrcpart like srcpart
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_1.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_1.q.out
new file mode 100644
index 00000000000..782aaf2daf8
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_1.q.out
@@ -0,0 +1,7 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail
+POSTHOOK: query: CREATE DATABASE auth_db_fail
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail
+Authorization failed:No privilege 'Drop' found for outputs { database:auth_db_fail}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_10.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_10.q.out
new file mode 100644
index 00000000000..003b450e98c
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_10.q.out
@@ -0,0 +1,21 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail_4
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail_4
+POSTHOOK: query: CREATE DATABASE auth_db_fail_4
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail_4
+PREHOOK: query: use auth_db_fail_4
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:auth_db_fail_4
+POSTHOOK: query: use auth_db_fail_4
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:auth_db_fail_4
+PREHOOK: query: create temporary table drop_table_temp_4 (key int, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: auth_db_fail_4@drop_table_temp_4
+PREHOOK: Output: database:auth_db_fail_4
+POSTHOOK: query: create temporary table drop_table_temp_4 (key int, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: auth_db_fail_4@drop_table_temp_4
+POSTHOOK: Output: database:auth_db_fail_4
+Authorization failed:No privilege 'Drop' found for outputs { database:auth_db_fail_4}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_11.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_11.q.out
new file mode 100644
index 00000000000..36141290d7f
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_11.q.out
@@ -0,0 +1,11 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail
+POSTHOOK: query: CREATE DATABASE auth_db_fail
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail
+PREHOOK: query: GRANT DROP ON DATABASE auth_db_fail TO USER hive_test_user
+PREHOOK: type: GRANT_PRIVILEGE
+POSTHOOK: query: GRANT DROP ON DATABASE auth_db_fail TO USER hive_test_user
+POSTHOOK: type: GRANT_PRIVILEGE
+FAILED: SemanticException [Error 10001]: Table not found auth_db_fail.auth_permanent_table
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_2.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_2.q.out
new file mode 100644
index 00000000000..354984706ac
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_2.q.out
@@ -0,0 +1,7 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail_1
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail_1
+POSTHOOK: query: CREATE DATABASE auth_db_fail_1
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail_1
+Authorization failed:No privilege 'Drop' found for outputs { database:auth_db_fail_1}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_3.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_3.q.out
new file mode 100644
index 00000000000..85c6d09262e
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_3.q.out
@@ -0,0 +1,9 @@
+PREHOOK: query: create table drop_table_auth_fail_1 (key int, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@drop_table_auth_fail_1
+POSTHOOK: query: create table drop_table_auth_fail_1 (key int, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@drop_table_auth_fail_1
+Authorization failed:No privilege 'Drop' found for outputs { database:default}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_4.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_4.q.out
new file mode 100644
index 00000000000..011b84b5557
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_4.q.out
@@ -0,0 +1,9 @@
+PREHOOK: query: create table drop_table_auth_fail_2 (key int, value string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@drop_table_auth_fail_2
+POSTHOOK: query: create table drop_table_auth_fail_2 (key int, value string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@drop_table_auth_fail_2
+Authorization failed:No privilege 'Drop' found for outputs { database:default}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_5.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_5.q.out
new file mode 100644
index 00000000000..6305bc6e3de
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_5.q.out
@@ -0,0 +1,9 @@
+PREHOOK: query: CREATE TEMPORARY TABLE auth_temp_table_1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@auth_temp_table_1
+POSTHOOK: query: CREATE TEMPORARY TABLE auth_temp_table_1(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@auth_temp_table_1
+Authorization failed:No privilege 'Drop' found for outputs { database:default}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_6.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_6.q.out
new file mode 100644
index 00000000000..e2d68df3e02
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_6.q.out
@@ -0,0 +1,9 @@
+PREHOOK: query: CREATE TEMPORARY TABLE auth_temp_table_2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@auth_temp_table_2
+POSTHOOK: query: CREATE TEMPORARY TABLE auth_temp_table_2(key STRING, c1 INT, c2 STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@auth_temp_table_2
+Authorization failed:No privilege 'Drop' found for outputs { database:default}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_7.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_7.q.out
new file mode 100644
index 00000000000..2a8bbb2df3b
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_7.q.out
@@ -0,0 +1,21 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail_1
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail_1
+POSTHOOK: query: CREATE DATABASE auth_db_fail_1
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail_1
+PREHOOK: query: use auth_db_fail_1
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:auth_db_fail_1
+POSTHOOK: query: use auth_db_fail_1
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:auth_db_fail_1
+PREHOOK: query: create table drop_table_auth_3 (key int, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: auth_db_fail_1@drop_table_auth_3
+PREHOOK: Output: database:auth_db_fail_1
+POSTHOOK: query: create table drop_table_auth_3 (key int, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: auth_db_fail_1@drop_table_auth_3
+POSTHOOK: Output: database:auth_db_fail_1
+Authorization failed:No privilege 'Drop' found for outputs { database:auth_db_fail_1}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_8.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_8.q.out
new file mode 100644
index 00000000000..f709494cd1f
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_8.q.out
@@ -0,0 +1,21 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail_2
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail_2
+POSTHOOK: query: CREATE DATABASE auth_db_fail_2
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail_2
+PREHOOK: query: use auth_db_fail_2
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:auth_db_fail_2
+POSTHOOK: query: use auth_db_fail_2
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:auth_db_fail_2
+PREHOOK: query: create table drop_table_auth_4 (key int, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: auth_db_fail_2@drop_table_auth_4
+PREHOOK: Output: database:auth_db_fail_2
+POSTHOOK: query: create table drop_table_auth_4 (key int, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: auth_db_fail_2@drop_table_auth_4
+POSTHOOK: Output: database:auth_db_fail_2
+Authorization failed:No privilege 'Drop' found for outputs { database:auth_db_fail_2}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_droptable_fail_9.q.out b/ql/src/test/results/clientnegative/authorization_droptable_fail_9.q.out
new file mode 100644
index 00000000000..09c327d0b3c
--- /dev/null
+++ b/ql/src/test/results/clientnegative/authorization_droptable_fail_9.q.out
@@ -0,0 +1,21 @@
+PREHOOK: query: CREATE DATABASE auth_db_fail_3
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:auth_db_fail_3
+POSTHOOK: query: CREATE DATABASE auth_db_fail_3
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:auth_db_fail_3
+PREHOOK: query: use auth_db_fail_3
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:auth_db_fail_3
+POSTHOOK: query: use auth_db_fail_3
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:auth_db_fail_3
+PREHOOK: query: create temporary table drop_table_temp_3 (key int, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: auth_db_fail_3@drop_table_temp_3
+PREHOOK: Output: database:auth_db_fail_3
+POSTHOOK: query: create temporary table drop_table_temp_3 (key int, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: auth_db_fail_3@drop_table_temp_3
+POSTHOOK: Output: database:auth_db_fail_3
+Authorization failed:No privilege 'Drop' found for outputs { database:auth_db_fail_3}. Use SHOW GRANT to get more details.
diff --git a/ql/src/test/results/clientnegative/authorization_import.q.out b/ql/src/test/results/clientnegative/authorization_import.q.out
index 30a2be39736..0fd171daa6c 100644
--- a/ql/src/test/results/clientnegative/authorization_import.q.out
+++ b/ql/src/test/results/clientnegative/authorization_import.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists import_auth_t1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists import_auth_t1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table import_auth_t1 ( dep_id int comment "department id") stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/authorization_sba_drop_table.q.out b/ql/src/test/results/clientnegative/authorization_sba_drop_table.q.out
index f28a896bcb0..ba7fba584e8 100644
--- a/ql/src/test/results/clientnegative/authorization_sba_drop_table.q.out
+++ b/ql/src/test/results/clientnegative/authorization_sba_drop_table.q.out
@@ -11,5 +11,6 @@ POSTHOOK: Output: default@t1
PREHOOK: query: drop table t1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@t1
+PREHOOK: Output: database:default
PREHOOK: Output: default@t1
#### A masked pattern was here ####
diff --git a/ql/src/test/results/clientnegative/avro_decimal.q.out b/ql/src/test/results/clientnegative/avro_decimal.q.out
index 69ff810b2e2..1db8934cfc7 100644
--- a/ql/src/test/results/clientnegative/avro_decimal.q.out
+++ b/ql/src/test/results/clientnegative/avro_decimal.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS avro_dec
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS avro_dec
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE `avro_dec`(
`name` string COMMENT 'from deserializer',
`value` decimal(5,2) COMMENT 'from deserializer')
diff --git a/ql/src/test/results/clientnegative/avro_decimal1.q.out b/ql/src/test/results/clientnegative/avro_decimal1.q.out
index 5e012efbb91..980739c639c 100644
--- a/ql/src/test/results/clientnegative/avro_decimal1.q.out
+++ b/ql/src/test/results/clientnegative/avro_decimal1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS avro_dec
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS avro_dec
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE `avro_dec`(
`name` string COMMENT 'from deserializer',
`value` decimal(5,2) COMMENT 'from deserializer')
diff --git a/ql/src/test/results/clientnegative/avro_decimal2.q.out b/ql/src/test/results/clientnegative/avro_decimal2.q.out
index 57b61a25202..ab8c6dd3af3 100644
--- a/ql/src/test/results/clientnegative/avro_decimal2.q.out
+++ b/ql/src/test/results/clientnegative/avro_decimal2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS avro_dec
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS avro_dec
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE `avro_dec`(
`name` string COMMENT 'from deserializer',
`value` decimal(5,2) COMMENT 'from deserializer')
diff --git a/ql/src/test/results/clientnegative/avro_non_nullable_union.q.out b/ql/src/test/results/clientnegative/avro_non_nullable_union.q.out
index 0dcebb7a267..ae3fae6eb68 100644
--- a/ql/src/test/results/clientnegative/avro_non_nullable_union.q.out
+++ b/ql/src/test/results/clientnegative/avro_non_nullable_union.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS union_nullable_test_text
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS union_nullable_test_text
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE union_nullable_test_text (id int, value uniontype<int,double>) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' COLLECTION ITEMS TERMINATED BY ':' STORED AS textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -20,8 +22,10 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@union_nullable_test_text
PREHOOK: query: DROP TABLE IF EXISTS union_non_nullable_test_avro
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS union_non_nullable_test_avro
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE union_non_nullable_test_avro STORED AS avro tblproperties('avro.schema.literal'='{"name":"nullable", "type":"record", "fields":[{"name":"id", "type":"int"}, {"name":"value", "type":["int", "double"]}]}')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/column_rename1.q.out b/ql/src/test/results/clientnegative/column_rename1.q.out
index 1f0c5cf2d2f..19d59e252c9 100644
--- a/ql/src/test/results/clientnegative/column_rename1.q.out
+++ b/ql/src/test/results/clientnegative/column_rename1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrc like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/column_rename2.q.out b/ql/src/test/results/clientnegative/column_rename2.q.out
index 2fef0739241..7697c1fdee8 100644
--- a/ql/src/test/results/clientnegative/column_rename2.q.out
+++ b/ql/src/test/results/clientnegative/column_rename2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrc like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/column_rename4.q.out b/ql/src/test/results/clientnegative/column_rename4.q.out
index afed2146ebf..9fd1f728321 100644
--- a/ql/src/test/results/clientnegative/column_rename4.q.out
+++ b/ql/src/test/results/clientnegative/column_rename4.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrc like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_dp_lowercase.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_dp_lowercase.q.out
index 50faac9fa81..2f41aaca77c 100644
--- a/ql/src/test/results/clientnegative/columnstats_partlvl_dp_lowercase.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_partlvl_dp_lowercase.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE Employee_Part_n0
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE Employee_Part_n0
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE Employee_Part_n0(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
row format delimited fields terminated by '|' stored as textfile
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out
index 3261f78fab2..e04b680eb64 100644
--- a/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE Employee_Part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE Employee_Part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
row format delimited fields terminated by '|' stored as textfile
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values_autogather.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values_autogather.q.out
index 3261f78fab2..e04b680eb64 100644
--- a/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values_autogather.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_partlvl_invalid_values_autogather.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE Employee_Part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE Employee_Part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
row format delimited fields terminated by '|' stored as textfile
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out b/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
index 5252e6ca07e..99acb097416 100644
--- a/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE Employee_Part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE Employee_Part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE Employee_Part(employeeID int, employeeName String) partitioned by (employeeSalary double, country string)
row format delimited fields terminated by '|' stored as textfile
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out b/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out
index 5aa4ae6404f..9c3d90b0371 100644
--- a/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_tbllvl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS UserVisits_web_text_none
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS UserVisits_web_text_none
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE UserVisits_web_text_none (
sourceIP string,
destURL string,
diff --git a/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out b/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out
index 8956bea566e..383c804e865 100644
--- a/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_tbllvl_complex_type.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS table_complex_type
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS table_complex_type
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE table_complex_type (
a STRING,
b ARRAY<STRING>,
diff --git a/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out b/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out
index 5aa4ae6404f..9c3d90b0371 100644
--- a/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_tbllvl_incorrect_column.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS UserVisits_web_text_none
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS UserVisits_web_text_none
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE UserVisits_web_text_none (
sourceIP string,
destURL string,
diff --git a/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out b/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out
index 7de34c5c483..5410d29d306 100644
--- a/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out
+++ b/ql/src/test/results/clientnegative/create_table_wrong_regex.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table aa
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table aa
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: 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/ql/src/test/results/clientnegative/ctasnullcol.q.out b/ql/src/test/results/clientnegative/ctasnullcol.q.out
index 1195aaf57cd..c24d2efd54a 100644
--- a/ql/src/test/results/clientnegative/ctasnullcol.q.out
+++ b/ql/src/test/results/clientnegative/ctasnullcol.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: drop table if exists orc_table_with_null
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists orc_table_with_null
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: SemanticException [Error 10305]: CREATE-TABLE-AS-SELECT creates a VOID type, please use CAST to specify the type, near field: _c1
diff --git a/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out b/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out
index 098aae6b4df..73f870049fb 100644
--- a/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out
+++ b/ql/src/test/results/clientnegative/dbtxnmgr_notablelock.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists drop_notablelock
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists drop_notablelock
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table drop_notablelock (c int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out b/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out
index 8211dd470e9..428d2a625d9 100644
--- a/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out
+++ b/ql/src/test/results/clientnegative/dbtxnmgr_notableunlock.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists drop_notableunlock
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists drop_notableunlock
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table drop_notableunlock (c int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/decimal_precision.q.out b/ql/src/test/results/clientnegative/decimal_precision.q.out
index baadfdc3a76..eae79226273 100644
--- a/ql/src/test/results/clientnegative/decimal_precision.q.out
+++ b/ql/src/test/results/clientnegative/decimal_precision.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE DECIMAL_PRECISION(`dec` decimal)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
diff --git a/ql/src/test/results/clientnegative/decimal_precision_1.q.out b/ql/src/test/results/clientnegative/decimal_precision_1.q.out
index 569f9cdae5f..53dfc5b9df4 100644
--- a/ql/src/test/results/clientnegative/decimal_precision_1.q.out
+++ b/ql/src/test/results/clientnegative/decimal_precision_1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE DECIMAL_PRECISION(`dec` decimal)
ROW FORMAT DELIMITED
FIELDS TERMINATED BY ' '
diff --git a/ql/src/test/results/clientnegative/distinct_windowing_failure1.q.out b/ql/src/test/results/clientnegative/distinct_windowing_failure1.q.out
index ddf9f77b0b9..1f56ecc9a52 100644
--- a/ql/src/test/results/clientnegative/distinct_windowing_failure1.q.out
+++ b/ql/src/test/results/clientnegative/distinct_windowing_failure1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table over10k
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table over10k
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table over10k(
t tinyint,
si smallint,
diff --git a/ql/src/test/results/clientnegative/distinct_windowing_failure2.q.out b/ql/src/test/results/clientnegative/distinct_windowing_failure2.q.out
index 0493e209cc6..0342fa95435 100644
--- a/ql/src/test/results/clientnegative/distinct_windowing_failure2.q.out
+++ b/ql/src/test/results/clientnegative/distinct_windowing_failure2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table over10k
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table over10k
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table over10k(
t tinyint,
si smallint,
diff --git a/ql/src/test/results/clientnegative/drop_table_failure1.q.out b/ql/src/test/results/clientnegative/drop_table_failure1.q.out
index b744332e6c6..b829f1d3376 100644
--- a/ql/src/test/results/clientnegative/drop_table_failure1.q.out
+++ b/ql/src/test/results/clientnegative/drop_table_failure1.q.out
@@ -1 +1 @@
-FAILED: SemanticException [Error 10001]: Table not found UnknownTable
+FAILED: SemanticException [Error 10001]: Table not found default.UnknownTable
diff --git a/ql/src/test/results/clientnegative/drop_table_failure2.q.out b/ql/src/test/results/clientnegative/drop_table_failure2.q.out
index 6abfc4b06b9..77eb3a5068f 100644
--- a/ql/src/test/results/clientnegative/drop_table_failure2.q.out
+++ b/ql/src/test/results/clientnegative/drop_table_failure2.q.out
@@ -12,5 +12,6 @@ POSTHOOK: Lineage: xxx6.key SIMPLE [(src)src.FieldSchema(name:key, type:string,
PREHOOK: query: DROP TABLE xxx6
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@xxx6
+PREHOOK: Output: database:default
PREHOOK: Output: default@xxx6
FAILED: Execution Error, return code 40000 from org.apache.hadoop.hive.ql.ddl.DDLTask. Cannot drop a view with DROP TABLE
diff --git a/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out b/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
index 42f21b97632..4fe29bd7df2 100644
--- a/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
+++ b/ql/src/test/results/clientnegative/drop_table_used_by_mv.q.out
@@ -33,6 +33,7 @@ POSTHOOK: Lineage: mv1.value SIMPLE [(mytable)mytable.FieldSchema(name:value, ty
PREHOOK: query: drop table mytable
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@mytable
+PREHOOK: Output: database:default
PREHOOK: Output: default@mytable
FAILED: Execution Error, return code 40000 from org.apache.hadoop.hive.ql.ddl.DDLTask. MetaException(message:Cannot drop table as it is used in the following materialized views [default.mv1]
)
diff --git a/ql/src/test/results/clientnegative/drop_table_used_by_mv2.q.out b/ql/src/test/results/clientnegative/drop_table_used_by_mv2.q.out
index 269f2b3c333..3f906bf722b 100644
--- a/ql/src/test/results/clientnegative/drop_table_used_by_mv2.q.out
+++ b/ql/src/test/results/clientnegative/drop_table_used_by_mv2.q.out
@@ -70,6 +70,7 @@ POSTHOOK: Output: default@myview
PREHOOK: query: drop table mytable
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@mytable
+PREHOOK: Output: database:default
PREHOOK: Output: default@mytable
FAILED: Execution Error, return code 40000 from org.apache.hadoop.hive.ql.ddl.DDLTask. MetaException(message:Cannot drop table as it is used in the following materialized views [default.mv1, default.mv2]
)
diff --git a/ql/src/test/results/clientnegative/exchange_partition_neg_with_fullacid_table.q.out b/ql/src/test/results/clientnegative/exchange_partition_neg_with_fullacid_table.q.out
index 9a7f34537d3..7572307007c 100644
--- a/ql/src/test/results/clientnegative/exchange_partition_neg_with_fullacid_table.q.out
+++ b/ql/src/test/results/clientnegative/exchange_partition_neg_with_fullacid_table.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE IF EXISTS t1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS t1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS t2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS t2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE t1 (a int) PARTITIONED BY (d1 int) STORED AS ORC TBLPROPERTIES ("transactional"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out b/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out
index 7442b1bc8b5..afa35c768c9 100644
--- a/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out
+++ b/ql/src/test/results/clientnegative/exim_01_nonpart_over_loaded.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out b/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out
index 3c05600c734..00736322ea6 100644
--- a/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out
+++ b/ql/src/test/results/clientnegative/exim_02_all_part_over_overlap.q.out
@@ -76,10 +76,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: drop table exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: drop table exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out b/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out
index 10ce3e94c7e..b28579f74bf 100644
--- a/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out
+++ b/ql/src/test/results/clientnegative/exim_03_nonpart_noncompat_colschema.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out b/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out
index c53407b73cf..f96f5b18273 100644
--- a/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out
+++ b/ql/src/test/results/clientnegative/exim_04_nonpart_noncompat_colnumber.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out b/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out
index 4806861d3de..8b5378954f3 100644
--- a/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out
+++ b/ql/src/test/results/clientnegative/exim_05_nonpart_noncompat_coltype.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out b/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out
index 748d596a1e3..b93136a7b4e 100644
--- a/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out
+++ b/ql/src/test/results/clientnegative/exim_06_nonpart_noncompat_storage.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out b/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out
index 7c3ba02327b..fe5276edfe5 100644
--- a/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out
+++ b/ql/src/test/results/clientnegative/exim_07_nonpart_noncompat_ifof.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out b/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out
index eb3715f9d0f..b007cc38522 100644
--- a/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out
+++ b/ql/src/test/results/clientnegative/exim_08_nonpart_noncompat_serde.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out b/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out
index d9bc74282ba..bc3240be8b1 100644
--- a/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out
+++ b/ql/src/test/results/clientnegative/exim_09_nonpart_noncompat_serdeparam.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out b/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out
index 0ad8410eca5..f4ef12f3d84 100644
--- a/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out
+++ b/ql/src/test/results/clientnegative/exim_10_nonpart_noncompat_bucketing.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out b/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out
index abd0d821426..6095bcc8ae9 100644
--- a/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out
+++ b/ql/src/test/results/clientnegative/exim_11_nonpart_noncompat_sorting.q.out
@@ -32,10 +32,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out b/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out
index ab45089806e..12dc067f645 100644
--- a/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out
+++ b/ql/src/test/results/clientnegative/exim_13_nonnative_import.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out b/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out
index f5d19a8e168..f695482fd6f 100644
--- a/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out
+++ b/ql/src/test/results/clientnegative/exim_14_nonpart_part.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out b/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out
index 3bb0fcedc2e..7eff7c5a722 100644
--- a/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out
+++ b/ql/src/test/results/clientnegative/exim_15_part_nonpart.q.out
@@ -33,10 +33,12 @@ POSTHOOK: Input: default@exim_department@dep_org=hr
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out b/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out
index 302e511e400..48a1d59985d 100644
--- a/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out
+++ b/ql/src/test/results/clientnegative/exim_16_part_noncompat_schema.q.out
@@ -33,10 +33,12 @@ POSTHOOK: Input: default@exim_department@dep_org=hr
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out b/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out
index 23caa4ac828..1e8d1970a08 100644
--- a/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out
+++ b/ql/src/test/results/clientnegative/exim_17_part_spec_underspec.q.out
@@ -76,10 +76,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: drop table exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: drop table exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out b/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out
index 23caa4ac828..1e8d1970a08 100644
--- a/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out
+++ b/ql/src/test/results/clientnegative/exim_18_part_spec_missing.q.out
@@ -76,10 +76,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: drop table exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: drop table exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out b/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out
index db01d4fc32e..fae2b66d872 100644
--- a/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out
+++ b/ql/src/test/results/clientnegative/exim_19_external_over_existing.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out b/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out
index 77d58cb9c14..8ca82c984c7 100644
--- a/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out
+++ b/ql/src/test/results/clientnegative/exim_20_managed_location_over_existing.q.out
@@ -30,10 +30,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out b/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out
index ebcc8db0c36..85fad5249c7 100644
--- a/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out
+++ b/ql/src/test/results/clientnegative/exim_21_part_managed_external.q.out
@@ -76,10 +76,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=us/emp_state=tn
PREHOOK: query: drop table exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: drop table exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out b/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out
index 4e654795641..af3393f2772 100644
--- a/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out
+++ b/ql/src/test/results/clientnegative/exim_23_import_exist_authfail.q.out
@@ -26,10 +26,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out b/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out
index 1a9a34da502..a1e0ae8a7d1 100644
--- a/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out
+++ b/ql/src/test/results/clientnegative/exim_24_import_part_authfail.q.out
@@ -37,10 +37,12 @@ POSTHOOK: Input: default@exim_employee@emp_country=in/emp_state=tn
PREHOOK: query: drop table exim_employee
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_employee
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_employee
POSTHOOK: query: drop table exim_employee
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_employee
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_employee
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out b/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out
index d38b7fdaaaa..d573e551f61 100644
--- a/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out
+++ b/ql/src/test/results/clientnegative/exim_25_import_nonexist_authfail.q.out
@@ -26,10 +26,12 @@ POSTHOOK: Input: default@exim_department
PREHOOK: query: drop table exim_department
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@exim_department
+PREHOOK: Output: database:default
PREHOOK: Output: default@exim_department
POSTHOOK: query: drop table exim_department
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@exim_department
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@exim_department
PREHOOK: query: create database importer
PREHOOK: type: CREATEDATABASE
diff --git a/ql/src/test/results/clientnegative/insert_into1.q.out b/ql/src/test/results/clientnegative/insert_into1.q.out
index 0d3439e150d..92eea7e7100 100644
--- a/ql/src/test/results/clientnegative/insert_into1.q.out
+++ b/ql/src/test/results/clientnegative/insert_into1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE insert_into1_neg
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE insert_into1_neg
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE insert_into1_neg (key int, value string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/insert_into2.q.out b/ql/src/test/results/clientnegative/insert_into2.q.out
index f19d67b88cc..d956dc81484 100644
--- a/ql/src/test/results/clientnegative/insert_into2.q.out
+++ b/ql/src/test/results/clientnegative/insert_into2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE insert_into1_neg
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE insert_into1_neg
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE insert_into1_neg (key int, value string)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/insert_into3.q.out b/ql/src/test/results/clientnegative/insert_into3.q.out
index 44be16866d1..8a53621f64b 100644
--- a/ql/src/test/results/clientnegative/insert_into3.q.out
+++ b/ql/src/test/results/clientnegative/insert_into3.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE insert_into3_neg
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE insert_into3_neg
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE insert_into3_neg (key int, value string)
PARTITIONED BY (ds string)
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/insert_into4.q.out b/ql/src/test/results/clientnegative/insert_into4.q.out
index 0cc02ffd6cb..9abfa628797 100644
--- a/ql/src/test/results/clientnegative/insert_into4.q.out
+++ b/ql/src/test/results/clientnegative/insert_into4.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE insert_into3_neg
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE insert_into3_neg
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE insert_into3_neg (key int, value string)
PARTITIONED BY (ds string)
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/insert_into5.q.out b/ql/src/test/results/clientnegative/insert_into5.q.out
index 26ad5607b7f..ffcebb1b37b 100644
--- a/ql/src/test/results/clientnegative/insert_into5.q.out
+++ b/ql/src/test/results/clientnegative/insert_into5.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE if exists insert_into5_neg
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE if exists insert_into5_neg
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE insert_into5_neg (key int, value string) TBLPROPERTIES ("immutable"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/insert_into6.q.out b/ql/src/test/results/clientnegative/insert_into6.q.out
index 8d2145dff85..8f01b4be35e 100644
--- a/ql/src/test/results/clientnegative/insert_into6.q.out
+++ b/ql/src/test/results/clientnegative/insert_into6.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS insert_into6_neg
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS insert_into6_neg
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE insert_into6_neg (key int, value string)
PARTITIONED BY (ds string) TBLPROPERTIES("immutable"="true")
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientnegative/invalid_char_length_1.q.out b/ql/src/test/results/clientnegative/invalid_char_length_1.q.out
index b74a96b8a4e..750fe1b654b 100644
--- a/ql/src/test/results/clientnegative/invalid_char_length_1.q.out
+++ b/ql/src/test/results/clientnegative/invalid_char_length_1.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: drop table invalid_char_length_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table invalid_char_length_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: RuntimeException Char length 1000000 out of allowed range [1, 255]
diff --git a/ql/src/test/results/clientnegative/invalid_char_length_3.q.out b/ql/src/test/results/clientnegative/invalid_char_length_3.q.out
index 88f37521e54..a402d22324a 100644
--- a/ql/src/test/results/clientnegative/invalid_char_length_3.q.out
+++ b/ql/src/test/results/clientnegative/invalid_char_length_3.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: drop table invalid_char_length_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table invalid_char_length_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: RuntimeException Char length 0 out of allowed range [1, 255]
diff --git a/ql/src/test/results/clientnegative/invalid_varchar_length_1.q.out b/ql/src/test/results/clientnegative/invalid_varchar_length_1.q.out
index 0056ae0993e..973967181da 100644
--- a/ql/src/test/results/clientnegative/invalid_varchar_length_1.q.out
+++ b/ql/src/test/results/clientnegative/invalid_varchar_length_1.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: drop table if exists invalid_varchar_length_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists invalid_varchar_length_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: RuntimeException Varchar length 1000000 out of allowed range [1, 65535]
diff --git a/ql/src/test/results/clientnegative/invalid_varchar_length_3.q.out b/ql/src/test/results/clientnegative/invalid_varchar_length_3.q.out
index 17d8c270b72..59c68fb827e 100644
--- a/ql/src/test/results/clientnegative/invalid_varchar_length_3.q.out
+++ b/ql/src/test/results/clientnegative/invalid_varchar_length_3.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: drop table if exists invalid_varchar_length_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists invalid_varchar_length_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: RuntimeException Varchar length 0 out of allowed range [1, 65535]
diff --git a/ql/src/test/results/clientnegative/lockneg1.q.out b/ql/src/test/results/clientnegative/lockneg1.q.out
index 57b2ab023f4..32ab88f772a 100644
--- a/ql/src/test/results/clientnegative/lockneg1.q.out
+++ b/ql/src/test/results/clientnegative/lockneg1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrc like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/lockneg2.q.out b/ql/src/test/results/clientnegative/lockneg2.q.out
index d5cff03f45a..e2aa946f301 100644
--- a/ql/src/test/results/clientnegative/lockneg2.q.out
+++ b/ql/src/test/results/clientnegative/lockneg2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrc like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/lockneg3.q.out b/ql/src/test/results/clientnegative/lockneg3.q.out
index ad548cb6dc7..cad5e54ef7c 100644
--- a/ql/src/test/results/clientnegative/lockneg3.q.out
+++ b/ql/src/test/results/clientnegative/lockneg3.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrcpart like srcpart
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/lockneg4.q.out b/ql/src/test/results/clientnegative/lockneg4.q.out
index 59741dbf96c..134e3b0fd57 100644
--- a/ql/src/test/results/clientnegative/lockneg4.q.out
+++ b/ql/src/test/results/clientnegative/lockneg4.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrcpart like srcpart
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/lockneg5.q.out b/ql/src/test/results/clientnegative/lockneg5.q.out
index 08487efc0ce..5b285f1f7f2 100644
--- a/ql/src/test/results/clientnegative/lockneg5.q.out
+++ b/ql/src/test/results/clientnegative/lockneg5.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table tstsrcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: show locks tstsrcpart extended
PREHOOK: type: SHOWLOCKS
FAILED: Execution Error, return code 40000 from org.apache.hadoop.hive.ql.ddl.DDLTask. org.apache.hadoop.hive.ql.metadata.InvalidTableException: Table not found tstsrcpart
diff --git a/ql/src/test/results/clientnegative/mm_convert.q.out b/ql/src/test/results/clientnegative/mm_convert.q.out
index e0e49e47170..c23f2663c68 100644
--- a/ql/src/test/results/clientnegative/mm_convert.q.out
+++ b/ql/src/test/results/clientnegative/mm_convert.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table convert_mm
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table convert_mm
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table convert_mm(key int, id int) tblproperties("transactional"="true", "transactional_properties"="insert_only")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/mm_delete.q.out b/ql/src/test/results/clientnegative/mm_delete.q.out
index aa0d0830247..73b8a9b3374 100644
--- a/ql/src/test/results/clientnegative/mm_delete.q.out
+++ b/ql/src/test/results/clientnegative/mm_delete.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists mm_srcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists mm_srcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE mm_srcpart (key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) stored as ORC TBLPROPERTIES ('transactional'='true', 'transactional_properties'='insert_only')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/mm_update.q.out b/ql/src/test/results/clientnegative/mm_update.q.out
index d412d8b9999..228844f7549 100644
--- a/ql/src/test/results/clientnegative/mm_update.q.out
+++ b/ql/src/test/results/clientnegative/mm_update.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists mm_srcpart
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists mm_srcpart
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE mm_srcpart (key STRING, value STRING) PARTITIONED BY (ds STRING, hr STRING) stored as ORC TBLPROPERTIES ('transactional'='true', 'transactional_properties'='insert_only')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/msck_repair_1.q.out b/ql/src/test/results/clientnegative/msck_repair_1.q.out
index ab2f9751745..c89b16ffc97 100644
--- a/ql/src/test/results/clientnegative/msck_repair_1.q.out
+++ b/ql/src/test/results/clientnegative/msck_repair_1.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS repairtable
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS repairtable
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/msck_repair_2.q.out b/ql/src/test/results/clientnegative/msck_repair_2.q.out
index ab2f9751745..c89b16ffc97 100644
--- a/ql/src/test/results/clientnegative/msck_repair_2.q.out
+++ b/ql/src/test/results/clientnegative/msck_repair_2.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS repairtable
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS repairtable
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/msck_repair_3.q.out b/ql/src/test/results/clientnegative/msck_repair_3.q.out
index ab2f9751745..c89b16ffc97 100644
--- a/ql/src/test/results/clientnegative/msck_repair_3.q.out
+++ b/ql/src/test/results/clientnegative/msck_repair_3.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS repairtable
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS repairtable
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/msck_repair_4.q.out b/ql/src/test/results/clientnegative/msck_repair_4.q.out
index b8761f9997e..d7f92f5f86b 100644
--- a/ql/src/test/results/clientnegative/msck_repair_4.q.out
+++ b/ql/src/test/results/clientnegative/msck_repair_4.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS repairtable
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS repairtable
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/msck_repair_5.q.out b/ql/src/test/results/clientnegative/msck_repair_5.q.out
index b06dde74102..3008ccb9045 100644
--- a/ql/src/test/results/clientnegative/msck_repair_5.q.out
+++ b/ql/src/test/results/clientnegative/msck_repair_5.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS repairtable
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS repairtable
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/msck_repair_6.q.out b/ql/src/test/results/clientnegative/msck_repair_6.q.out
index 680b0092201..2ec1e6517ca 100644
--- a/ql/src/test/results/clientnegative/msck_repair_6.q.out
+++ b/ql/src/test/results/clientnegative/msck_repair_6.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS repairtable
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS repairtable
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientnegative/recursive_view.q.out b/ql/src/test/results/clientnegative/recursive_view.q.out
index 1b524acf0b1..a4150411492 100644
--- a/ql/src/test/results/clientnegative/recursive_view.q.out
+++ b/ql/src/test/results/clientnegative/recursive_view.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table t
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table t
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop view r0
PREHOOK: type: DROPVIEW
POSTHOOK: query: drop view r0
diff --git a/ql/src/test/results/clientnegative/txnprops.q.out b/ql/src/test/results/clientnegative/txnprops.q.out
index 24a59f3cf82..f702b06522c 100644
--- a/ql/src/test/results/clientnegative/txnprops.q.out
+++ b/ql/src/test/results/clientnegative/txnprops.q.out
@@ -1,5 +1,7 @@
PREHOOK: query: drop table test_props
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table test_props
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
FAILED: SemanticException Cannot specify transactional_properties without transactional
diff --git a/ql/src/test/results/clientnegative/udf_sort_array_by_wrong3.q.out b/ql/src/test/results/clientnegative/udf_sort_array_by_wrong3.q.out
index 2a4e74939a0..f1ca071da4a 100644
--- a/ql/src/test/results/clientnegative/udf_sort_array_by_wrong3.q.out
+++ b/ql/src/test/results/clientnegative/udf_sort_array_by_wrong3.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS sort_array_by_order_wrong
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS sort_array_by_order_wrong
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE sort_array_by_order_wrong
STORED AS TEXTFILE
AS
diff --git a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out
index c8ba6d6a414..823a3bbf38b 100644
--- a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out
+++ b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table tstsrc_n2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrc_n2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table tstsrcpart_n2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table tstsrcpart_n2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table tstsrc_n2 like src
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -457,16 +461,20 @@ POSTHOOK: Input: default@new_name@ds=1
PREHOOK: query: drop table tstsrc_n2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tstsrc_n2
+PREHOOK: Output: database:default
PREHOOK: Output: default@tstsrc_n2
POSTHOOK: query: drop table tstsrc_n2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tstsrc_n2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tstsrc_n2
PREHOOK: query: drop table tstsrcpart_n2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tstsrcpart_n2
+PREHOOK: Output: database:default
PREHOOK: Output: default@tstsrcpart_n2
POSTHOOK: query: drop table tstsrcpart_n2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tstsrcpart_n2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tstsrcpart_n2
diff --git a/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out b/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out
index 5b0cb8bb910..c14628f3c1b 100644
--- a/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out
+++ b/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out
@@ -78,16 +78,20 @@ COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"
PREHOOK: query: drop table all_nulls
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@all_nulls
+PREHOOK: Output: database:default
PREHOOK: Output: default@all_nulls
POSTHOOK: query: drop table all_nulls
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@all_nulls
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@all_nulls
PREHOOK: query: drop table src_null_n2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@src_null_n2
+PREHOOK: Output: database:default
PREHOOK: Output: default@src_null_n2
POSTHOOK: query: drop table src_null_n2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@src_null_n2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@src_null_n2
diff --git a/ql/src/test/results/clientpositive/beeline/create_merge_compressed.q.out b/ql/src/test/results/clientpositive/beeline/create_merge_compressed.q.out
index 64e20f796c7..95d484f9607 100644
--- a/ql/src/test/results/clientpositive/beeline/create_merge_compressed.q.out
+++ b/ql/src/test/results/clientpositive/beeline/create_merge_compressed.q.out
@@ -123,16 +123,20 @@ POSTHOOK: Input: default@tgt_rc_merge_test_n1
PREHOOK: query: drop table src_rc_merge_test_n1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@src_rc_merge_test_n1
+PREHOOK: Output: database:default
PREHOOK: Output: default@src_rc_merge_test_n1
POSTHOOK: query: drop table src_rc_merge_test_n1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@src_rc_merge_test_n1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@src_rc_merge_test_n1
PREHOOK: query: drop table tgt_rc_merge_test_n1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@tgt_rc_merge_test_n1
+PREHOOK: Output: database:default
PREHOOK: Output: default@tgt_rc_merge_test_n1
POSTHOOK: query: drop table tgt_rc_merge_test_n1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tgt_rc_merge_test_n1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@tgt_rc_merge_test_n1
diff --git a/ql/src/test/results/clientpositive/beeline/drop_with_concurrency.q.out b/ql/src/test/results/clientpositive/beeline/drop_with_concurrency.q.out
index 2c00f51b734..5f8f99c3dff 100644
--- a/ql/src/test/results/clientpositive/beeline/drop_with_concurrency.q.out
+++ b/ql/src/test/results/clientpositive/beeline/drop_with_concurrency.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists drop_with_concurrency_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists drop_with_concurrency_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table drop_with_concurrency_1 (c1 int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -13,8 +15,10 @@ POSTHOOK: Output: default@drop_with_concurrency_1
PREHOOK: query: drop table drop_with_concurrency_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@drop_with_concurrency_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@drop_with_concurrency_1
POSTHOOK: query: drop table drop_with_concurrency_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@drop_with_concurrency_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@drop_with_concurrency_1
diff --git a/ql/src/test/results/clientpositive/beeline/insert_overwrite_local_directory_1.q.out b/ql/src/test/results/clientpositive/beeline/insert_overwrite_local_directory_1.q.out
index 6ddd85b1546..9499c3aa9da 100644
--- a/ql/src/test/results/clientpositive/beeline/insert_overwrite_local_directory_1.q.out
+++ b/ql/src/test/results/clientpositive/beeline/insert_overwrite_local_directory_1.q.out
@@ -1745,25 +1745,31 @@ POSTHOOK: Input: default@local_rctable
PREHOOK: query: drop table local_rctable
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@local_rctable
+PREHOOK: Output: database:default
PREHOOK: Output: default@local_rctable
POSTHOOK: query: drop table local_rctable
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@local_rctable
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@local_rctable
PREHOOK: query: drop table array_table_n0
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@array_table_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@array_table_n0
POSTHOOK: query: drop table array_table_n0
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@array_table_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@array_table_n0
PREHOOK: query: drop table map_table_n1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@map_table_n1
+PREHOOK: Output: database:default
PREHOOK: Output: default@map_table_n1
POSTHOOK: query: drop table map_table_n1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@map_table_n1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@map_table_n1
#### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/beeline/udf_unix_timestamp.q.out b/ql/src/test/results/clientpositive/beeline/udf_unix_timestamp.q.out
index 0b071be57d4..cbb1a4a4d02 100644
--- a/ql/src/test/results/clientpositive/beeline/udf_unix_timestamp.q.out
+++ b/ql/src/test/results/clientpositive/beeline/udf_unix_timestamp.q.out
@@ -95,10 +95,12 @@ POSTHOOK: Lineage: foo_n3.b SIMPLE []
PREHOOK: query: drop table foo_n3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@foo_n3
+PREHOOK: Output: database:default
PREHOOK: Output: default@foo_n3
POSTHOOK: query: drop table foo_n3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@foo_n3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@foo_n3
PREHOOK: query: SELECT
'random_string',
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
index 9d72125cbd6..15560605bb9 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table table1_n9
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table table1_n9
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table table2_n5
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table table2_n5
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table table1_n9(key string, value string) clustered by (key, value)
sorted by (key, value) into 1 BUCKETS stored as textfile
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
index 6e7414c98bd..02984fc7938 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table table2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table table2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table table1(key string, value string) clustered by (key, value)
sorted by (key desc, value desc) into 1 BUCKETS stored as textfile
PREHOOK: type: CREATETABLE
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
index f1acab99cba..0ea9cd482a1 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
@@ -1,19 +1,27 @@
PREHOOK: query: drop table test1_n11
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table test1_n11
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table test2_n7
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table test2_n7
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table test3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table test3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table test4
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table test4
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table test1_n11 (key string, value string) clustered by (key) sorted by (key) into 3 buckets
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
index 7889719c6db..da07bfa72f1 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n5 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n5 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table_n0 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table_n0 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -126,18 +130,22 @@ POSTHOOK: Input: default@encrypted_ext_table_n0
PREHOOK: query: DROP TABLE encrypted_table_n5
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table_n5
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table_n5
POSTHOOK: query: DROP TABLE encrypted_table_n5
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table_n5
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table_n5
PREHOOK: query: DROP TABLE encrypted_ext_table_n0
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_ext_table_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_ext_table_n0
POSTHOOK: query: DROP TABLE encrypted_ext_table_n0
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_ext_table_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_ext_table_n0
PREHOOK: query: SHOW TABLES LIKE "encrypted_%"
PREHOOK: type: SHOWTABLES
@@ -147,9 +155,13 @@ POSTHOOK: type: SHOWTABLES
POSTHOOK: Input: database:default
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n5 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n5 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table_n0 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table_n0 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_ctas.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_ctas.q.out
index a33f6d30d3d..48b2df64d48 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_ctas.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_ctas.q.out
@@ -1,10 +1,6 @@
-PREHOOK: query: DROP TABLE IF EXISTS testCT.encrypted_tablectas PURGE
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: DROP TABLE IF EXISTS testCT.encrypted_tablectas PURGE
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: DROP DATABASE IF EXISTS testCT
+PREHOOK: query: DROP DATABASE IF EXISTS testCT CASCADE
PREHOOK: type: DROPDATABASE
-POSTHOOK: query: DROP DATABASE IF EXISTS testCT
+POSTHOOK: query: DROP DATABASE IF EXISTS testCT CASCADE
POSTHOOK: type: DROPDATABASE
PREHOOK: query: CREATE DATABASE testCT
PREHOOK: type: CREATEDATABASE
@@ -42,10 +38,12 @@ POSTHOOK: Input: testct@encrypted_tablectas
PREHOOK: query: DROP TABLE testCT.encrypted_tablectas PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: testct@encrypted_tablectas
+PREHOOK: Output: database:testct
PREHOOK: Output: testct@encrypted_tablectas
POSTHOOK: query: DROP TABLE testCT.encrypted_tablectas PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: testct@encrypted_tablectas
+POSTHOOK: Output: database:testct
POSTHOOK: Output: testct@encrypted_tablectas
Encryption key deleted: 'key_128'
PREHOOK: query: DROP DATABASE testCT
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_drop_partition.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_drop_partition.q.out
index 19cef72a9db..e8cbbaece57 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_drop_partition.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_drop_partition.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_dp
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_dp
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -91,10 +93,12 @@ POSTHOOK: Input: default@encrypted_ext_table_dp
PREHOOK: query: DROP TABLE encrypted_ext_table_dp
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_ext_table_dp
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_ext_table_dp
POSTHOOK: query: DROP TABLE encrypted_ext_table_dp
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_ext_table_dp
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_ext_table_dp
PREHOOK: query: SELECT * FROM encrypted_table_dp
PREHOOK: type: QUERY
@@ -163,8 +167,10 @@ POSTHOOK: Output: default@encrypted_table_dp@p=2014-09-24
PREHOOK: query: DROP TABLE encrypted_table_dp
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table_dp
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table_dp
POSTHOOK: query: DROP TABLE encrypted_table_dp
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table_dp
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table_dp
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
index 6a93e0c32c4..b850344c733 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_ext_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -49,10 +53,12 @@ encrypted_table_n2
PREHOOK: query: DROP TABLE default.encrypted_ext_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_ext_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_ext_table
POSTHOOK: query: DROP TABLE default.encrypted_ext_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_ext_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_ext_table
PREHOOK: query: SHOW TABLES LIKE "encrypted_%"
PREHOOK: type: SHOWTABLES
@@ -64,10 +70,12 @@ encrypted_table_n2
PREHOOK: query: DROP TABLE default.encrypted_table_n2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table_n2
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table_n2
POSTHOOK: query: DROP TABLE default.encrypted_table_n2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table_n2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table_n2
PREHOOK: query: SHOW TABLES LIKE "encrypted_%"
PREHOOK: type: SHOWTABLES
@@ -77,8 +85,10 @@ POSTHOOK: type: SHOWTABLES
POSTHOOK: Input: database:default
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -137,10 +147,12 @@ POSTHOOK: Lineage: encrypted_table1.value SIMPLE [(src)src.FieldSchema(name:valu
PREHOOK: query: DROP TABLE default.encrypted_table1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table1
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table1
POSTHOOK: query: DROP TABLE default.encrypted_table1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table1
PREHOOK: query: SHOW TABLES LIKE "encrypted_%"
PREHOOK: type: SHOWTABLES
@@ -151,8 +163,10 @@ POSTHOOK: Input: database:default
FAILED: SemanticException [Error 10001]: Table not found encrypted_table1
PREHOOK: query: DROP TABLE default.encrypted_table1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE default.encrypted_table1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: SHOW TABLES LIKE "encrypted_%"
PREHOOK: type: SHOWTABLES
PREHOOK: Input: database:default
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
index 7cf3d46e1c3..87292d97b69 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table_in_encrypted_db.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP DATABASE IF EXISTS encrypted_db
PREHOOK: type: DROPDATABASE
POSTHOOK: query: DROP DATABASE IF EXISTS encrypted_db
@@ -39,10 +41,12 @@ POSTHOOK: Lineage: encrypted_table.value SIMPLE [(src)src.FieldSchema(name:value
PREHOOK: query: DROP TABLE encrypted_db.encrypted_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: encrypted_db@encrypted_table
+PREHOOK: Output: database:encrypted_db
PREHOOK: Output: encrypted_db@encrypted_table
POSTHOOK: query: DROP TABLE encrypted_db.encrypted_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: encrypted_db@encrypted_table
+POSTHOOK: Output: database:encrypted_db
POSTHOOK: Output: encrypted_db@encrypted_table
PREHOOK: query: DROP DATABASE encrypted_db
PREHOOK: type: DROPDATABASE
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_drop_view.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_drop_view.q.out
index a13de4e4fb0..982b4d3a7de 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_drop_view.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_drop_view.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS dve_encrypted_table PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS dve_encrypted_table PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
index 79063e102e0..59daf7bc7aa 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_dynamic.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table IF EXISTS encryptedTable_n0 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table IF EXISTS encryptedTable_n0 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table IF EXISTS unencryptedTable_n0 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table IF EXISTS unencryptedTable_n0 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table encryptedTable_n0(value string)
partitioned by (key string) clustered by (value) into 2 buckets stored as orc
#### A masked pattern was here ####
@@ -149,17 +153,21 @@ val_86 86
PREHOOK: query: drop table encryptedTable_n0 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encryptedtable_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@encryptedtable_n0
POSTHOOK: query: drop table encryptedTable_n0 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encryptedtable_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encryptedtable_n0
Encryption key deleted: 'key_1'
PREHOOK: query: drop table unencryptedTable_n0 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@unencryptedtable_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@unencryptedtable_n0
POSTHOOK: query: drop table unencryptedTable_n0 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@unencryptedtable_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@unencryptedtable_n0
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out
index 500b769ef47..e3e41a8fb7c 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_insert_partition_static.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table IF EXISTS encryptedTable PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table IF EXISTS encryptedTable PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table IF EXISTS unencryptedTable PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table IF EXISTS unencryptedTable PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table encryptedTable(key string,
value string) partitioned by (ds string) clustered by (key) into 2 buckets stored as orc
#### A masked pattern was here ####
@@ -137,17 +141,21 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table encryptedTable PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encryptedtable
+PREHOOK: Output: database:default
PREHOOK: Output: default@encryptedtable
POSTHOOK: query: drop table encryptedTable PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encryptedtable
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encryptedtable
Encryption key deleted: 'key_1'
PREHOOK: query: drop table unencryptedTable PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@unencryptedtable
+PREHOOK: Output: database:default
PREHOOK: Output: default@unencryptedtable
POSTHOOK: query: drop table unencryptedTable PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@unencryptedtable
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@unencryptedtable
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
index c9da0c84058..893ce9b70f8 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_insert_values.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n3 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n3 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
index 894750acbef..d8da3dc6393 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -728,9 +730,11 @@ STAGE PLANS:
PREHOOK: query: drop table encrypted_table PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table
POSTHOOK: query: drop table encrypted_table PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table
Encryption key deleted: 'key_128'
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
index 9cd3b0d465c..e633d0fc811 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS table_key_1 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS table_key_1 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -16,8 +18,10 @@ Encryption key created: 'key_1'
Encryption zone created: '/build/ql/test/data/warehouse/table_key_1' using key: 'key_1'
PREHOOK: query: DROP TABLE IF EXISTS table_key_2 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS table_key_2 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -1280,18 +1284,22 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: DROP TABLE table_key_1 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table_key_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@table_key_1
POSTHOOK: query: DROP TABLE table_key_1 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table_key_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table_key_1
PREHOOK: query: DROP TABLE table_key_2 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@table_key_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@table_key_2
POSTHOOK: query: DROP TABLE table_key_2 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@table_key_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@table_key_2
Encryption key deleted: 'key_1'
Encryption key deleted: 'key_2'
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out
index e910e1a9082..c2d95fecd7b 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_load_data_to_encrypted_tables.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n0 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n0 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -1049,9 +1051,11 @@ POSTHOOK: Input: default@encrypted_table_n0
PREHOOK: query: DROP TABLE encrypted_table_n0 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table_n0
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table_n0
POSTHOOK: query: DROP TABLE encrypted_table_n0 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table_n0
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table_n0
Encryption key deleted: 'key1'
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
index 349a834ef4c..bb55e6a7df1 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n1 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n1 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP DATABASE IF EXISTS encrypted_db
PREHOOK: type: DROPDATABASE
POSTHOOK: query: DROP DATABASE IF EXISTS encrypted_db
@@ -223,19 +225,25 @@ POSTHOOK: Input: database:encrypted_db_outloc
renamed_encrypted_table_n1
PREHOOK: query: DROP TABLE default.encrypted_table_n1 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE default.encrypted_table_n1 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE default.plain_table PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE default.plain_table PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE default.renamed_encrypted_table_outloc PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@renamed_encrypted_table_outloc
+PREHOOK: Output: database:default
PREHOOK: Output: default@renamed_encrypted_table_outloc
POSTHOOK: query: DROP TABLE default.renamed_encrypted_table_outloc PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@renamed_encrypted_table_outloc
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@renamed_encrypted_table_outloc
PREHOOK: query: DROP DATABASE encrypted_db
PREHOOK: type: DROPDATABASE
@@ -245,10 +253,12 @@ FAILED: Execution Error, return code 40000 from org.apache.hadoop.hive.ql.ddl.DD
PREHOOK: query: DROP TABLE encrypted_db_outloc.renamed_encrypted_table_n1 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: encrypted_db_outloc@renamed_encrypted_table_n1
+PREHOOK: Output: database:encrypted_db_outloc
PREHOOK: Output: encrypted_db_outloc@renamed_encrypted_table_n1
POSTHOOK: query: DROP TABLE encrypted_db_outloc.renamed_encrypted_table_n1 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: encrypted_db_outloc@renamed_encrypted_table_n1
+POSTHOOK: Output: database:encrypted_db_outloc
POSTHOOK: Output: encrypted_db_outloc@renamed_encrypted_table_n1
PREHOOK: query: DROP DATABASE encrypted_db_outloc
PREHOOK: type: DROPDATABASE
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
index 32f65ec83b7..4fbd3a8dbc0 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_encrypted_tbl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n4 PURGE
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS encrypted_table_n4 PURGE
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -34,8 +36,10 @@ POSTHOOK: Input: default@encrypted_table_n4
PREHOOK: query: drop table encrypted_table_n4 PURGE
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@encrypted_table_n4
+PREHOOK: Output: database:default
PREHOOK: Output: default@encrypted_table_n4
POSTHOOK: query: drop table encrypted_table_n4 PURGE
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@encrypted_table_n4
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@encrypted_table_n4
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out
index 33380a00b1b..b8cb45a951e 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_select_read_only_unencrypted_tbl.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS unencrypted_table
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS unencrypted_table
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
@@ -32,8 +34,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table unencrypted_table
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@unencrypted_table
+PREHOOK: Output: database:default
PREHOOK: Output: default@unencrypted_table
POSTHOOK: query: drop table unencrypted_table
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@unencrypted_table
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@unencrypted_table
diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_unencrypted_nonhdfs_external_tables.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_unencrypted_nonhdfs_external_tables.q.out
index 92ac36e9685..e80d46e490a 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_unencrypted_nonhdfs_external_tables.q.out
+++ b/ql/src/test/results/clientpositive/encrypted/encryption_unencrypted_nonhdfs_external_tables.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE mydata
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE mydata
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE mydata (key STRING, value STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' '
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
@@ -533,8 +535,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: DROP TABLE mydata
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@mydata
+PREHOOK: Output: database:default
PREHOOK: Output: default@mydata
POSTHOOK: query: DROP TABLE mydata
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@mydata
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@mydata
diff --git a/ql/src/test/results/clientpositive/erasurecoding/erasure_simple.q.out b/ql/src/test/results/clientpositive/erasurecoding/erasure_simple.q.out
index d26f670de6b..b6e8e89d519 100644
--- a/ql/src/test/results/clientpositive/erasurecoding/erasure_simple.q.out
+++ b/ql/src/test/results/clientpositive/erasurecoding/erasure_simple.q.out
@@ -66,8 +66,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
5
PREHOOK: query: drop table if exists erasure_table2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists erasure_table2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table erasure_table2 like src location 'hdfs://### HDFS PATH ###'
PREHOOK: type: CREATETABLE
PREHOOK: Input: hdfs://### HDFS PATH ###
diff --git a/ql/src/test/results/clientpositive/hook_context_cs.q.out b/ql/src/test/results/clientpositive/hook_context_cs.q.out
index bbaaa65c6ca..7964080ee62 100644
--- a/ql/src/test/results/clientpositive/hook_context_cs.q.out
+++ b/ql/src/test/results/clientpositive/hook_context_cs.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table vcsc
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table vcsc
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE vcsc (c STRING) PARTITIONED BY (ds STRING)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
index b398fe68317..dcdefdfe132 100644
--- a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
+++ b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out
@@ -619,8 +619,10 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
PREHOOK: query: drop table list_bucketing_dynamic_part_n2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@list_bucketing_dynamic_part_n2
+PREHOOK: Output: database:default
PREHOOK: Output: default@list_bucketing_dynamic_part_n2
POSTHOOK: query: drop table list_bucketing_dynamic_part_n2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@list_bucketing_dynamic_part_n2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@list_bucketing_dynamic_part_n2
diff --git a/ql/src/test/results/clientpositive/llap/acid_bloom_filter_orc_file_dump.q.out b/ql/src/test/results/clientpositive/llap/acid_bloom_filter_orc_file_dump.q.out
index dc181e7eb95..f075093a617 100644
--- a/ql/src/test/results/clientpositive/llap/acid_bloom_filter_orc_file_dump.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_bloom_filter_orc_file_dump.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE if exists bloomTest
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE if exists bloomTest
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE bloomTest(
msisdn STRING,
imsi VARCHAR(20),
diff --git a/ql/src/test/results/clientpositive/llap/acid_direct_insert_insert_overwrite.q.out b/ql/src/test/results/clientpositive/llap/acid_direct_insert_insert_overwrite.q.out
index bde0415d353..508e4d87482 100644
--- a/ql/src/test/results/clientpositive/llap/acid_direct_insert_insert_overwrite.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_direct_insert_insert_overwrite.q.out
@@ -1,31 +1,45 @@
PREHOOK: query: drop table if exists io_test_acid_part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_acid_part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists io_test_text_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_text_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists io_test_text_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_text_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists io_test_text_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_text_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists io_test_acid_1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_acid_1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists io_test_acid_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_acid_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists io_test_acid_3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists io_test_acid_3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table io_test_text_1 (a int, b int, c int) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -161,10 +175,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid
POSTHOOK: query: drop table io_test_acid
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid
PREHOOK: query: create table io_test_acid_1 (a int, b int, c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -305,26 +321,32 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_1
POSTHOOK: query: drop table io_test_acid_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_1
PREHOOK: query: drop table io_test_acid_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_2
POSTHOOK: query: drop table io_test_acid_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_2
PREHOOK: query: drop table io_test_acid_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_3
POSTHOOK: query: drop table io_test_acid_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_3
PREHOOK: query: create table io_test_acid_part (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -466,10 +488,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: create table io_test_acid_part (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -606,10 +630,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: create table io_test_acid_part (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -745,10 +771,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: create table io_test_acid_part (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -875,10 +903,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: create table io_test_acid_part (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -931,10 +961,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: create table io_test_acid_part (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -983,10 +1015,12 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: create external table io_test_text_3 (a int, b int, pc1 int, pc2 int, pc3 int) stored as textfile
PREHOOK: type: CREATETABLE
@@ -1201,32 +1235,40 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table io_test_acid_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_acid_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_acid_part
POSTHOOK: query: drop table io_test_acid_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_acid_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_acid_part
PREHOOK: query: drop table io_test_text_1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_text_1
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_text_1
POSTHOOK: query: drop table io_test_text_1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_text_1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_text_1
PREHOOK: query: drop table io_test_text_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_text_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_text_2
POSTHOOK: query: drop table io_test_text_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_text_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_text_2
PREHOOK: query: drop table io_test_text_3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@io_test_text_3
+PREHOOK: Output: database:default
PREHOOK: Output: default@io_test_text_3
POSTHOOK: query: drop table io_test_text_3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@io_test_text_3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@io_test_text_3
diff --git a/ql/src/test/results/clientpositive/llap/acid_direct_update_delete.q.out b/ql/src/test/results/clientpositive/llap/acid_direct_update_delete.q.out
index 4ddda5942ab..65d9a835235 100644
--- a/ql/src/test/results/clientpositive/llap/acid_direct_update_delete.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_direct_update_delete.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: DROP TABLE IF EXISTS test_update_bucketed
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_update_bucketed
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE test_update_bucketed(id string, value string) CLUSTERED BY(id) INTO 10 BUCKETS STORED AS ORC TBLPROPERTIES('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -137,8 +139,10 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: DROP TABLE IF EXISTS test_update_bucketed
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_update_bucketed
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_update_bucketed
POSTHOOK: query: DROP TABLE IF EXISTS test_update_bucketed
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_update_bucketed
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_update_bucketed
diff --git a/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_partitions.q.out b/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_partitions.q.out
index 6b1211ec1e3..a4268e89730 100644
--- a/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_partitions.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_partitions.q.out
@@ -1,15 +1,21 @@
PREHOOK: query: DROP TABLE IF EXISTS test_update_part_text
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_update_part_text
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS test_update_part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_update_part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS test_delete_part
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_delete_part
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE EXTERNAL TABLE test_update_part_text (a int, b int, c int) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -471,24 +477,30 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: DROP TABLE IF EXISTS test_update_part_text
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_update_part_text
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_update_part_text
POSTHOOK: query: DROP TABLE IF EXISTS test_update_part_text
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_update_part_text
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_update_part_text
PREHOOK: query: DROP TABLE IF EXISTS test_update_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_update_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_update_part
POSTHOOK: query: DROP TABLE IF EXISTS test_update_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_update_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_update_part
PREHOOK: query: DROP TABLE IF EXISTS test_delete_part
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@test_delete_part
+PREHOOK: Output: database:default
PREHOOK: Output: default@test_delete_part
POSTHOOK: query: DROP TABLE IF EXISTS test_delete_part
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@test_delete_part
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@test_delete_part
diff --git a/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_with_merge.q.out b/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_with_merge.q.out
index ce703e40a78..de7d67399fd 100644
--- a/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_with_merge.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_direct_update_delete_with_merge.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: DROP TABLE IF EXISTS transactions
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS transactions
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS merge_source
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS merge_source
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE transactions (id int, value string, last_update_user string) PARTITIONED BY (tran_date string) CLUSTERED BY (id) into 5 buckets STORED AS ORC TBLPROPERTIES ('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -147,16 +151,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: DROP TABLE IF EXISTS transactions
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@transactions
+PREHOOK: Output: database:default
PREHOOK: Output: default@transactions
POSTHOOK: query: DROP TABLE IF EXISTS transactions
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@transactions
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@transactions
PREHOOK: query: DROP TABLE IF EXISTS merge_source
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@merge_source
+PREHOOK: Output: database:default
PREHOOK: Output: default@merge_source
POSTHOOK: query: DROP TABLE IF EXISTS merge_source
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@merge_source
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@merge_source
diff --git a/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out b/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
index aa1914c30ec..0af3310a8d8 100644
--- a/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_globallimit.q.out
@@ -43,8 +43,10 @@ POSTHOOK: Input: default@acidtest1
PREHOOK: query: drop table acidtest1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acidtest1
+PREHOOK: Output: database:default
PREHOOK: Output: default@acidtest1
POSTHOOK: query: drop table acidtest1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acidtest1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acidtest1
diff --git a/ql/src/test/results/clientpositive/llap/acid_insert_overwrite.q.out b/ql/src/test/results/clientpositive/llap/acid_insert_overwrite.q.out
index 8aca839e2f0..56aad8f6aad 100644
--- a/ql/src/test/results/clientpositive/llap/acid_insert_overwrite.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_insert_overwrite.q.out
@@ -31,8 +31,10 @@ i 9
j 10
PREHOOK: query: drop table if exists acidtbl1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists acidtbl1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table acidtbl1 (key char(1), value int) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ("transactional"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -160,8 +162,10 @@ k 11
l 12
PREHOOK: query: drop table if exists acidtbl2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists acidtbl2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table acidtbl2 (key char(1), value int) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ("transactional"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -172,8 +176,10 @@ POSTHOOK: Output: database:default
POSTHOOK: Output: default@acidtbl2
PREHOOK: query: drop table if exists acidtbl3
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists acidtbl3
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table acidtbl3 (key char(1), value int) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ("transactional"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -269,31 +275,39 @@ p 16
PREHOOK: query: drop table acidtbl1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acidtbl1
+PREHOOK: Output: database:default
PREHOOK: Output: default@acidtbl1
POSTHOOK: query: drop table acidtbl1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acidtbl1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acidtbl1
PREHOOK: query: drop table acidtbl2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acidtbl2
+PREHOOK: Output: database:default
PREHOOK: Output: default@acidtbl2
POSTHOOK: query: drop table acidtbl2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acidtbl2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acidtbl2
PREHOOK: query: drop table acidtbl3
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acidtbl3
+PREHOOK: Output: database:default
PREHOOK: Output: default@acidtbl3
POSTHOOK: query: drop table acidtbl3
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acidtbl3
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acidtbl3
PREHOOK: query: drop table if exists acidparttbl
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists acidparttbl
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table acidparttbl (key char(1), value int) partitioned by (p int) clustered by (value) into 2 buckets stored as orc TBLPROPERTIES ("transactional"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -410,8 +424,10 @@ POSTHOOK: Input: default@acidparttbl@p=200
PREHOOK: query: drop table acidparttbl
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acidparttbl
+PREHOOK: Output: database:default
PREHOOK: Output: default@acidparttbl
POSTHOOK: query: drop table acidparttbl
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acidparttbl
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acidparttbl
diff --git a/ql/src/test/results/clientpositive/llap/acid_insert_overwrite_update.q.out b/ql/src/test/results/clientpositive/llap/acid_insert_overwrite_update.q.out
index 6a8666398be..2f5de366e17 100644
--- a/ql/src/test/results/clientpositive/llap/acid_insert_overwrite_update.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_insert_overwrite_update.q.out
@@ -1,7 +1,9 @@
PREHOOK: query: drop table if exists sequential_update
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists sequential_update
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create transactional table sequential_update(ctime timestamp, seq bigint, mtime timestamp, prev_writeid bigint, prev_dirname string) stored as orc
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -151,8 +153,10 @@ POSTHOOK: Input: default@sequential_update
LOOKS OKAY base_0000005
PREHOOK: query: drop table if exists orc_test_txn
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists orc_test_txn
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table orc_test_txn (`id` integer, name string, dept string) partitioned by(year integer) stored as orc TBLPROPERTIES('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientpositive/llap/acid_locking_ctas.q.out b/ql/src/test/results/clientpositive/llap/acid_locking_ctas.q.out
index 2de1c43c1da..093c4e7c419 100644
--- a/ql/src/test/results/clientpositive/llap/acid_locking_ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_locking_ctas.q.out
@@ -1,15 +1,21 @@
PREHOOK: query: DROP TABLE IF EXISTS test_update_bucketed
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_update_bucketed
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS test_update_bucketed_orc_ctas
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_update_bucketed_orc_ctas
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: DROP TABLE IF EXISTS test_update_bucketed_orc_ctas_rename
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: DROP TABLE IF EXISTS test_update_bucketed_orc_ctas_rename
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: CREATE TABLE test_update_bucketed(id int, value string) CLUSTERED BY(id) INTO 10 BUCKETS STORED AS ORC TBLPROPERTIES('transactional'='true')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
diff --git a/ql/src/test/results/clientpositive/llap/acid_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/acid_mapjoin.q.out
index b05a5d74930..e54676335a8 100644
--- a/ql/src/test/results/clientpositive/llap/acid_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_mapjoin.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists acid1
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists acid1
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists acid2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists acid2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create table acid1 (key int, value string) clustered by (key) into 2 buckets stored as orc tblproperties ("transactional"="true")
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -176,16 +180,20 @@ POSTHOOK: Input: default@acid2
PREHOOK: query: drop table acid1
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acid1
+PREHOOK: Output: database:default
PREHOOK: Output: default@acid1
POSTHOOK: query: drop table acid1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acid1
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acid1
PREHOOK: query: drop table acid2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@acid2
+PREHOOK: Output: database:default
PREHOOK: Output: default@acid2
POSTHOOK: query: drop table acid2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@acid2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@acid2
diff --git a/ql/src/test/results/clientpositive/llap/acid_multiinsert_dyn_part.q.out b/ql/src/test/results/clientpositive/llap/acid_multiinsert_dyn_part.q.out
index ed23fc6de39..26df094c52c 100644
--- a/ql/src/test/results/clientpositive/llap/acid_multiinsert_dyn_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_multiinsert_dyn_part.q.out
@@ -1,23 +1,33 @@
PREHOOK: query: drop table if exists multiinsert_test_text
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multiinsert_test_text
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists multiinsert_test_text_2
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multiinsert_test_text_2
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists multiinsert_test_acid
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multiinsert_test_acid
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists multiinsert_test_mm
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multiinsert_test_mm
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists multiinsert_test_acid_nondi
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multiinsert_test_acid_nondi
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table multiinsert_test_text (a int, b int, c int) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -269,26 +279,32 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table if exists multiinsert_test_acid
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_acid
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_acid
POSTHOOK: query: drop table if exists multiinsert_test_acid
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_acid
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_acid
PREHOOK: query: drop table if exists multiinsert_test_mm
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_mm
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_mm
POSTHOOK: query: drop table if exists multiinsert_test_mm
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_mm
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_mm
PREHOOK: query: drop table if exists multiinsert_test_acid_nondi
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_acid_nondi
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_acid_nondi
POSTHOOK: query: drop table if exists multiinsert_test_acid_nondi
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_acid_nondi
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_acid_nondi
PREHOOK: query: create table multiinsert_test_acid (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -503,26 +519,32 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table if exists multiinsert_test_acid
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_acid
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_acid
POSTHOOK: query: drop table if exists multiinsert_test_acid
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_acid
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_acid
PREHOOK: query: drop table if exists multiinsert_test_mm
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_mm
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_mm
POSTHOOK: query: drop table if exists multiinsert_test_mm
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_mm
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_mm
PREHOOK: query: drop table if exists multiinsert_test_acid_nondi
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_acid_nondi
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_acid_nondi
POSTHOOK: query: drop table if exists multiinsert_test_acid_nondi
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_acid_nondi
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_acid_nondi
PREHOOK: query: create table multiinsert_test_acid (a int, b int) partitioned by (c int) stored as orc tblproperties('transactional'='true')
PREHOOK: type: CREATETABLE
@@ -737,40 +759,50 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table if exists multiinsert_test_text
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_text
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_text
POSTHOOK: query: drop table if exists multiinsert_test_text
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_text
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_text
PREHOOK: query: drop table if exists multiinsert_test_text_2
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_text_2
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_text_2
POSTHOOK: query: drop table if exists multiinsert_test_text_2
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_text_2
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_text_2
PREHOOK: query: drop table if exists multiinsert_test_acid
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_acid
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_acid
POSTHOOK: query: drop table if exists multiinsert_test_acid
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_acid
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_acid
PREHOOK: query: drop table if exists multiinsert_test_mm
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_mm
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_mm
POSTHOOK: query: drop table if exists multiinsert_test_mm
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_mm
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_mm
PREHOOK: query: drop table if exists multiinsert_test_acid_nondi
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multiinsert_test_acid_nondi
+PREHOOK: Output: database:default
PREHOOK: Output: default@multiinsert_test_acid_nondi
POSTHOOK: query: drop table if exists multiinsert_test_acid_nondi
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multiinsert_test_acid_nondi
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multiinsert_test_acid_nondi
diff --git a/ql/src/test/results/clientpositive/llap/acid_multiinsert_static_parts.q.out b/ql/src/test/results/clientpositive/llap/acid_multiinsert_static_parts.q.out
index 5e5ea73d637..f58f4c0284b 100644
--- a/ql/src/test/results/clientpositive/llap/acid_multiinsert_static_parts.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_multiinsert_static_parts.q.out
@@ -1,11 +1,15 @@
PREHOOK: query: drop table if exists multi_test_text
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multi_test_text
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: drop table if exists multi_test_acid
PREHOOK: type: DROPTABLE
+PREHOOK: Output: database:default
POSTHOOK: query: drop table if exists multi_test_acid
POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: database:default
PREHOOK: query: create external table multi_test_text (a int, b int, c int) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -103,16 +107,20 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
PREHOOK: query: drop table if exists multi_test_text
PREHOOK: type: DROPTABLE
PREHOOK: Input: default@multi_test_text
+PREHOOK: Output: database:default
PREHOOK: Output: default@multi_test_text
POSTHOOK: query: drop table if exists multi_test_text
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@multi_test_text
+POSTHOOK: Output: database:default
POSTHOOK: Output: default@multi_test_text
PREHOOK: query: drop table if exists multi_test_acid
... 40881 lines suppressed ...